diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3eef15e..119ba6e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -81,22 +81,44 @@ deploy_dev:
         - ssh $DEV_SSH_USER@$DEV_SSH_HOST "docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY"
         - ssh $DEV_SSH_USER@$DEV_SSH_HOST "bash ~/deployment/deploy_dev.sh \"$IMAGE_NAME\""
 
+# deploy_production:
+#     stage: deploy
+#     image: alpine:latest
+#     environment:
+#         name: production
+#         url: https://sika.sahkoinsinoorikilta.fi
+#     when: manual
+#     only:
+#         - master
+#     before_script:
+#         - pwd
+#         - apk add --update openssh
+#         - ssh -V
+#         - mkdir -p ~/.ssh
+#         - echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
+#         - chmod 600 ~/.ssh/id_rsa
+#         - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
+#     script:
+#         - ssh $PROD_SSH_USER@$PROD_SSH_HOST "zsh ~/deploy.sh"
+
 deploy_production:
-    stage: deploy
-    image: alpine:latest
-    environment:
-        name: production
-        url: https://sika.sahkoinsinoorikilta.fi
-    when: manual
-    only:
-        - master
-    before_script:
-        - pwd
-        - apk add --update openssh
-        - ssh -V
-        - mkdir -p ~/.ssh
-        - echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
-        - chmod 600 ~/.ssh/id_rsa
-        - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
-    script:
-        - ssh $PROD_SSH_USER@$PROD_SSH_HOST "zsh ~/deploy.sh"
+  stage: deploy
+  image: docker:stable
+  only:
+    - master
+  environment:
+    name: production
+    url: sika.sik.party
+  variables:
+    DOCKER_HOST: $CI_DOCKER_HOST
+    DOCKER_TLS_VERIFY: 1
+  before_script:
+    - mkdir -p ~/.docker
+    - echo "$TLSCACERT" > ~/.docker/ca.pem
+    - echo "$TLSCERT" > ~/.docker/cert.pem
+    - echo "$TLSKEY" > ~/.docker/key.pem
+    - docker login -u gitlab-ci-token -p "$CI_BUILD_TOKEN" "$CI_REGISTRY"
+  script:
+    - docker stack deploy --with-registry-auth -c stack-compose.yml "$SERVICE_NAME"
+  after_script:
+    - docker logout "$CI_REGISTRY"
\ No newline at end of file
diff --git a/stack-compose.yml b/stack-compose.yml
new file mode 100644
index 0000000..f74e67d
--- /dev/null
+++ b/stack-compose.yml
@@ -0,0 +1,6 @@
+version: '3.2'
+services:
+  web20_backend:
+    image: registry.gitlab.com/sahkoinsinoorikilta/vtmk/web2.0-backend:latest
+    ports:
+      - 8000:8000