diff --git a/inventory/host_vars/copr-dist-git-dev-aws.fedorainfracloud.org b/inventory/host_vars/copr-dist-git-dev.aws.fedoraproject.org
similarity index 74%
rename from inventory/host_vars/copr-dist-git-dev-aws.fedorainfracloud.org
rename to inventory/host_vars/copr-dist-git-dev.aws.fedoraproject.org
index f4828454d3..d884016f7d 100644
--- a/inventory/host_vars/copr-dist-git-dev-aws.fedorainfracloud.org
+++ b/inventory/host_vars/copr-dist-git-dev.aws.fedoraproject.org
@@ -3,22 +3,22 @@ ansible_ssh_user: fedora
 ansible_become_user: root
 ansible_become: yes
 datacenter: aws
-inventory_hostname: "copr-dist-git-dev-aws.fedorainfracloud.org"
-inventory_instance_name: copr-dist-git-dev-aws
+inventory_hostname: "copr-dist-git-dev.aws.fedoraproject.org"
+inventory_instance_name: copr-dist-git-dev
 nm_controlled_resolv: True
 ansible_ifcfg_blacklist: True
 
 #instance_type: t3a.medium
 #image: "{{ fedora31_x86_64 }}"
 #keypair: fedora-admin-20130801
-hostbase: copr-dist-git-dev-aws-
+hostbase: copr-dist-git-dev-
 public_ip: 35.153.206.59
 root_auth_users: msuchy frostyx dturecek praiskup schlupov thrnciar
 description: copr dist git - dev instance
 
 
 # Copr vars
-copr_hostbase: copr-dist-git-dev-aws
+copr_hostbase: copr-dist-git-dev
 
 nagios_Check_Services:
   mail: false
diff --git a/inventory/host_vars/copr-dist-git-aws.fedorainfracloud.org b/inventory/host_vars/copr-dist-git.aws.fedoraproject.org
similarity index 76%
rename from inventory/host_vars/copr-dist-git-aws.fedorainfracloud.org
rename to inventory/host_vars/copr-dist-git.aws.fedoraproject.org
index 71329471f0..542b6abd1b 100644
--- a/inventory/host_vars/copr-dist-git-aws.fedorainfracloud.org
+++ b/inventory/host_vars/copr-dist-git.aws.fedoraproject.org
@@ -3,22 +3,22 @@ ansible_ssh_user: fedora
 ansible_become_user: root
 ansible_become: yes
 datacenter: aws
-inventory_hostname: "copr-dist-git-aws.fedorainfracloud.org"
-inventory_instance_name: copr-dist-git-aws
+inventory_hostname: "copr-dist-git.aws.fedoraproject.org"
+inventory_instance_name: copr-dist-git
 nm_controlled_resolv: True
 ansible_ifcfg_blacklist: True
 
 #instance_type: t3a.medium
 #image: "{{ fedora31_x86_64 }}"
 #keypair: fedora-admin-20130801
-hostbase: copr-dist-git--aws-
+hostbase: copr-dist-git
 public_ip: 3.89.184.181
 root_auth_users: msuchy frostyx dturecek praiskup schlupov thrnciar
 description: copr dist git - prod instance
 
 
 # Copr vars
-copr_hostbase: copr-dist-git-aws
+copr_hostbase: copr-dist-git
 
 nagios_Check_Services:
   mail: false
diff --git a/inventory/host_vars/copr-keygen-dev-aws.fedorainfracloud.org b/inventory/host_vars/copr-keygen-dev.aws.fedoraproject.org
similarity index 70%
rename from inventory/host_vars/copr-keygen-dev-aws.fedorainfracloud.org
rename to inventory/host_vars/copr-keygen-dev.aws.fedoraproject.org
index 123834f7f4..160e305e15 100644
--- a/inventory/host_vars/copr-keygen-dev-aws.fedorainfracloud.org
+++ b/inventory/host_vars/copr-keygen-dev.aws.fedoraproject.org
@@ -3,9 +3,9 @@ ansible_ssh_user: fedora
 ansible_become_user: root
 ansible_become: yes
 datacenter: aws
