diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 428bd5c..bea965e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,12 +5,20 @@ image: quay.io/fedora/fedora-coreos:stable
 stages:
   - build
 
-test-build:
+.base:
   parallel:
     matrix:
-      - VARIANT:
-        - c9s
-        - fedora
+      - TIER: [tier-1]
+        OS: centos
+        VERSION: [stream9]
+        VARIANT: ["", "-rt"]
+      - TIER: [tier-1]
+        OS: fedora
+        VERSION: [38]
+        VARIANT: [""]
+
+test-build:
+  extends: .base
   only:
     - merge_requests
   stage: build
@@ -19,18 +27,14 @@ test-build:
     - echo "$CI_REGISTRY_PASSWORD" | podman login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
   script:
     - rpm-ostree install distribution-gpg-keys
-    - rpm-ostree compose image --initialize --format=ociarchive ${VARIANT}.yaml ${VARIANT}.ociarchive
+    - set -euo pipefail; rpm-ostree compose image --format=ociarchive --initialize ${OS}-${TIER}${VARIANT}-${VERSION}.yaml dest.oci-archive
 
 build-push:
-  parallel:
-    matrix:
-      - VARIANT:
-        - c9s
-        - fedora
+  extends: .base
   rules:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
   variables:
-    COMPOSE_INITIALIZE: ""
+    COMPOSE_INITIALIZE: "1"
     FORCE: ""
   stage: build
   before_script:
@@ -38,5 +42,5 @@ build-push:
     - echo "$CI_REGISTRY_PASSWORD" | podman login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
   script:
     - rpm-ostree install distribution-gpg-keys
-    - rpm-ostree compose image ${COMPOSE_INITIALIZE:+--initialize} ${FORCE:+--force-nocache} --format=registry ${VARIANT}.yaml ${CI_REGISTRY_IMAGE}/${VARIANT}-boot
+    - set -euo pipefail; rpm-ostree compose image ${COMPOSE_INITIALIZE:+--initialize} ${FORCE:+--force-nocache} --format=registry ${OS}-${TIER}${VARIANT}-${VERSION}.yaml ${CI_REGISTRY_IMAGE}/${OS}-boot-${TIER}${VARIANT}:${VERSION}
 
diff --git a/c9s-base.yaml b/centos-base.yaml
similarity index 100%
rename from c9s-base.yaml
rename to centos-base.yaml
diff --git a/c9s-rt.yaml b/centos-tier-1-rt-stream9.yaml
similarity index 62%
rename from c9s-rt.yaml
rename to centos-tier-1-rt-stream9.yaml
index b0137e3..3fe78fb 100644
--- a/c9s-rt.yaml
+++ b/centos-tier-1-rt-stream9.yaml
@@ -1,3 +1,3 @@
 include:
-  - c9s-base.yaml
+  - centos-base.yaml
   - tier-1/kernel-rt.yaml
diff --git a/c9s.yaml b/centos-tier-1-stream9.yaml
similarity index 61%
rename from c9s.yaml
rename to centos-tier-1-stream9.yaml
index 8a639cf..36f4b3c 100644
--- a/c9s.yaml
+++ b/centos-tier-1-stream9.yaml
@@ -1,4 +1,4 @@
 include:
-  - c9s-base.yaml
+  - centos-base.yaml
   - tier-1/kernel.yaml
 
diff --git a/fedora.yaml b/fedora-tier-1-38.yaml
similarity index 100%
rename from fedora.yaml
rename to fedora-tier-1-38.yaml