diff --git a/templates/undercloud-ports-port-security.yaml b/templates/undercloud-ports-port-security.yaml
index b67f20e..916c07b 100644
--- a/templates/undercloud-ports-port-security.yaml
+++ b/templates/undercloud-ports-port-security.yaml
@@ -18,7 +18,11 @@ resources:
   undercloud_sg:
     type: OS::Neutron::SecurityGroup
     properties:
-      name: undercloud_sg
+      name:
+        list_join:
+        - '_'
+        - - {get_param: undercloud_name}
+          - 'sg'
       description: Ping and SSH
       rules:
       - protocol: icmp
diff --git a/templates/undercloud-ports.yaml b/templates/undercloud-ports.yaml
index db420fc..8523eaf 100644
--- a/templates/undercloud-ports.yaml
+++ b/templates/undercloud-ports.yaml
@@ -14,11 +14,18 @@ parameters:
   public_net:
     type: string
 
+  undercloud_sg:
+    type: string
+
 resources:
   undercloud_sg:
     type: OS::Neutron::SecurityGroup
     properties:
-      name: undercloud_sg
+      name:
+        list_join:
+        - '_'
+        - - {get_param: undercloud_name}
+          - 'sg'
       description: Ping and SSH
       rules:
       - protocol: icmp