diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 25048fe25bd7eec8769506ceab1d1a7473070dc3..aedeffe52a52bbe4421d4ebd23fbb9f320458212 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -210,7 +210,7 @@ build_ood_image:
     reports:
       dotenv: image.env
   rules:
-    - if: $PIPELINE_TARGET == "build" && $BUILD_TARGET == "ood"
+    - if: $BUILD_TARGET == "ood"
       when: always
 
 deploy_http_proxy_node:
@@ -380,6 +380,7 @@ deploy_ood_node:
   tags:
     - build
   script:
+    - OOD_IMAGE_ID="${BUILT_OOD_IMAGE_ID:-$OOD_IMAGE_ID}"
     - openstack image set --accept $OOD_IMAGE_ID || true
     - FAILED=false
     - |
@@ -424,5 +425,5 @@ deploy_ood_node:
         openstack server add floating ip $OOD_INSTANCE_ID $OOD_FLOATING_IP
       done
   rules:
-    - if: $PIPELINE_TARGET == "deploy" && $OOD_IMAGE_ID
+    - if: $DEPLOY_TARGET == "ood"
       when: always