diff --git a/inventory/cloud b/inventory/cloud
index aa1e32809a..48a9471093 100644
--- a/inventory/cloud
+++ b/inventory/cloud
@@ -6,7 +6,6 @@
 
 ## COPR
 #copr-vmhost01.fedorainfracloud.org
-#retrace03.fedorainfracloud.org
 
 #[cloud_phx2_guests]
 #cloud-noc01.fedorainfracloud.org
diff --git a/inventory/host_vars/retrace03.fedorainfracloud.org b/inventory/host_vars/retrace03.rdu-cc.fedoraproject.org
similarity index 53%
rename from inventory/host_vars/retrace03.fedorainfracloud.org
rename to inventory/host_vars/retrace03.rdu-cc.fedoraproject.org
index 2356ea8d01..8e6bc98e70 100644
--- a/inventory/host_vars/retrace03.fedorainfracloud.org
+++ b/inventory/host_vars/retrace03.rdu-cc.fedoraproject.org
@@ -3,8 +3,8 @@ faf_server_name: retrace.fedoraproject.org/faf
 rs_use_faf_packages: true
 
 # we do not have enough storage on stg
-rs_internal_fedora_vers: [30, 31, 32, rawhide]
-rs_internal_fedora_vers_removed: [27, 28, 29]
+rs_internal_fedora_vers: [31, 32, rawhide]
+rs_internal_fedora_vers_removed: [27, 28, 29, 30]
 rs_internal_arch_list: [source, x86_64, i386]
 
 nagios_Check_Services:
@@ -25,6 +25,7 @@ eol_opsys:
   - { opsys: "Fedora", release: "27"}
   - { opsys: "Fedora", release: "28"}
   - { opsys: "Fedora", release: "29"}
+  - { opsys: "Fedora", release: "30"}
 
 # GDPR SAR variables
 sar_script: '/usr/bin/faf sar'
@@ -32,81 +33,6 @@ sar_script_user: faf
 sar_output_file: faf.json
 
 faf_repos:
-  - { name: 'fedora-30-updates-testing-source',
-      url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/30/Everything/SRPMS/'],
-      arch: 'src',
-      opsys: 'Fedora 30'
-    }
-  - { name: 'fedora-30-updates-source',
-      url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/30/Everything/SRPMS/'],
-      arch: 'src',
-      opsys: 'Fedora 30'
-    }
-  - { name: 'fedora-30-i386-debug',
-      url: ['http://dl01.fedoraproject.org/pub/fedora-secondary/releases/30/Everything/i386/debug/tree/', 'http://dl01.fedoraproject.org/pub/fedora-secondary/development/30/Everything/i386/debug/tree/'],
-      arch: 'i386',
-      opsys: 'Fedora 30',
-    }
-  - { name: 'fedora-30-i386-testing-debug',
-      url: ['http://dl01.fedoraproject.org/pub/fedora-secondary/updates/testing/30/Everything/i386/debug/'],
-      arch: 'i386',
-      opsys: 'Fedora 30',
-    }
-  - { name: 'fedora-30-i386-testing',
-      url: ['http://dl01.fedoraproject.org/pub/fedora-secondary/updates/testing/30/Everything/i386/'],
-      arch: 'i386',
-      opsys: 'Fedora 30',
-    }
-  - { name: 'fedora-30-i386-updates-debug',
-      url: ['http://dl01.fedoraproject.org/pub/fedora-secondary/updates/30/Everything/i386/debug/'],
-      arch: 'i386',
-      opsys: 'Fedora 30',
-    }
-  - { name: 'fedora-30-i386-updates',
-      url: ['http://dl01.fedoraproject.org/pub/fedora-secondary/updates/30/Everything/i386/'],
-      arch: 'i386',
-      opsys: 'Fedora 30',
-    }
-  - { name: 'fedora-30-i386',
-      url: ['http://dl01.fedoraproject.org/pub/fedora-secondary/releases/30/Everything/i386/os/', 'http://dl01.fedoraproject.org/pub/fedora-secondary/development/30/Everything/i386/os/'],
-      arch: 'i386',
-      opsys: 'Fedora 30',
-    }
-  - { name: 'fedora-30-source',
-      url: ['http://dl01.fedoraproject.org/pub/fedora/linux/releases/30/Everything/source/tree/', 'http://dl01.fedoraproject.org/pub/fedora/linux/development/30/Everything/source/tree/'],
-      arch: 'src',
-      opsys: 'Fedora 30',
-    }
-  - { name: 'fedora-30-x86_64',
-      url: ['http://dl01.fedoraproject.org/pub/fedora/linux/releases/30/Everything/x86_64/os/', 'http://dl01.fedoraproject.org/pub/fedora/linux/development/30/Everything/x86_64/os/'],
-      arch: 'x86_64',
-      opsys: 'Fedora 30',
-    }
-  - { name: 'fedora-30-x86_64-debug',
-      url: ['http://dl01.fedoraproject.org/pub/fedora/linux/releases/30/Everything/x86_64/debug/tree/', 'http://dl01.fedoraproject.org/pub/fedora/linux/development/30/Everything/x86_64/debug/tree/'],
-      arch: 'x86_64',
-      opsys: 'Fedora 30',
-    }
-  - { name: 'fedora-30-x86_64-testing-debug',
-      url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/30/Everything/x86_64/debug/'],
-      arch: 'x86_64',
-      opsys: 'Fedora 30',
-    }
-  - { name: 'fedora-30-x86_64-testing',
-      url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/30/Everything/x86_64/'],
-      arch: 'x86_64',
-      opsys: 'Fedora 30',
-    }
-  - { name: 'fedora-30-x86_64-updates-debug',
-      url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/30/Everything/x86_64/debug/'],
-      arch: 'x86_64',
-      opsys: 'Fedora 30',
-    }
-  - { name: 'fedora-30-x86_64-updates',
-      url: ['http://dl01.fedoraproject.org/pub/fedora/linux/updates/30/Everything/x86_64/'],
-      arch: 'x86_64',
-      opsys: 'Fedora 30',
-    }
   - { name: 'fedora-31-source',
       url: ['http://dl01.fedoraproject.org/pub/fedora/linux/releases/31/Everything/source/tree/', 'http://dl01.fedoraproject.org/pub/fedora/linux/development/31/Everything/source/tree/'],
       arch: 'src',
diff --git a/inventory/inventory b/inventory/inventory
index 9e2efb3ac7..1d46c987ef 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -21,8 +21,7 @@ compose-iot01.iad2.fedoraproject.org
 # composer.stg.iad2.fedoraproject.org
 
 [retrace]
-#retrace01.qa.fedoraproject.org
-#retrace03.fedorainfracloud.org
+retrace03.rdu-cc.fedoraproject.org
 
 [retrace_stg_aws]
 retrace-stg.aws.fedoraproject.org