diff --git a/scripts/tripleo.sh b/scripts/tripleo.sh
index 07f346b57..7a8c67bbe 100755
--- a/scripts/tripleo.sh
+++ b/scripts/tripleo.sh
@@ -595,8 +595,7 @@ function overcloud_pingtest {
     kernel_id=$(openstack image create pingtest_kernel --public --container-format aki --disk-format aki --file $KERNEL_PATH | grep ' id ' | awk '{print $4}')
     openstack image create pingtest_image --public --container-format ami --disk-format ami --property kernel_id=$kernel_id --property ramdisk_id=$ramdisk_id --file $IMAGE_PATH
 
-    log "Overcloud pingtest, creating demo tenant keypair and external network"
-    if ! nova keypair-show default 2>/dev/null; then tripleo user-config; fi
+    log "Overcloud pingtest, creating external network"
     neutron net-create nova --shared --router:external=True --provider:network_type flat \
   --provider:physical_network datacentre
     FLOATING_IP_CIDR=${FLOATING_IP_CIDR:-"192.0.2.0/24"}
diff --git a/templates/tenantvm_floatingip.yaml b/templates/tenantvm_floatingip.yaml
index 53ae3bb2b..47ab60204 100644
--- a/templates/tenantvm_floatingip.yaml
+++ b/templates/tenantvm_floatingip.yaml
@@ -9,7 +9,7 @@ parameters:
   key_name:
     type: string
     description: Name of keypair to assign to servers
-    default: 'default'
+    default: 'pingtest_key'
   image:
     type: string
     description: Name of image to use for servers
@@ -42,6 +42,12 @@ parameters:
 
 resources:
 
+  key_pair:
+    type: OS::Nova::KeyPair
+    properties:
+      save_private_key: true
+      name: {get_param: key_name }
+
   private_net:
     type: OS::Neutron::Net
     properties:
@@ -85,7 +91,7 @@ resources:
         - device_name: vda
           volume_id: { get_resource: volume1 }
       flavor: { get_resource: test_flavor }
-      key_name: { get_param: key_name }
+      key_name: { get_resource: key_pair }
       networks:
         - port: { get_resource: server1_port }