diff --git a/playbooks/groups/copr-dist-git.yml b/playbooks/groups/copr-dist-git.yml
index 5a7fbcfd7b..47aaed350b 100644
--- a/playbooks/groups/copr-dist-git.yml
+++ b/playbooks/groups/copr-dist-git.yml
@@ -11,6 +11,10 @@
 
   tasks:
   - import_tasks: "{{ tasks_path }}/persistent_cloud.yml"
+    when: datacenter != 'aws'
+
+  - import_tasks: "{{ tasks_path }}/aws_cloud.yml"                                                                                       
+    when: datacenter == 'aws'
 
 - 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
diff --git a/playbooks/groups/copr-keygen.yml b/playbooks/groups/copr-keygen.yml
index bc761b9a0e..a7ae46a246 100644
--- a/playbooks/groups/copr-keygen.yml
+++ b/playbooks/groups/copr-keygen.yml
@@ -10,7 +10,11 @@
 
   tasks:
   - import_tasks: "{{ tasks_path }}/persistent_cloud.yml"
-    when: not devel
+    when: datacenter != 'aws'
+  - import_tasks: "{{ tasks_path }}/aws_cloud.yml"                                                                                       
+    when: datacenter == 'aws'
+
+
   - name: gather facts
     setup:
     check_mode: no