-inventory_hostname: "copr-keygen-dev-aws.fedorainfracloud.org"
-inventory_instance_name: copr-keygen-dev-aws
-nm_controlled_resolv: True                                                                                               
+inventory_hostname: "copr-keygen-dev.aws.fedoraproject.org"
+inventory_instance_name: copr-keygen-dev
+nm_controlled_resolv: True
 ansible_ifcfg_blacklist: True
 
 #instance_type: t3a.small
@@ -18,7 +18,7 @@ root_auth_users: msuchy frostyx dturecek praiskup schlupov thrnciar
 description: copr key gen and sign host - dev instance
 
 # Copr vars
-copr_hostbase: copr-keygen-dev-aws
+copr_hostbase: copr-keygen-dev
 
 nagios_Check_Services:
   mail: false
diff --git a/inventory/host_vars/copr-keygen-aws.fedorainfracloud.org b/inventory/host_vars/copr-keygen.aws.fedoraproject.org
similarity index 81%
rename from inventory/host_vars/copr-keygen-aws.fedorainfracloud.org
rename to inventory/host_vars/copr-keygen.aws.fedoraproject.org
index 3abb7e997e..cf80e66d42 100644
--- a/inventory/host_vars/copr-keygen-aws.fedorainfracloud.org
+++ b/inventory/host_vars/copr-keygen.aws.fedoraproject.org
@@ -3,8 +3,8 @@ ansible_ssh_user: fedora
 ansible_become_user: root
 ansible_become: yes
 datacenter: aws
-inventory_hostname: "copr-keygen-aws.fedorainfracloud.org"
-inventory_instance_name: copr-keygen-aws
+inventory_hostname: "copr-keygen.aws.fedoraproject.org"
+inventory_instance_name: copr-keygen
 nm_controlled_resolv: True
 ansible_ifcfg_blacklist: True
 
@@ -17,7 +17,7 @@ root_auth_users: msuchy frostyx dturecek praiskup schlupov thrnciar
 description: copr key gen and sign host - prod instance
 
 # Copr vars
-copr_hostbase: copr-keygen-aws
+copr_hostbase: copr-keygen
 
 nagios_Check_Services:
   mail: false
diff --git a/inventory/inventory b/inventory/inventory
index 317d1f65f7..7507da9535 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -663,7 +663,6 @@ copr-be-dev.aws.fedoraproject.org
 copr-be-dev.cloud.fedoraproject.org
 copr-be-stg.fedorainfracloud.org
 copr-dist-git-dev.fedorainfracloud.org
-copr-dist-git-dev-aws.fedorainfracloud.org
 copr-dist-git-dev.aws.fedoraproject.org
 copr-dist-git-stg.fedorainfracloud.org
 copr-fe-dev.aws.fedoraproject.org
@@ -672,7 +671,6 @@ copr-frontend01.stg.phx2.fedoraproject.org
 copr-frontend02.stg.phx2.fedoraproject.org
 copr-keygen-dev.cloud.fedoraproject.org
 copr-keygen-dev.aws.fedoraproject.org
-copr-keygen-dev-aws.fedorainfracloud.org
 copr-keygen-stg.fedorainfracloud.org
 datagrepper01.stg.phx2.fedoraproject.org
 db-fas01.stg.phx2.fedoraproject.org
@@ -1123,7 +1121,7 @@ copr-be.aws.fedoraproject.org
 copr-dist-git.fedorainfracloud.org
 
 [copr_dist_git_aws]
-copr-dist-git-aws.fedorainfracloud.org
+copr-dist-git.aws.fedoraproject.org
 
 [copr_front_dev]
 copr-fe-dev.cloud.fedoraproject.org
@@ -1142,17 +1140,16 @@ copr-be-dev.aws.fedoraproject.org
 copr-keygen-dev.cloud.fedoraproject.org
 
 [copr_keygen_aws]
-copr-keygen-aws.fedorainfracloud.org
+copr-keygen.aws.fedoraproject.org
 
 [copr_keygen_dev_aws]
-# stg machine in AWS
-copr-keygen-dev-aws.fedorainfracloud.org
+copr-keygen-dev.aws.fedoraproject.org
 
 [copr_dist_git_dev]
 copr-dist-git-dev.fedorainfracloud.org
 
 [copr_dist_git_dev_aws]
-copr-dist-git-dev-aws.fedorainfracloud.org
+copr-dist-git-dev.aws.fedoraproject.org
 
 [copr_front_stg]
 copr-frontend01.stg.phx2.fedoraproject.org