diff --git a/launch/src/opendev_launch/launch_node.py b/launch/src/opendev_launch/launch_node.py
index 630a94f456..b4f40d9db7 100755
--- a/launch/src/opendev_launch/launch_node.py
+++ b/launch/src/opendev_launch/launch_node.py
@@ -160,16 +160,16 @@ def bootstrap_server(server, key, name, volume_device, keep,
             ssh_client.ssh('ping6 -c5 -Q 0x10 review.openstack.org '
                            '|| ping6 -c5 -Q 0x10 wiki.openstack.org')
 
-    ssh_client.scp(os.path.join(SCRIPT_DIR, 'make_swap.sh'),
-                   'make_swap.sh')
-    ssh_client.ssh('bash -x make_swap.sh')
-
     if volume_device:
         ssh_client.scp(os.path.join(SCRIPT_DIR, 'mount_volume.sh'),
                        'mount_volume.sh')
         ssh_client.ssh('bash -x mount_volume.sh %s %s %s' %
                        (volume_device, mount_path, fs_label))
 
+    ssh_client.scp(os.path.join(SCRIPT_DIR, 'make_swap.sh'),
+                   'make_swap.sh')
+    ssh_client.ssh('bash -x make_swap.sh')
+
     # Zero the ansible inventory cache so that next run finds the new server
     inventory_cache_dir = '/var/cache/ansible/inventory'
     try: