diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 086851bf0d88533d0c31a7b0167f60d47b3b7101..b87a319504d5c4f64180bc88f991693f42676e70 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,20 +68,21 @@ deploy_ood_proxy_node:
         exit 1
       fi
 
-      # Check if the floating IP is available
-      FLOATING_IP=$(openstack floating ip list --format value --column Floating_IP_Address | grep -w "$PROXY_IP")
+      # Get the available floating IP and ensure it's valid
+      FLOATING_IP=$(openstack floating ip list --format value --column 'Floating IP Address' | grep -w "$PROXY_IP")
 
       if [ -z "$FLOATING_IP" ]; then
         echo "ERROR: No Floating IP found for ${PROXY_IP}"
         exit 1
       else
-        # Add the floating IP to the created server
-        openstack server add floating ip $OOD_PROXY_NAME $PROXY_IP
-        echo "Successfully assigned Floating IP: $PROXY_IP to the server"
+        # Add the floating IP to the newly created instance
+        openstack server add floating ip $NEW_INSTANCE_ID $FLOATING_IP
+        echo "Successfully assigned Floating IP: $FLOATING_IP to the server"
       fi
 
       # Store the instance ID in variables.env for later use
-      echo "PROXY_INSTANCE_ID=$PROXY_INSTANCE_ID" >> $CI_PROJECT_DIR/variables.env
+      echo "NEW_INSTANCE_ID=$NEW_INSTANCE_ID" >> $CI_PROJECT_DIR/variables.env
+      
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
     - if: $CI_PIPELINE_SOURCE == 'schedule'