diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cad187963..84dac3810 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -121,7 +121,7 @@ build:slc6:
   image: tswilliams/ipbus-sw-dev-slc6:latest
   variables:
     ADDITIONAL_RPMS_TO_INSTALL: ""
-    YUMGROUPS_FILE: "yumgroups-slc6.xml"
+    YUMGROUPS_FILE: "ci/yumgroups-slc6.xml"
     OUTPUT_REPO_SUBDIR: "slc6_x86_64"
 
 
@@ -130,7 +130,7 @@ build:centos7:
   image: tswilliams/ipbus-sw-dev-cc7:latest
   variables:
     ADDITIONAL_RPMS_TO_INSTALL: "boost-devel pugixml-devel"
-    YUMGROUPS_FILE: "yumgroups-centos7.xml"
+    YUMGROUPS_FILE: "ci/yumgroups-centos7.xml"
     OUTPUT_REPO_SUBDIR: "centos7_x86_64"
 
 
diff --git a/yumgroups-centos7.xml b/ci/yumgroups-centos7.xml
similarity index 97%
rename from yumgroups-centos7.xml
rename to ci/yumgroups-centos7.xml
index caaf3af4c..01f132ee0 100755
--- a/yumgroups-centos7.xml
+++ b/ci/yumgroups-centos7.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <comps>
   <group>
-    <id>cactus</id>
+    <id>ipbus-sw</id>
     <name>uhal</name>
     <default>true</default>
     <description>uHAL packages of the CACTUS YUM repository</description>
diff --git a/yumgroups-slc6.xml b/ci/yumgroups-slc6.xml
similarity index 98%
rename from yumgroups-slc6.xml
rename to ci/yumgroups-slc6.xml
index f28cb2ec8..68ed6310a 100755
--- a/yumgroups-slc6.xml
+++ b/ci/yumgroups-slc6.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <comps>
   <group>
-    <id>cactus</id>
+    <id>ipbus-sw</id>
     <name>uhal</name>
     <default>true</default>
     <description>uHAL packages of the CACTUS YUM repository</description>