diff --git a/roles/rebuilderd/defaults/main.yml b/roles/rebuilderd/defaults/main.yml
index a119d39b..2f902a78 100644
--- a/roles/rebuilderd/defaults/main.yml
+++ b/roles/rebuilderd/defaults/main.yml
@@ -4,7 +4,6 @@ rebuilder_website_loc: /usr/share/webapps/rebuilderd-website
 
 suites:
   - core
+  - core-testing
   - extra
-  - testing
-  - community
-  - community-testing
+  - extra-testing
diff --git a/roles/rebuilderd/templates/rebuilderd-sync.conf.j2 b/roles/rebuilderd/templates/rebuilderd-sync.conf.j2
index 7456c052..7500cb5a 100644
--- a/roles/rebuilderd/templates/rebuilderd-sync.conf.j2
+++ b/roles/rebuilderd/templates/rebuilderd-sync.conf.j2
@@ -4,30 +4,22 @@ suite = "core"
 architectures = ["x86_64"]
 source = "https://geo.mirror.pkgbuild.com/$repo/os/$arch"
 
+[profile."archlinux-core-testing"]
+distro = "archlinux"
+suite = "core-testing"
+architectures = ["x86_64"]
+source = "https://geo.mirror.pkgbuild.com/$repo/os/$arch"
+
 [profile."archlinux-extra"]
 distro = "archlinux"
 suite = "extra"
 architectures = ["x86_64"]
 source = "https://geo.mirror.pkgbuild.com/$repo/os/$arch"
-excludes = [""]
+excludes = ["cuda*", "tensorflow*", "*pytorch*", "*kube*", "python-tensorflow*"]
 
-[profile."archlinux-testing"]
+[profile."archlinux-extra-testing"]
 distro = "archlinux"
-suite = "testing"
-architectures = ["x86_64"]
-source = "https://geo.mirror.pkgbuild.com/$repo/os/$arch"
-excludes = [""]
-
-[profile."archlinux-community"]
-distro = "archlinux"
-suite = "community"
-architectures = ["x86_64"]
-source = "https://geo.mirror.pkgbuild.com/$repo/os/$arch"
-excludes = ["cuda*", "tensorflow*", "*pytorch*", "*kube*", "python-tensorflow*"]
-
-[profile."archlinux-community-testing"]
-distro = "archlinux"
-suite = "community-testing"
+suite = "extra-testing"
 architectures = ["x86_64"]
 source = "https://geo.mirror.pkgbuild.com/$repo/os/$arch"
 excludes = ["cuda*", "tensorflow*", "*pytorch*", "*kube*", "python-tensorflow*"]