diff --git a/jenkins-scripts/dsl/gz-collections.yaml b/jenkins-scripts/dsl/gz-collections.yaml
index 300235db5..50addd304 100644
--- a/jenkins-scripts/dsl/gz-collections.yaml
+++ b/jenkins-scripts/dsl/gz-collections.yaml
@@ -28,31 +28,31 @@ spec_version: 0
 collections:
   - name: 'citadel'
     libs:
-      - name: ign-cmake
+      - name: gz-cmake
         major_version: 2
         repo:
           current_branch: ign-cmake2
-      - name: ign-tools
+      - name: gz-tools
         major_version: 1
         repo:
           current_branch: ign-tools1
-      - name: ign-math
+      - name: gz-math
         major_version: 6
         repo:
           current_branch: ign-math6
-      - name: ign-plugin
+      - name: gz-plugin
         major_version: 1
         repo:
           current_branch: ign-plugin1
-      - name: ign-common
+      - name: gz-common
         major_version: 3
         repo:
           current_branch: ign-common3
-      - name: ign-msgs
+      - name: gz-msgs
         major_version: 5
         repo:
           current_branch: ign-msgs5
-      - name: ign-rendering
+      - name: gz-rendering
         major_version: 3
         repo:
           current_branch: ign-rendering3
@@ -60,49 +60,49 @@ collections:
         major_version: 9
         repo:
           current_branch: sdf9
-      - name: ign-fuel-tools
+      - name: gz-fuel-tools
         major_version: 4
         repo:
           current_branch: ign-fuel-tools4
-      - name: ign-transport
+      - name: gz-transport
         major_version: 8
         repo:
           current_branch: ign-transport8
-      - name: ign-gui
+      - name: gz-gui
         major_version: 3
         repo:
           current_branch: ign-gui3
-      - name: ign-sensors
+      - name: gz-sensors
         major_version: 3
         repo:
           current_branch: ign-sensors3
-      - name: ign-physics
+      - name: gz-physics
         major_version: 2
         repo:
           current_branch: ign-physics2
-      - name: ign-gazebo
-        major_version: 7
+      - name: gz-sim
+        major_version: 3
         repo:
           current_branch: ign-gazebo3
-      - name: ign-launch
+      - name: gz-launch
         major_version: 2
         repo:
           current_branch: ign-launch2
-      - name: ign-citadel
+      - name: gz-citadel
         major_version: 1
         repo:
           current_branch: main
     ci:
       configs:
-        - bionic
+        - focal
         - brew
         - win
     packaging:
       configs:
-        - bionic
+        - focal
       linux:
           ignore_major_version:
-            - ign-citadel
+            - gz-citadel
   - name: 'fortress'
     libs:
       - name: gz-cmake
@@ -443,30 +443,6 @@ collections:
       exclude:
           - __upcoming__
 ci_configs:
-  - name: bionic
-    system:
-      so: linux
-      distribution: ubuntu
-      version: bionic
-      arch: amd64
-    exclude:
-      all:
-        - ign-citadel
-      abichecker:
-        - ign-cmake
-        - ign-tools
-    requirements:
-      large_memory:
-        - ign-physics
-      nvidia_gpu:
-        - ign-gazebo
-        - ign-gui
-        - ign-rendering
-        - ign-sensors
-    pre_setup_script_hook:
-      gz-physics:
-        - "export MAKE_JOBS=1"
-    tests_disabled:
   - name: focal
     system:
       so: linux
@@ -483,6 +459,7 @@ ci_configs:
         - gz-sensors
     exclude:
       all:
+        - gz-citadel
         - gz-fortress
         - gz-garden
       abichecker:
@@ -494,7 +471,7 @@ ci_configs:
         - gz-plugin
         - gz-utils
     pre_setup_script_hook:
-      ign-physics:
+      gz-physics:
         - "export MAKE_JOBS=1"
     tests_disabled:
   - name: jammy
@@ -531,7 +508,7 @@ ci_configs:
     requirements:
     exclude:
       all:
-        - ign-citadel
+        - gz-citadel
         - gz-fortress
         - gz-garden
         - gz-harmonic
@@ -562,7 +539,7 @@ ci_configs:
     requirements:
     exclude:
       all:
-        - ign-citadel
+        - gz-citadel
         - gz-fortress
         - gz-garden
         - gz-harmonic
@@ -583,31 +560,8 @@ ci_configs:
       - gz-tools
       - gz-transport
       - gz-utils
-      - ign-cmake
-      - ign-common
-      - ign-fuel-tools
-      - ign-sim
-      - ign-gui
-      - ign-launch
-      - ign-math
-      - ign-msgs
-      - ign-physics
-      - ign-rendering
-      - ign-sensors
-      - ign-tools
-      - ign-transport
-      - ign-utils
       - sdformat
 packaging_configs:
-  - name: bionic
-    system:
-      so: linux
-      distribution: ubuntu
-      version: bionic
-      arch:
-        - i386
-        - amd64
-        - arm64
   - name: focal
     system:
       so: linux