diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 76a23eaf..78bcc748 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,16 +1,10 @@
 image: docker:latest
 
 stages:
-    - fabtest
-#    - build
-#    - test
-##    - deploy
-#    - clean
-
-fabtest:
-  stage: fabtest
-  script:
-    - fab test
+    - build
+    - test
+    - deploy
+    - clean
 
 #before_script:
 ##   - apk add --update python python-dev py-pip gcc libc-dev libffi-dev openssl-dev make
@@ -38,21 +32,21 @@ test:
     when: always
 
 
-#deploy-develop:
-#    stage: deploy
-#    only:
-#        - feature/develop_ci
-#    script:
-#        - fab --roles=develop deploy
-#    environment:
-#        name: Develop
-#
-#
-##deploy-staging:
-##    stage: deploy
-##    only:
-##        - master
-##    script:
-##        - fab --roles=staging deploy
-##    environment:
-##        name: Staging
+deploy-develop:
+    stage: deploy
+    only:
+        - feature/develop_ci
+    script:
+        - fab --roles=develop deploy
+    environment:
+        name: Develop
+
+
+deploy-staging:
+    stage: deploy
+    only:
+        - master
+    script:
+        - fab --roles=staging deploy
+    environment:
+        name: Staging
diff --git a/fabfile.py b/fabfile.py
index c06e42d0..d49b2e03 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -2,10 +2,8 @@ import os  # NOQA
 from fabric.api import *  # NOQA
 
 
-def test():
-    print('Fab test')
 
-user = 'gm'
+user = 'gitlab-runner'
 
 env.roledefs = {
     'develop': {