diff --git a/magnum/drivers/common/templates/swarm/fragments/cfn-signal.sh b/magnum/drivers/common/templates/swarm/fragments/cfn-signal.sh
index b525c905b1..ebe926885c 100644
--- a/magnum/drivers/common/templates/swarm/fragments/cfn-signal.sh
+++ b/magnum/drivers/common/templates/swarm/fragments/cfn-signal.sh
@@ -11,6 +11,4 @@ UUID=`uuidgen`
 
 data=$(echo '{"status": "'${STATUS}'", "reason": "'$REASON'", "data": "'${DATA}'", "id": "'$UUID'"}')
 
-curl -k -i -X POST -H "Content-Type: application/json" -H "X-Auth-Token: $WAIT_HANDLE_TOKEN" \
-    --data-binary "$data" \
-    "$WAIT_HANDLE_ENDPOINT"
+sh -c "${WAIT_CURL} --data-binary '${data}'"
diff --git a/magnum/drivers/common/templates/swarm/fragments/write-cluster-failure-service.yaml b/magnum/drivers/common/templates/swarm/fragments/write-cluster-failure-service.yaml
index 9b02c8020a..a4c152eac8 100644
--- a/magnum/drivers/common/templates/swarm/fragments/write-cluster-failure-service.yaml
+++ b/magnum/drivers/common/templates/swarm/fragments/write-cluster-failure-service.yaml
@@ -11,6 +11,5 @@ write_files:
       [Service]
       Type=simple
       TimeoutStartSec=0
-      ExecStart=/usr/bin/curl -k -i -X POST -H 'Content-Type: application/json' -H 'X-Auth-Token: $WAIT_HANDLE_TOKEN' \
-        --data-binary '{"status": "FAILURE", "reason": "$SERVICE service failed to start.", "data": "Failure"}' \
-        "$WAIT_HANDLE_ENDPOINT"
+      ExecStart=/usr/bin/$WAIT_CURL \
+        --data-binary '{"status": "FAILURE", "reason": "$SERVICE service failed to start.", "data": "Failure"}'
diff --git a/magnum/drivers/common/templates/swarm/fragments/write-heat-params-master.yaml b/magnum/drivers/common/templates/swarm/fragments/write-heat-params-master.yaml
index 435e891be9..690a3ff69d 100644
--- a/magnum/drivers/common/templates/swarm/fragments/write-heat-params-master.yaml
+++ b/magnum/drivers/common/templates/swarm/fragments/write-heat-params-master.yaml
@@ -5,8 +5,6 @@ write_files:
     owner: "root:root"
     permissions: "0600"
     content: |
-      WAIT_HANDLE_ENDPOINT="$WAIT_HANDLE_ENDPOINT"
-      WAIT_HANDLE_TOKEN="$WAIT_HANDLE_TOKEN"
       WAIT_CURL="$WAIT_CURL"
       ETCD_DISCOVERY_URL="$ETCD_DISCOVERY_URL"
       DOCKER_VOLUME="$DOCKER_VOLUME"
diff --git a/magnum/drivers/common/templates/swarm/fragments/write-heat-params-node.yaml b/magnum/drivers/common/templates/swarm/fragments/write-heat-params-node.yaml
index af0b65010b..14769c9d22 100644
--- a/magnum/drivers/common/templates/swarm/fragments/write-heat-params-node.yaml
+++ b/magnum/drivers/common/templates/swarm/fragments/write-heat-params-node.yaml
@@ -5,8 +5,6 @@ write_files:
     owner: "root:root"
     permissions: "0600"
     content: |
-      WAIT_HANDLE_ENDPOINT="$WAIT_HANDLE_ENDPOINT"
-      WAIT_HANDLE_TOKEN="$WAIT_HANDLE_TOKEN"
       WAIT_CURL="$WAIT_CURL"
       DOCKER_VOLUME="$DOCKER_VOLUME"
       DOCKER_VOLUME_SIZE="$DOCKER_VOLUME_SIZE"
diff --git a/magnum/drivers/common/templates/swarm/fragments/write-swarm-agent-service.sh b/magnum/drivers/common/templates/swarm/fragments/write-swarm-agent-service.sh
index a6f6a74360..8e4ea82d51 100644
--- a/magnum/drivers/common/templates/swarm/fragments/write-swarm-agent-service.sh
+++ b/magnum/drivers/common/templates/swarm/fragments/write-swarm-agent-service.sh
@@ -80,9 +80,8 @@ do
     sleep 5
 done
 
-curl -k -i -X POST -H 'Content-Type: application/json' -H 'X-Auth-Token: $WAIT_HANDLE_TOKEN' \
-    --data-binary '{"status": "SUCCESS", "reason": "Swarm agent ready", "data": "OK", "id": "${UUID}"}' \
-    "$WAIT_HANDLE_ENDPOINT"
+${WAIT_CURL} \
+    --data-binary '{"status": "SUCCESS", "reason": "Swarm agent ready", "data": "OK", "id": "${UUID}"}'
 EOF
 
 chown root:root $SCRIPT
