diff --git a/inventory/group_vars/copr_aws b/inventory/group_vars/copr_aws
index bbf399e7e7..e27b62767b 100644
--- a/inventory/group_vars/copr_aws
+++ b/inventory/group_vars/copr_aws
@@ -13,8 +13,8 @@ keygen_host: "52.202.64.55"
 backend_base_url: "https://download.copr.fedorainfracloud.org"
 postfix_maincf: "postfix/main.cf/main.cf.copr"
 
-frontend_base_url: "https://copr-fe.aws.fedoraproject.org"
-dist_git_base_url: "copr-dist-git.aws.fedoraproject.org"
+frontend_base_url: "https://copr.fedorainfracloud.org"
+dist_git_base_url: "copr-dist-git.fedorainfracloud.org"
 
 ansible_ifcfg_blacklist: true
 
diff --git a/inventory/group_vars/copr_back_aws b/inventory/group_vars/copr_back_aws
index a573937ec1..00a10a9aac 100644
--- a/inventory/group_vars/copr_back_aws
+++ b/inventory/group_vars/copr_back_aws
@@ -28,7 +28,7 @@ nrpe_procs_crit: 2500
 do_sign: "true"
 
 spawn_in_advance: "true"
-frontend_base_url: "https://copr-fe.aws.fedoraproject.org"
+frontend_base_url: "https://copr.fedorainfracloud.org"
 
 
 # These variables are pushed into /etc/system_identification by the base role.
diff --git a/inventory/group_vars/copr_dist_git_aws b/inventory/group_vars/copr_dist_git_aws
index 02e1f3b948..1a46a842b6 100644
--- a/inventory/group_vars/copr_dist_git_aws
+++ b/inventory/group_vars/copr_dist_git_aws
@@ -7,10 +7,8 @@ freezes: false
 letsencrypt:
   predefined_deploy_script: httpd
   certificates:
-    copr-dist-git.aws.fedoraproject.org:
-#    copr-dist-git.fedorainfracloud.org:
+    copr-dist-git.fedorainfracloud.org:
       domains:
-      - copr-dist-git.aws.fedoraproject.org
-#      - copr-dist-git.fedorainfracloud.org
+      - copr-dist-git.fedorainfracloud.org
       challenge_dir: /var/www/html
       mail: copr-devel@lists.fedorahosted.org
diff --git a/inventory/group_vars/copr_front_aws b/inventory/group_vars/copr_front_aws
index a68bf28237..36897214e7 100644
--- a/inventory/group_vars/copr_front_aws
+++ b/inventory/group_vars/copr_front_aws
@@ -1,7 +1,6 @@
 ---
 tcp_ports: [22, 80, 443]
-copr_hostname: "copr-fe.aws.fedoraproject.org"
-copr_frontend_public_hostname: "copr-fe.aws.fedoraproject.org"
+copr_frontend_public_hostname: "copr.fedorainfracloud.org"
 
 # These variables are pushed into /etc/system_identification by the base role.
 # Groups and individual hosts should override them with specific info.