diff --git a/templates/virtual-baremetal-servers-volume.yaml b/templates/virtual-baremetal-servers-volume.yaml
index 7ce29d0..67c2137 100644
--- a/templates/virtual-baremetal-servers-volume.yaml
+++ b/templates/virtual-baremetal-servers-volume.yaml
@@ -13,6 +13,9 @@ parameters:
     default: 41
     description: The size of the baremetal instance volumes
 
+  baremetal_name:
+    type: string
+
   key_name:
     type: string
 
@@ -59,11 +62,7 @@ resources:
       block_device_mapping:
         - device_name: vda
           volume_id: {get_resource: baremetal_volume}
-      name:
-        list_join:
-        - ''
-        - - {get_param: baremetal_prefix}
-          - {get_param: suffix}
+      name: {get_param: baremetal_name}
 
 outputs:
   bmc_nic:
diff --git a/templates/virtual-baremetal-servers.yaml b/templates/virtual-baremetal-servers.yaml
index 0ec471c..f33bfa8 100644
--- a/templates/virtual-baremetal-servers.yaml
+++ b/templates/virtual-baremetal-servers.yaml
@@ -8,6 +8,9 @@ parameters:
   baremetal_image:
     type: string
 
+  baremetal_name:
+    type: string
+
   key_name:
     type: string
 
@@ -37,11 +40,7 @@ resources:
       config_drive: false
       key_name: {get_param: key_name}
       networks: {get_attr: [baremetal_ports, ports]}
-      name:
-        list_join:
-        - ''
-        - - {get_param: baremetal_prefix}
-          - {get_param: suffix}
+      name: {get_param: baremetal_name}
 
 outputs:
   bmc_nic:
diff --git a/templates/virtual-baremetal.yaml b/templates/virtual-baremetal.yaml
index 0bf1a60..1b3ae16 100644
--- a/templates/virtual-baremetal.yaml
+++ b/templates/virtual-baremetal.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: newton
 
 description: Template for deploying OpenStack BMC nodes.  Can be wrapped in a ResourceGroup for scaling.
 
@@ -65,6 +65,14 @@ parameters:
     default: baremetal
     description: Prefix for the name of the baremetal instances
 
+  baremetal_name_template:
+    type: string
+    default: ''
+    description: |
+      Override the default naming scheme for baremetal instances.
+      The value should usually include '%index%' to differentiate multiple
+      instances. For example: 'my-custom-name-%index%'
+
   os_user:
     type: string
     default: admin
@@ -142,6 +150,14 @@ parameters:
     type: string
     default: ''
 
+
+conditions:
+  baremetal_name_override:
+    not:
+      equals:
+      - {get_param: baremetal_name_template}
+      - ''
+
 resources:
   bmc_port:
     type: OS::OVB::BMCPort
@@ -216,6 +232,14 @@ resources:
         properties:
           baremetal_flavor: {get_param: baremetal_flavor}
           baremetal_image: {get_param: baremetal_image}
+          baremetal_name:
+            if:
+            - baremetal_name_override
+            - {get_param: baremetal_name_template}
+            - list_join:
+              - ''
+              - - {get_param: baremetal_prefix}
+                - '_%index%'
           key_name: {get_param: key_name}
           networks: {get_param: networks}
           suffix: _%index%