diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 1358d7a..99672bc 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -14,10 +14,10 @@ jobs:
   changes:
     runs-on: job-v2
     outputs:
-      fedora: ${{ steps.filter.outputs.fedora == 'true' }}
-      infra: ${{ steps.filter.outputs.infra == 'true' || steps.filter.outputs.fedora == 'true' }}
-      go: ${{ steps.filter.outputs.go == 'true' || steps.filter.outputs.fedora == 'true' }}
-      php: ${{ steps.filter.outputs.php == 'true' || steps.filter.outputs.fedora == 'true' }}
+      base: ${{ steps.filter.outputs.base == 'true' }}
+      infra: ${{ steps.filter.outputs.infra == 'true' || steps.filter.outputs.base == 'true' }}
+      go: ${{ steps.filter.outputs.go == 'true' || steps.filter.outputs.base == 'true' }}
+      php: ${{ steps.filter.outputs.php == 'true' || steps.filter.outputs.base == 'true' }}
       any_change: ${{ steps.filter.outputs.workflow == 'true' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'}}
     steps:
       - uses: actions/checkout@v4
@@ -26,14 +26,14 @@ jobs:
         with:
           filters: |
             workflow: ['.gitea/workflows/build.yaml']
-            fedora: ['containers/fedora/**']
+            base: ['containers/base/**']
             infra: ['containers/infra/**']
             go: ['containers/go/**']
             php: ['containers/php/**']
 
   base-image:
     needs: [changes]
-    if: ${{ needs.changes.outputs.fedora == 'true' || needs.changes.outputs.any_change == 'true' }}
+    if: ${{ needs.changes.outputs.base == 'true' || needs.changes.outputs.any_change == 'true' }}
     runs-on: job-v2
     steps:
       - uses: actions/checkout@v4
@@ -47,10 +47,10 @@ jobs:
         id: build
         uses: job79/buildah-build@65b3793a1370c1ccd74a5c0d090d70eb9637a4ef
         with:
-          image: job79/fedora
+          image: job79/base
           tags: ${{ github.ref_name }}
-          context: ./containers/fedora
-          containerfiles: ./containers/fedora/Containerfile
+          context: ./containers/base
+          containerfiles: ./containers/base/Containerfile
           platforms: linux/amd64
       - name: Push
         uses: redhat-actions/push-to-registry@v2
diff --git a/containers/fedora/Containerfile b/containers/base/Containerfile
similarity index 100%
rename from containers/fedora/Containerfile
rename to containers/base/Containerfile
diff --git a/containers/fedora/config/bashrc b/containers/base/config/bashrc
similarity index 100%
rename from containers/fedora/config/bashrc
rename to containers/base/config/bashrc
diff --git a/containers/fedora/config/bin/host b/containers/base/config/bin/host
similarity index 100%
rename from containers/fedora/config/bin/host
rename to containers/base/config/bin/host
diff --git a/containers/fedora/config/bin/podman b/containers/base/config/bin/podman
similarity index 100%
rename from containers/fedora/config/bin/podman
rename to containers/base/config/bin/podman
diff --git a/containers/fedora/config/bin/xdg-open b/containers/base/config/bin/xdg-open
similarity index 100%
rename from containers/fedora/config/bin/xdg-open
rename to containers/base/config/bin/xdg-open
diff --git a/containers/fedora/config/git b/containers/base/config/git
similarity index 100%
rename from containers/fedora/config/git
rename to containers/base/config/git
diff --git a/containers/go/Containerfile b/containers/go/Containerfile
index 7cdd0fe..f0e97a1 100644
--- a/containers/go/Containerfile
+++ b/containers/go/Containerfile
@@ -1,5 +1,5 @@
 ARG TAG
-FROM job79/fedora:${TAG}
+FROM job79/base:${TAG}
 USER root
 
 RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \
diff --git a/containers/infra/Containerfile b/containers/infra/Containerfile
index d9c49fb..084b669 100644
--- a/containers/infra/Containerfile
+++ b/containers/infra/Containerfile
@@ -1,5 +1,5 @@
 ARG TAG
-FROM job79/fedora:${TAG}
+FROM job79/base:${TAG}
 USER root
 
 RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \
diff --git a/containers/php/Containerfile b/containers/php/Containerfile
index 6a91ef0..51e3971 100644
--- a/containers/php/Containerfile
+++ b/containers/php/Containerfile
@@ -1,5 +1,5 @@
 ARG TAG
-FROM job79/fedora:${TAG}
+FROM job79/base:${TAG}
 USER root
 
 RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \