diff --git a/environments/enable-swap-partition.yaml b/environments/enable-swap-partition.yaml
new file mode 100644
index 0000000000..71b70ec95e
--- /dev/null
+++ b/environments/enable-swap-partition.yaml
@@ -0,0 +1,3 @@
+# Use this environment to create a swap partition in all Overcloud nodes
+resource_registry:
+  OS::TripleO::AllNodesExtraConfig: ../extraconfig/all_nodes/swap-partition.yaml
diff --git a/environments/enable-swap.yaml b/environments/enable-swap.yaml
new file mode 100644
index 0000000000..9ba08642f2
--- /dev/null
+++ b/environments/enable-swap.yaml
@@ -0,0 +1,3 @@
+# Use this environment to create a swap file in all Overcloud nodes
+resource_registry:
+  OS::TripleO::AllNodesExtraConfig: ../extraconfig/all_nodes/swap.yaml
diff --git a/extraconfig/all_nodes/swap-partition.j2.yaml b/extraconfig/all_nodes/swap-partition.j2.yaml
index 36076b0c76..f734d8eebf 100644
--- a/extraconfig/all_nodes/swap-partition.j2.yaml
+++ b/extraconfig/all_nodes/swap-partition.j2.yaml
@@ -1,11 +1,7 @@
 heat_template_version: 2014-10-16
 
-description: >
-  Extra config to add swap space to nodes.
+description: Template file to add a swap partition to a node.
 
-# Parameters passed from the parent template - note if you maintain
-# out-of-tree templates they may require additional parameters if the
-# in-tree templates add a new role.
 parameters:
   servers:
     type: json
@@ -14,9 +10,7 @@ parameters:
     description: Swap partition label
     default: 'swap1'
 
-
 resources:
-
   SwapConfig:
     type: OS::Heat::SoftwareConfig
     properties:
@@ -25,8 +19,13 @@ resources:
         #!/bin/bash
         set -eux
         swap_partition=$(realpath /dev/disk/by-label/$swap_partition_label)
-        swapon $swap_partition
-        echo "$swap_partition swap swap defaults 0 0" >> /etc/fstab
+        if [ -f "$swap_partition" ]; then
+          swapon $swap_partition
+          echo "$swap_partition swap swap defaults 0 0" >> /etc/fstab
+        else
+          echo "$swap_partition needs to be a valid path"
+          echo "Check that $swap_partition_label is a valid partition label"
+        fi
       inputs:
         - name: swap_partition_label
           description: Swap partition label
diff --git a/extraconfig/all_nodes/swap.j2.yaml b/extraconfig/all_nodes/swap.j2.yaml
index ce65dacbf0..7111dae91d 100644
--- a/extraconfig/all_nodes/swap.j2.yaml
+++ b/extraconfig/all_nodes/swap.j2.yaml
@@ -1,11 +1,7 @@
 heat_template_version: 2014-10-16
 
-description: >
-  Extra config to add swap space to nodes.
+description: Template file to add a swap file to a node.
 
-# Parameters passed from the parent template - note if you maintain
-# out-of-tree templates they may require additional parameters if the
-# in-tree templates add a new role.
 parameters:
   servers:
     type: json
@@ -18,9 +14,7 @@ parameters:
     description: Full path to location of swap file
     default: '/swap'
 
-
 resources:
-
   SwapConfig:
     type: OS::Heat::SoftwareConfig
     properties:
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index 1d020b1614..1778c3d365 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -535,8 +535,9 @@ resources:
       - {{role.name}}AllNodesValidationDeployment
 {% endfor %}
     properties:
+      servers:
 {% for role in roles %}
-      servers: {get_attr: [{{role.name}}, attributes, nova_server_resource]}
+        {{role.name}}: {get_attr: [{{role.name}}, attributes, nova_server_resource]}
 {% endfor %}
 
   # Post deployment steps for all roles