diff --git a/infrastructure/cicd/tekton-helm/templates/task-update-gitops.yaml b/infrastructure/cicd/tekton-helm/templates/task-update-gitops.yaml
index 0144cf23..2b2431c4 100644
--- a/infrastructure/cicd/tekton-helm/templates/task-update-gitops.yaml
+++ b/infrastructure/cicd/tekton-helm/templates/task-update-gitops.yaml
@@ -180,6 +180,35 @@ spec:
                 echo "Info: No migration job found for $service"
               fi
             fi
+            
+            # Special case: external-data-init job
+            if [ "$service" = "external" ]; then
+              EXTERNAL_DATA_INIT_JOB="infrastructure/services/microservices/external/migrations/external-data-init-job.yaml"
+              if [ -f "$EXTERNAL_DATA_INIT_JOB" ]; then
+                # Update external-data-init job image and name
+                sed -i "s|image: bakery/external-service:.*|image: $(params.registry)/external:$(params.git-revision)|g" "$EXTERNAL_DATA_INIT_JOB"
+                sed -i "s|name: external-data-init|name: external-data-init-${SHORT_HASH}|g" "$EXTERNAL_DATA_INIT_JOB"
+                echo "Updated external-data-init job: $EXTERNAL_DATA_INIT_JOB"
+              fi
+              
+              # Update external-data-rotation cronjob
+              EXTERNAL_DATA_ROTATION_JOB="infrastructure/services/microservices/external/cronjobs/external-data-rotation-cronjob.yaml"
+              if [ -f "$EXTERNAL_DATA_ROTATION_JOB" ]; then
+                sed -i "s|image: bakery/external-service:.*|image: $(params.registry)/external:$(params.git-revision)|g" "$EXTERNAL_DATA_ROTATION_JOB"
+                sed -i "s|name: external-data-rotation|name: external-data-rotation-${SHORT_HASH}|g" "$EXTERNAL_DATA_ROTATION_JOB"
+                echo "Updated external-data-rotation cronjob: $EXTERNAL_DATA_ROTATION_JOB"
+              fi
+            fi
+            
+            # Special case: demo-cleanup-worker
+            if [ "$service" = "demo-session" ]; then
+              DEMO_CLEANUP_WORKER="infrastructure/services/microservices/demo-session/demo-cleanup-worker.yaml"
+              if [ -f "$DEMO_CLEANUP_WORKER" ]; then
+                sed -i "s|image: bakery/demo-session-service:.*|image: $(params.registry)/demo_session:$(params.git-revision)|g" "$DEMO_CLEANUP_WORKER"
+                sed -i "s|name: demo-cleanup-worker|name: demo-cleanup-worker-${SHORT_HASH}|g" "$DEMO_CLEANUP_WORKER"
+                echo "Updated demo-cleanup-worker: $DEMO_CLEANUP_WORKER"
+              fi
+            fi
           fi
         done
 
diff --git a/infrastructure/services/microservices/demo-session/demo-cleanup-worker.yaml b/infrastructure/services/microservices/demo-session/demo-cleanup-worker.yaml
index a97ecc28..88ec8c18 100644
--- a/infrastructure/services/microservices/demo-session/demo-cleanup-worker.yaml
+++ b/infrastructure/services/microservices/demo-session/demo-cleanup-worker.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: demo-cleanup-worker
+  name: demo-cleanup-worker-6f282eff
   namespace: bakery-ia
   labels:
     app: demo-cleanup-worker
@@ -53,7 +53,7 @@ spec:
             cpu: "100m"
       containers:
       - name: worker
-        image: bakery/demo-session-service
+        image: registry.bakewise.ai/bakery-admin/demo_session:6f282eff4c253e49a5ed4e8ba8be8b1e57280f8c
         imagePullPolicy: IfNotPresent
         command:
         - python
diff --git a/infrastructure/services/microservices/external/cronjobs/external-data-rotation-cronjob.yaml b/infrastructure/services/microservices/external/cronjobs/external-data-rotation-cronjob.yaml
index 5990be22..ae653301 100644
--- a/infrastructure/services/microservices/external/cronjobs/external-data-rotation-cronjob.yaml
+++ b/infrastructure/services/microservices/external/cronjobs/external-data-rotation-cronjob.yaml
@@ -3,7 +3,7 @@
 apiVersion: batch/v1
 kind: CronJob
 metadata:
-  name: external-data-rotation
+  name: external-data-rotation-6f282eff
   namespace: bakery-ia
   labels:
     app: external-service
@@ -35,7 +35,7 @@ spec:
 
           containers:
           - name: data-rotator
-            image: bakery/external-service:latest
+            image: registry.bakewise.ai/bakery-admin/external:6f282eff4c253e49a5ed4e8ba8be8b1e57280f8c
             imagePullPolicy: Always
 
             command:
diff --git a/infrastructure/services/microservices/external/migrations/external-data-init-job.yaml b/infrastructure/services/microservices/external/migrations/external-data-init-job.yaml
index 98bc935f..7a486b3d 100644
--- a/infrastructure/services/microservices/external/migrations/external-data-init-job.yaml
+++ b/infrastructure/services/microservices/external/migrations/external-data-init-job.yaml
@@ -3,7 +3,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: external-data-init
+  name: external-data-init-6f282eff
   namespace: bakery-ia
   labels:
     app: external-service
@@ -51,7 +51,7 @@ spec:
 
       containers:
       - name: data-loader
-        image: bakery/external-service:latest
+        image: registry.bakewise.ai/bakery-admin/external:6f282eff4c253e49a5ed4e8ba8be8b1e57280f8c
         imagePullPolicy: Always
 
         command: