diff --git a/.github/workflows/base-image-rebuild.yml b/.github/workflows/base-image-rebuild.yml
index 70092fe..5744eac 100644
--- a/.github/workflows/base-image-rebuild.yml
+++ b/.github/workflows/base-image-rebuild.yml
@@ -8,7 +8,7 @@ on:
     branches:
       - main
     paths:
-      - containers/Containerfile.c9s
+      - containers/Containerfile
 
 jobs:
   build:
@@ -20,8 +20,15 @@ jobs:
     strategy:
       matrix:
         include:
-          - containerfile: containers/Containerfile.c9s
-            tags: "c9s latest"
+          - containerfile: containers/Containerfile
+            tags: "fedora latest"
+            archs: "amd64"
+          - containerfile: containers/Containerfile
+            tags: "fedora latest"
+            archs: "arm64"
+          - containerfile: containers/Containerfile
+            tags: "fedora latest"
+            archs: "ppc64le"
 
     steps:
       - uses: actions/checkout@v3
@@ -38,7 +45,7 @@ jobs:
           containerfiles: ${{ matrix.containerfile }}
           image: base
           tags: ${{ matrix.tags }}
-          archs: amd64, arm64, ppc64le
+          archs: ${{ matrix.archs }}
           # Uncomment once we stop using oc cluster up for tests
           #           oci: true
 
diff --git a/containers/Containerfile.c9s b/containers/Containerfile
similarity index 56%
rename from containers/Containerfile.c9s
rename to containers/Containerfile
index fdbe3bf..e6b7d44 100644
--- a/containers/Containerfile.c9s
+++ b/containers/Containerfile
@@ -1,15 +1,11 @@
 # Be aware that this image is used for all stages, so if a dependency is removed be sure that it is
 # not required in anywhere
 
-FROM quay.io/centos/centos:stream9
+FROM registry.fedoraproject.org/fedora:41
 
 ENV ANSIBLE_PYTHON_INTERPRETER=/usr/bin/python3 \
     ANSIBLE_STDOUT_CALLBACK=debug
 
-RUN dnf -y install epel-release && \
-    crb enable && \
-    # TODO: revert this change after psql:15 works fine
-    dnf -y module enable postgresql:16 && \
-    dnf -y upgrade && \
+RUN dnf -y upgrade && \
     dnf -y install ansible python3-pip && \
     dnf clean all