diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 122813f..897aad9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,12 +58,14 @@ publish:
         - docker build . -t "$IMAGE_NAME"
         - docker push "$IMAGE_NAME"
 
-deploy:
+deploy_dev:
     stage: deploy
     image: alpine:latest
     environment:
         name: dev
-        url: http://web.sik.party
+        url: http://web.sik.party:8080
+    only:
+        - develop
     before_script:
         - pwd
         - apk add --update openssh
@@ -73,5 +75,25 @@ deploy:
         - chmod 600 ~/.ssh/id_rsa
         - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
     script:
-        - scp docker-compose.yml $SSH_USER@$SSH_HOST:~/deployment/docker-compose.yml
-        - ssh $SSH_USER@$SSH_HOST "cd deployment && docker-compose down && docker pull \"$IMAGE_NAME\" && docker-compose up -d && docker image prune -f"
+        - scp docker-compose.yml $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment/docker-compose.yml
+        - ssh $DEV_SSH_USER@$DEV_SSH_HOST "cd deployment && docker-compose down && docker pull \"$IMAGE_NAME\" && docker-compose up -d && docker image prune -f"
+
+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
+    script:
+        - ssh $PROD_SSH_USER@PROD_SSH_HOST "zsh ~/deploy.sh"
+