diff --git a/roles/prepare-node/tasks/main.yaml b/roles/prepare-node/tasks/main.yaml
index b1741666a..052fe386b 100644
--- a/roles/prepare-node/tasks/main.yaml
+++ b/roles/prepare-node/tasks/main.yaml
@@ -1,4 +1,6 @@
 - name: Swap is essential as we are not meeting memory requirements
+  vars:
+    configure_swap_size: 8192
   include_role:
     name: configure-swap
 
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index b20f7af6b..b7d145e32 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -181,7 +181,6 @@
       environment_infra: osinfra
       environment_type: multinode
       common_featureset: featureset-multinode-common.yml
-      configure_swap_size: 4096
       playbooks:
         - quickstart.yml
         - multinode-undercloud.yml