diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml
index 9adb9679ac..2292726fcc 100644
--- a/undercloud-vm.yaml
+++ b/undercloud-vm.yaml
@@ -9,7 +9,7 @@ Parameters:
     Default: unset
     Description: The keystone auth secret.
     Type: String
-  InstanceType:
+  Flavor:
     Default: baremetal
     Description: Flavor to request when deploying.
     Type: String
@@ -149,15 +149,14 @@ Resources:
         store_key: unset
       service-password: unset
   notcompute:
-    Type: AWS::EC2::Instance
+    Type: OS::Nova::Server
     Properties:
-      ImageId:
+      image:
         Ref: Image
-      InstanceType:
-        Ref: InstanceType
-      KeyName:
+      flavor:
+        Ref: Flavor
+      key_name:
         Ref: KeyName
-    Type: AWS::EC2::Instance
     Metadata:
       os-collect-config:
         cfn: