diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f70a5b6c6d64148517a8c462ced36f9d881a6cd7..d178eed6f1efff3235167ba4287ca0b68bf85830 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,7 +42,7 @@ deploy_ood_proxy_node:
       echo "$DEV_KEY" >> /root/.ssh/authorized_keys
       EOF
     - >
-      export NEW_INSTANCE_ID=$(openstack server create
+      export PROXY_OOD_INSTANCE_ID=$(openstack server create
       -c id -f value --image $PROXY_OOD_IMAGE_ID
       --network $OOD_PROXY_NETWORK
       --security-group https-port
@@ -52,7 +52,12 @@ deploy_ood_proxy_node:
       --flavor $INSTANCE_FLAVOR
       --wait
       $OOD_PROXY_INSTANCE_NAME)
-    - openstack server add floating ip $OOD_PROXY_INSTANCE_NAME $OOD_PROXY_FLOATING_IP
+      # Create and assign a floating IP
+      PROXY_OOD_FLOATING_IP=$(openstack floating ip create $PKR_VAR_floating_ip_network -f value -c floating_ip_address)
+      echo "Created FLOATING_IP: $PROXY_OOD_FLOATING_IP"
+      # Associate the floating IP with the ood proxy instance
+      openstack server add floating ip $PROXY_OOD_INSTANCE_ID $PROXY_OOD_FLOATING_IP
+      echo "Associated FLOATING_IP $PROXY_OOD_FLOATING_IP with PROXY_OOD_INSTANCE_ID $PROXY_OOD_INSTANCE_ID"
   rules:
     - if: $CI_PIPELINE_SOURCE == "schedule"
       when: always
@@ -74,7 +79,7 @@ deploy_ssh_proxy_node:
       echo "$DEV_KEY" >> /root/.ssh/authorized_keys
       EOF
     - >
-      export NEW_INSTANCE_ID=$(openstack server create
+      export PROXY_SSH_INSTANCE_ID=$(openstack server create
       -c id -f value --image $PROXY_SSH_IMAGE_ID
       --network $OOD_PROXY_NETWORK
       --security-group allow-ssh
@@ -82,7 +87,12 @@ deploy_ssh_proxy_node:
       --flavor $INSTANCE_FLAVOR
       --wait
       $SSH_PROXY_INSTANCE_NAME)
-    - openstack server add floating ip $NEW_INSTANCE_ID $SSH_PROXY_FLOATING_IP
+      # Create and assign a proxy ssh floating IP
+      PROXY_SSH_FLOATING_IP=$(openstack floating ip create $PKR_VAR_floating_ip_network -f value -c floating_ip_address)
+      echo "Created PROXY_SSH_FLOATING_IP: $PROXY_SSH_FLOATING_IP"
+      # Associate the floating IP with the ssh proxy instance
+      openstack server add floating ip $PROXY_SSH_INSTANCE_ID $PROXY_SSH_FLOATING_IP
+      echo "Associated FLOATING_IP $PROXY_SSH_FLOATING_IP with PROXY_SSH_INSTANCE_ID $PROXY_SSH_INSTANCE_ID"
   rules:
     - if: $CI_PIPELINE_SOURCE == "schedule"
       when: always