diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7dbe301c0f6dd704c83395bb7bac6f7590d31f0d..5a685b955b90e28c1645732f72b63cbd3bb71e7b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,9 +2,9 @@ variables:
   PLANETILER_VERSION: 0.7.0
 
 stages:
-  - update_deployment
   - update_tilserver_data
-  - transfer
+  - transfer_tilserver_data
+  - update_deployment
 
 update_deployment:
   variables:
@@ -18,10 +18,8 @@ update_deployment:
   script:
     - docker compose up -d --force-recreate
   rules:
-    - if: $UPDATE_MBTILES && $UPDATE_JOB != "true"
-      when: never
     - if: $CI_PIPELINE_SOURCE == "push"
-    - if: $UPDATE_JOB
+    - if: $UPDATE_MBTILES
   tags:
     - tileserver
 
@@ -45,7 +43,7 @@ update_mbtiles:
     - prepare
 
 transfer_mbtiles:
-  stage: update_tilserver_data
+  stage: transfer_tilserver_data
   image: 
     name: eeacms/rsync
     entrypoint: [""]
@@ -57,21 +55,5 @@ transfer_mbtiles:
     - chown -R 1000:1000 /home/mgmaps/tileserver-data/${PLANETILER_VERSION}/
   rules:
     - if: $UPDATE_MBTILES
-  needs:
-    - update_mbtiles
   tags:
-    - tileserver
-
-restart_service:
-  stage: update_tilserver_data
-  variables:
-    UPDATE_JOB: "true"
-  rules:
-    - if: $UPDATE_MBTILES
-  needs:
-    - transfer_mbtiles
-  trigger: 
-    project: metagermaps/tileserver
-    forward:
-      yaml_variables: true
-
+    - tileserver
\ No newline at end of file