diff --git a/magnum/drivers/common/templates/swarm/fragments/write-swarm-master-service.sh b/magnum/drivers/common/templates/swarm/fragments/write-swarm-master-service.sh
index 8f5fbaf250..8f4187ac5b 100644
--- a/magnum/drivers/common/templates/swarm/fragments/write-swarm-master-service.sh
+++ b/magnum/drivers/common/templates/swarm/fragments/write-swarm-master-service.sh
@@ -50,9 +50,8 @@ cat >> /etc/systemd/system/swarm-manager.service << END_SERVICE_BOTTOM
                                   etcd://$ETCD_SERVER_IP:2379/v2/keys/swarm/
 ExecStop=/usr/bin/docker stop swarm-manager
 Restart=always
-ExecStartPost=/usr/bin/curl -k -i -X POST -H 'Content-Type: application/json' -H 'X-Auth-Token: $WAIT_HANDLE_TOKEN' \\
-    --data-binary '{"status": "SUCCESS", "reason": "Setup complete", "data": "OK", "id": "$UUID"}' \\
-    "$WAIT_HANDLE_ENDPOINT"
+ExecStartPost=/usr/bin/$WAIT_CURL \\
+    --data-binary '{"status": "SUCCESS", "reason": "Setup complete", "data": "OK", "id": "$UUID"}'
 
 [Install]
 WantedBy=multi-user.target
diff --git a/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmmaster.yaml b/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmmaster.yaml
index 6edc0ed856..c319afb47b 100644
--- a/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmmaster.yaml
+++ b/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmmaster.yaml
@@ -213,8 +213,6 @@ resources:
         str_replace:
           template: {get_file: ../../common/templates/swarm/fragments/write-heat-params-master.yaml}
           params:
-            "$WAIT_HANDLE_ENDPOINT": {get_attr: [master_wait_handle, endpoint]}
-            "$WAIT_HANDLE_TOKEN": {get_attr: [master_wait_handle, token]}
             "$WAIT_CURL": {get_attr: [master_wait_handle, curl_cli]}
             "$DOCKER_VOLUME": {get_resource: docker_volume}
             "$DOCKER_VOLUME_SIZE": {get_param: docker_volume_size}
@@ -303,8 +301,7 @@ resources:
           template: {get_file: ../../common/templates/swarm/fragments/write-cluster-failure-service.yaml}
           params:
             "$SERVICE": swarm-manager
-            "$WAIT_HANDLE_ENDPOINT": {get_attr: [master_wait_handle, endpoint]}
-            "$WAIT_HANDLE_TOKEN": {get_attr: [master_wait_handle, token]}
+            "$WAIT_CURL": {get_attr: [master_wait_handle, curl_cli]}
 
   write_docker_socket:
     type: "OS::Heat::SoftwareConfig"
@@ -322,8 +319,7 @@ resources:
           params:
             "$ETCD_SERVER_IP": {get_attr: [etcd_address_switch, private_ip]}
             "$NODE_IP": {get_attr: [swarm_master_eth0, fixed_ips, 0, ip_address]}
-            "$WAIT_HANDLE_ENDPOINT": {get_attr: [master_wait_handle, endpoint]}
-            "$WAIT_HANDLE_TOKEN": {get_attr: [master_wait_handle, token]}
+            "$WAIT_CURL": {get_attr: [master_wait_handle, curl_cli]}
             "$HTTP_PROXY": {get_param: http_proxy}
             "$HTTPS_PROXY": {get_param: https_proxy}
             "$NO_PROXY": {get_param: no_proxy}
diff --git a/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmnode.yaml b/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmnode.yaml
index c887a151b8..2acdab2bd1 100644
--- a/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmnode.yaml
+++ b/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmnode.yaml
@@ -191,8 +191,6 @@ resources:
         str_replace:
           template: {get_file: ../../common/templates/swarm/fragments/write-heat-params-node.yaml}
           params:
-            "$WAIT_HANDLE_ENDPOINT": {get_attr: [node_wait_handle, endpoint]}
-            "$WAIT_HANDLE_TOKEN": {get_attr: [node_wait_handle, token]}
             "$WAIT_CURL": {get_attr: [node_wait_handle, curl_cli]}
             "$DOCKER_VOLUME": {get_resource: docker_volume}
             "$DOCKER_VOLUME_SIZE": {get_param: docker_volume_size}
@@ -279,8 +277,7 @@ resources:
           template: {get_file: ../../common/templates/swarm/fragments/write-cluster-failure-service.yaml}
           params:
             "$SERVICE": swarm-agent
-            "$WAIT_HANDLE_ENDPOINT": {get_attr: [node_wait_handle, endpoint]}
-            "$WAIT_HANDLE_TOKEN": {get_attr: [node_wait_handle, token]}
+            "$WAIT_CURL": {get_attr: [node_wait_handle, curl_cli]}
 
   write_swarm_agent_service:
     type: "OS::Heat::SoftwareConfig"