diff --git a/configs/rhel-java--byteman.yaml b/configs/rhel-java--byteman.yaml
new file mode 100644
index 00000000..6a3b4c28
--- /dev/null
+++ b/configs/rhel-java--byteman.yaml
@@ -0,0 +1,13 @@
+document: feedback-pipeline-workload
+version: 1
+data:
+  name: Byteman
+  description: Java debugging tools
+  maintainer: rhel-java
+  labels:
+    - eln
+    - c10s
+  packages:
+    - byteman
+    - byteman-bmunit
+    - byteman-javadoc
diff --git a/configs/rhel-sst-java--java-c10s.yaml b/configs/rhel-java--java-21.yaml
similarity index 92%
rename from configs/rhel-sst-java--java-c10s.yaml
rename to configs/rhel-java--java-21.yaml
index dad3886c..176decd4 100644
--- a/configs/rhel-sst-java--java-c10s.yaml
+++ b/configs/rhel-java--java-21.yaml
@@ -1,9 +1,9 @@
 document: feedback-pipeline-workload
 version: 1
 data:
-  name: OpenJDK
+  name: OpenJDK 21
   description: OpenJDK and the Java Platform
-  maintainer: rhel-sst-java
+  maintainer: rhel-java
   labels:
     - c10s
   packages:
@@ -24,10 +24,6 @@ data:
     - java-21-openjdk-jmods-slowdebug
     - java-21-openjdk-src-slowdebug
     - java-21-openjdk-static-libs-slowdebug
-    # Core tool for JDK support work
-    - byteman
-    - byteman-bmunit
-    - byteman-javadoc
   # no s390x fastdebug due to build times
   arch_packages:
     aarch64:
diff --git a/configs/rhel-sst-java--java.yaml b/configs/rhel-java--java-25.yaml
similarity index 92%
rename from configs/rhel-sst-java--java.yaml
rename to configs/rhel-java--java-25.yaml
index 6c825375..23982d0f 100644
--- a/configs/rhel-sst-java--java.yaml
+++ b/configs/rhel-java--java-25.yaml
@@ -1,11 +1,12 @@
 document: feedback-pipeline-workload
 version: 1
 data:
-  name: OpenJDK
+  name: OpenJDK 25
   description: OpenJDK and the Java Platform
-  maintainer: rhel-sst-java
+  maintainer: rhel-java
   labels:
     - eln
+    - c10s
   packages:
     - java-25-openjdk
     - java-25-openjdk-demo
@@ -24,10 +25,6 @@ data:
     - java-25-openjdk-jmods-slowdebug
     - java-25-openjdk-src-slowdebug
     - java-25-openjdk-static-libs-slowdebug
-    # Core tool for JDK support work
-    - byteman
-    - byteman-bmunit
-    - byteman-javadoc
   # no s390x fastdebug due to build times
   arch_packages:
     aarch64:
diff --git a/configs/rhel-sst-java--jmc-unwanted.yaml b/configs/rhel-java--jmc-unwanted.yaml
similarity index 90%
rename from configs/rhel-sst-java--jmc-unwanted.yaml
rename to configs/rhel-java--jmc-unwanted.yaml
index 39316082..08b385fd 100644
--- a/configs/rhel-sst-java--jmc-unwanted.yaml
+++ b/configs/rhel-java--jmc-unwanted.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: Unwanted packages for JMC
   description: Packages we do not want to ship for JMC
-  maintainer: rhel-sst-java
+  maintainer: rhel-java
   unwanted_source_packages:
     - jmc-core
     - jmc
diff --git a/configs/rhel-sst-java--unwanted.yaml b/configs/rhel-java--unwanted.yaml
similarity index 99%
rename from configs/rhel-sst-java--unwanted.yaml
rename to configs/rhel-java--unwanted.yaml
index ce59f12f..e0c92878 100644
--- a/configs/rhel-sst-java--unwanted.yaml
+++ b/configs/rhel-java--unwanted.yaml
@@ -3,7 +3,7 @@ version: 1
 data:
   name: OpenJDK Unwanted Packages
   description: Packages that OpenJDK maintainers do not wish to maintain in RHEL 9
-  maintainer: rhel-sst-java
+  maintainer: rhel-java
   labels:
     - eln
     - c10s