diff --git a/manifests/dev_single_node/deploy-airship.sh b/manifests/dev_single_node/deploy-airship.sh
index be4821ab..ca536a31 100755
--- a/manifests/dev_single_node/deploy-airship.sh
+++ b/manifests/dev_single_node/deploy-airship.sh
@@ -146,7 +146,7 @@ EOF
 function install_dependencies() {
     apt -qq update
     # Install docker
-    apt -y install --no-install-recommends docker.io jq
+    apt -y install --no-install-recommends docker.io jq nmap
 }
 
 function run_pegleg_collect() {
@@ -292,6 +292,16 @@ function execute_deploy_site() {
   bash execute_shipyard_action.sh 'deploy_site'
 }
 
+function execute_create_heat_stack() {
+  set +x
+  echo " "
+  echo "Performing basic sanity checks by creating heat stacks"
+  echo " "
+  set -x
+  # Switch to directory where the script is located
+  cd ${WORKSPACE}/airship-in-a-bottle/manifests/dev_single_node
+  bash test_create_heat_stack.sh
+}
 
 function clean() {
   # Perform any cleanup of temporary or unused artifacts
@@ -326,3 +336,4 @@ genesis_complete || error "printing out some info about next steps"
 setup_deploy_site || error "preparing the /site directory for deploy_site"
 # Disable execute_deploy_site to stop at the Airship components
 execute_deploy_site || error "executing deploy_site from the /site directory"
+execute_create_heat_stack || error "creating heat stack"
diff --git a/manifests/dev_single_node/test_create_heat_stack.sh b/manifests/dev_single_node/test_create_heat_stack.sh
new file mode 100755
index 00000000..2905c70b
--- /dev/null
+++ b/manifests/dev_single_node/test_create_heat_stack.sh
@@ -0,0 +1,83 @@
+#!/bin/bash
+# Copyright 2018 AT&T Intellectual Property.  All other rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -e
+
+# Copy run_openstack_cli and openstack_cli_docker_base_command script to dev_single_node directory
+cp /root/deploy/airship-in-a-bottle/tools/run_openstack_cli.sh /root/deploy/airship-in-a-bottle/manifests/dev_single_node/
+cp /root/deploy/airship-in-a-bottle/tools/openstack_cli_docker_base_command.sh /root/deploy/airship-in-a-bottle/manifests/dev_single_node/
+
+# Change to the dev_single_node directory
+cd /root/deploy/airship-in-a-bottle/manifests/dev_single_node
+
+printf "\nCreating KeyPair\n"
+env -i ./run_openstack_cli.sh keypair create heat-vm-key > id_rsa
+chmod 600 id_rsa
+
+printf "Downloading heat-public-net-deployment.yaml\n"
+curl -LO https://raw.githubusercontent.com/openstack/openstack-helm/master/tools/gate/files/heat-public-net-deployment.yaml
+
+printf "Creating public-net Heat Stack\n"
+env -i ./run_openstack_cli.sh stack create -t heat-public-net-deployment.yaml public-net --wait
+
+printf "Downloading heat-basic-vm-deployment.yaml\n"
+curl -LO https://raw.githubusercontent.com/openstack/openstack-helm/master/tools/gate/files/heat-basic-vm-deployment.yaml
+
+printf "Creating test-stack-01\n"
+env -i ./run_openstack_cli.sh stack create -t heat-basic-vm-deployment.yaml test-stack-01 --wait
+
+printf "Heat Stack List\n"
+env -i ./run_openstack_cli.sh stack list
+
+printf "Nova Server List\n"
+env -i ./run_openstack_cli.sh server list
+
+FLOATING_IP=$(env -i ./run_openstack_cli.sh stack output show \
+    test-stack-01 \
+    floating_ip \
+    -f value -c output_value)
+
+printf "Configuring required network settings\n"
+OSH_BR_EX_ADDR="172.24.4.1/24"
+OSH_EXT_SUBNET="172.24.4.0/24"
+sudo ip addr add ${OSH_BR_EX_ADDR} dev br-ex
+sudo ip link set br-ex up
+sudo iptables -P FORWARD ACCEPT
+DEFAULT_ROUTE_DEV="$(sudo ip -4 route list 0/0 | awk '{ print $5; exit }')"
+sudo iptables -t nat -A POSTROUTING -o ${DEFAULT_ROUTE_DEV} -s ${OSH_EXT_SUBNET} -j MASQUERADE
+
+function wait_for_ssh_port {
+  # Default wait timeout is 300 seconds
+  set +x
+  end=$(date +%s)
+  if ! [ -z $2 ]; then
+   end=$((end + $2))
+  else
+   end=$((end + 300))
+  fi
+  while true; do
+      # Use Nmap as its the same on Ubuntu and RHEL family distros
+      nmap -Pn -p22 $1 | awk '$1 ~ /22/ {print $2}' | grep -q 'open' && \
+          break || true
+      sleep 1
+      now=$(date +%s)
+      [ $now -gt $end ] && echo "Could not connect to $1 port 22 in time" && exit -1
+  done
+  set -x
+}
+wait_for_ssh_port $FLOATING_IP
+
+ssh-keyscan "${FLOATING_IP}" >> ~/.ssh/known_hosts
+printf "The test VM is accessible via SSH:  ssh -i id_rsa cirros@${FLOATING_IP}\n"