diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4d6266c00f1c6d3a29f8080be3c19e36cbcdaf20..cdbe288ea23f3d1b64581bf40561f9a9e2487ea0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,9 @@
+stages:
+  - build
+  - deploy
+
 basic_build_check:
+  stage: build
   tags:
     - development
   script:
@@ -13,29 +18,23 @@ basic_build_check:
     - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
       when: always
 
-build_upload_metobs_test_site:
+upload_metobs_test_site:
+  stage: deploy
   tags:
     - workstation
     - development
   script:
-    - source /var/lib/gitlab-runner/.bashrc
-    - conda activate rain_site
-    - make clean
-    - make publish
     - chmod 600 "$METOBS_UPLOAD_TEST"
     - rsync --delete -auv -e "ssh -T -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -o ForwardAgent=no -F /dev/null -i $METOBS_UPLOAD_TEST" output/ davidh@webaccess:METOBS_TEST
   rules:
     - if: '$CI_COMMIT_BRANCH == "develop"'
       when: always
 
-build_upload_metobs_prod_site:
+upload_metobs_prod_site:
+  stage: deploy
   tags:
     - production
   script:
-    - source /var/lib/gitlab-runner/.bashrc
-    - conda activate rain_site
-    - make clean
-    - make publish
     - chmod 600 "$METOBS_UPLOAD_PROD"
     - rsync --delete -auv -e "ssh -T -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -o ForwardAgent=no -F /dev/null -i $METOBS_UPLOAD_PROD" output/ davidh@webaccess:METOBS_PROD
   rules: