diff --git a/roles/restore_backups/molecule/Pipfile b/roles/restore_backups/molecule/Pipfile
new file mode 100644
index 0000000..219b717
--- /dev/null
+++ b/roles/restore_backups/molecule/Pipfile
@@ -0,0 +1,11 @@
+[[source]]
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+
+[dev-packages]
+
+[requires]
+python_version = "3.7"
diff --git a/roles/restore_backups/molecule/restore/Dockerfile.j2 b/roles/restore_backups/molecule/restore_jira_clustered/Dockerfile.j2
similarity index 100%
rename from roles/restore_backups/molecule/restore/Dockerfile.j2
rename to roles/restore_backups/molecule/restore_jira_clustered/Dockerfile.j2
diff --git a/roles/restore_backups/molecule/restore/molecule.yml b/roles/restore_backups/molecule/restore_jira_clustered/molecule.yml
similarity index 100%
rename from roles/restore_backups/molecule/restore/molecule.yml
rename to roles/restore_backups/molecule/restore_jira_clustered/molecule.yml
diff --git a/roles/restore_backups/molecule/restore/playbook.yml b/roles/restore_backups/molecule/restore_jira_clustered/playbook.yml
similarity index 98%
rename from roles/restore_backups/molecule/restore/playbook.yml
rename to roles/restore_backups/molecule/restore_jira_clustered/playbook.yml
index 073d24b..a866f32 100644
--- a/roles/restore_backups/molecule/restore/playbook.yml
+++ b/roles/restore_backups/molecule/restore_jira_clustered/playbook.yml
@@ -6,6 +6,7 @@
     atl_backup_home_restore_canary_path: '/tmp/canary.tmp'
     atl_backup_id: 'test-backup'
     atl_backup_manifest_url: 'fake_manifest'
+    atl_backup_home_is_server: 'false'
 
     atl_product_edition: 'jira-software'
     atl_product_home_shared: '/media/atl/jira/shared'
diff --git a/roles/restore_backups/molecule/restore/tests/test_default.py b/roles/restore_backups/molecule/restore_jira_clustered/tests/test_default.py
similarity index 100%
rename from roles/restore_backups/molecule/restore/tests/test_default.py
rename to roles/restore_backups/molecule/restore_jira_clustered/tests/test_default.py