diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0b30d9d788b7ee68b692d19af4c680a61bfbea7c..a27b751052fddcaede3821ef66e26f3e6f4cfdba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,10 @@
-stages:
+tages:
   - test
   - deploy
 
 before_script:
   - echo "preparing environment"
-  - virtualenv env
+  - virtualenv env -p `which python3`
   - . env/bin/activate
   - pip install -r pip-packages.txt
   
@@ -16,11 +16,22 @@ test:
 
 deploy_test:
   stage: deploy
+  tags:
+    - test
+  variables:
+    DB_ENGINE : django.db.backends.sqlite3
+    DB_NAME : /var/www/test/$CI_COMMIT_REF_NAME/.db/members.db
+    DEPLOY_HOST : $CI_COMMIT_REF_NAME.test.ucc.asn.au
   script:
     - echo "Deploy to test"
-    - . venv/bin/activate
-    - python3 src/manage.py makemigrations
-    - python3 src/manage.py migrate --run-syncdb
+    - rm -f /var/www/test/$CI_COMMIT_REF_NAME
+    - rm -f /etc/uwsgi/vassals/$CI_COMMIT_REF_NAME.ini
+    - mkdir .db
+    - envsubst < src/gms/settings_local.example.py > src/gms/settings_local.py
+    - ln -srT ./ /var/www/test/$CI_COMMIT_REF_NAME
+    - python src/manage.py collectstatic
+    - python src/manage.py makemigrations
+    - python src/manage.py migrate --run-syncdb
     - ln -s /etc/uwsgi/vassals/test.skel /etc/uwsgi/vassals/$CI_COMMIT_REF_NAME.ini
   environment:
     name: test/$CI_COMMIT_REF_NAME