diff --git a/playbooks/groups/copr-dist-git.yml b/playbooks/groups/copr-dist-git.yml
index 9b6b69eabe..f7a55de8ad 100644
--- a/playbooks/groups/copr-dist-git.yml
+++ b/playbooks/groups/copr-dist-git.yml
@@ -15,10 +15,6 @@
 
   - import_tasks: "{{ tasks_path }}/aws_cloud.yml"
     when: datacenter == 'aws'
-  - import_tasks: "{{ tasks_path }}/swap.yml"
-    when:
-      - datacenter == 'aws'
-      - swap_file_size_mb is defined
 
 - name: cloud basic setup
   hosts: copr_dist_git_dev:copr_dist_git_stg:copr_dist_git:copr_dist_git_dev_aws:copr_dist_git_aws
@@ -32,6 +28,10 @@
   - import_tasks: "{{ tasks_path }}/yumrepos.yml"
 
   tasks:
+  - import_tasks: "{{ tasks_path }}/swap.yml"
+    when:
+      - datacenter == 'aws'
+      - swap_file_size_mb is defined
   - import_tasks: "{{ tasks_path }}/cloud_setup_basic.yml"
   - name: set hostname (required by some services, at least postfix need it)
     hostname: name="{{copr_hostbase}}.fedorainfracloud.org"