diff --git a/inventory/group_vars/copr_aws b/inventory/group_vars/copr_aws
index 63c4537973..c724f21470 100644
--- a/inventory/group_vars/copr_aws
+++ b/inventory/group_vars/copr_aws
@@ -53,4 +53,12 @@ builders:
     ppc64le_hypervisor_02:
         ppc64le: [13, 4, 13]
 
+copr_builder_images:
+  hypervisor:
+    x86_64: copr-builder-20210511_210127
+    ppc64le: copr-builder-ppc64le-20210713_122818
+  aws:
+    x86_64: ami-05766cb7551777d09 # copr-builder-x86_64-f34-20210516_142224
+    aarch64: ami-0b7d49fecf0c393a9 # copr-builder-aarch64-f34-20210516_143216
+
 rpm_vendor_copr_name: Fedora Copr
diff --git a/inventory/group_vars/copr_back_aws b/inventory/group_vars/copr_back_aws
index f245570fd4..a8b4ef43a1 100644
--- a/inventory/group_vars/copr_back_aws
+++ b/inventory/group_vars/copr_back_aws
@@ -12,17 +12,6 @@ copr_builder_network_name: "copr-net"
 copr_builder_key_name: "buildsys"
 copr_builder_security_groups: "ssh-anywhere-copr,default,ssh-from-persistent-copr"
 
-copr_builder_images:
-  x86_64: copr-builder-x86_64-f32-20200914_072608
-  ppc64le: copr-builder-ppc64le-f31-20200117_132023
-  aarch64: copr-builder-aarch64-f32-20200914_073754
-  hypervisor:
-    x86_64: copr-builder-20210511_210127
-    ppc64le: copr-builder-ppc64le-20210713_122818
-  aws:
-    x86_64: ami-05766cb7551777d09 # copr-builder-x86_64-f34-20210516_142224
-    aarch64: ami-0b7d49fecf0c393a9 # copr-builder-aarch64-f34-20210516_143216
-
 nrpe_procs_warn: 2200
 nrpe_procs_crit: 2500
 
diff --git a/inventory/group_vars/copr_back_dev_aws b/inventory/group_vars/copr_back_dev_aws
index 3b7fd7828e..3b0650e480 100644
--- a/inventory/group_vars/copr_back_dev_aws
+++ b/inventory/group_vars/copr_back_dev_aws
@@ -12,17 +12,6 @@ copr_builder_network_name: "coprdev-net"
 copr_builder_key_name: "buildsys"
 copr_builder_security_groups: "ssh-anywhere-coprdev,default,ssh-from-persistent-coprdev"
 
-copr_builder_images:
-  x86_64: copr-builder-x86_64-f32-20200914_072608
-  ppc64le: copr-builder-ppc64le-f31-20200117_132023
-  aarch64: copr-builder-aarch64-f32-20200914_073754
-  hypervisor:
-    x86_64: copr-builder-20210511_210127
-    ppc64le: copr-builder-ppc64le-20210713_122818
-  aws:
-    x86_64: ami-05766cb7551777d09 # copr-builder-x86_64-f34-20210516_142224
-    aarch64: ami-0b7d49fecf0c393a9 # copr-builder-aarch64-f34-20210516_143216
-
 do_sign: "true"
 
 spawn_in_advance: "false"
diff --git a/inventory/group_vars/copr_dev_aws b/inventory/group_vars/copr_dev_aws
index 8e621022f1..9a146be5d0 100644
--- a/inventory/group_vars/copr_dev_aws
+++ b/inventory/group_vars/copr_dev_aws
@@ -54,4 +54,12 @@ builders:
     ppc64le_hypervisor_02:
         ppc64le: [2, 1, 1]
 
+copr_builder_images:
+  hypervisor:
+    x86_64: copr-builder-20210511_210127
+    ppc64le: copr-builder-ppc64le-20210713_122818
+  aws:
+    x86_64: ami-05766cb7551777d09 # copr-builder-x86_64-f34-20210516_142224
+    aarch64: ami-0b7d49fecf0c393a9 # copr-builder-aarch64-f34-20210516_143216
+
 rpm_vendor_copr_name: Fedora Copr (devel)