diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 25124e614d42409701169f64329471232748e339..7697741a0a86243ddf22076e2623b25ad31f0650 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,8 +52,7 @@ deploy_ood_proxy_node:
       --flavor $INSTANCE_FLAVOR
       --wait
       $OOD_PROXY_INSTANCE_NAME)
-    - openstack server add floating ip $OOD_PROXY_INSTANCE_NAME $FLOATING_IP
-  rules:
+    - openstack server add floating ip $OOD_PROXY_INSTANCE_NAME $OOD_PROXY_FLOATING_IP
     - if: $CI_PIPELINE_SOURCE == "schedule"
       when: always
     - if: $CI_PIPELINE_SOURCE == "web"
@@ -84,7 +83,7 @@ deploy_ssh_proxy_node:
       --flavor $INSTANCE_FLAVOR
       --wait
       $SSH_PROXY_INSTANCE_NAME)
-    - openstack server add floating ip $SSH_PROXY_INSTANCE_NAME $FLOATING_IP
+    - openstack server add floating ip $NEW_INSTANCE_ID $SSH_PROXY_FLOATING_IP
   rules:
     - if: $CI_PIPELINE_SOURCE == "schedule"
       when: always