diff --git a/tools/deployment/developer/19-use-it.sh b/tools/deployment/developer/19-use-it.sh
index 83f5082e5d..edbd0a4e52 100755
--- a/tools/deployment/developer/19-use-it.sh
+++ b/tools/deployment/developer/19-use-it.sh
@@ -66,12 +66,10 @@ openstack stack create --wait \
     -t ./tools/gate/files/heat-basic-vm-deployment.yaml \
     heat-basic-vm-deployment
 
-FLOATING_IP=$(openstack floating ip show \
-  $(openstack stack resource show \
-      heat-basic-vm-deployment \
-      server_floating_ip \
-      -f value -c physical_resource_id) \
-      -f value -c floating_ip_address)
+FLOATING_IP=$(openstack stack output show \
+    heat-basic-vm-deployment \
+    floating_ip \
+    -f value -c output_value)
 
 function wait_for_ssh_port {
   # Default wait timeout is 300 seconds
diff --git a/tools/gate/files/heat-basic-vm-deployment.yaml b/tools/gate/files/heat-basic-vm-deployment.yaml
index de60e0a45c..8625e772f3 100644
--- a/tools/gate/files/heat-basic-vm-deployment.yaml
+++ b/tools/gate/files/heat-basic-vm-deployment.yaml
@@ -80,3 +80,7 @@ resources:
     properties:
       floating_network: {get_param: public_net}
       port_id: { get_resource: server_port }
+
+outputs:
+  floating_ip:
+    value: {get_attr:  [server_floating_ip, floating_ip_address]}