diff --git a/.forgejo/workflows/build-image.yaml b/.forgejo/workflows/build-image.yaml
index d5fbc43..d5ffd53 100644
--- a/.forgejo/workflows/build-image.yaml
+++ b/.forgejo/workflows/build-image.yaml
@@ -4,19 +4,18 @@ on:
     - cron: '0 5 * * *'
 jobs:
   build-kde:
-    name: 'Build onc-kde:main'
     runs-on: oci-builder
     steps:
       - uses: actions/checkout@v4
-
-      - run: cd ${{ env.GITHUB_WORKSPACE }}
-
+      - run:  cd ${{ env.GITHUB_WORKSPACE }}
       - name: 'Log in to registry'
         run: >
           buildah login
           -u ${{ vars.REGISTRY_USERNAME }}
           -p ${{ secrets.REGISTRY_PASSWORD }}
           ${{ vars.REGISTRY_DOMAIN }}
+      # base
+      - run:  mkdir cache
 
       - name: 'Build image - onc-kde:main'
         run: >
@@ -26,6 +25,7 @@ jobs:
           --userns=container
           --security-opt=no-new-privileges
           --annotation=quay.expires-after=
+          -v ${{ env.GITHUB_WORKSPACE }}/cache:/var/cache/libdnf5:Z
           --build-arg REGISTRY_DOMAIN=${{ vars.REGISTRY_DOMAIN }}
           --build-arg NAMESPACE=${{ vars.NAMESPACE }}
 
@@ -53,23 +53,7 @@ jobs:
           ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main.expiring
           ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:$(buildah inspect -t image -f '{{ index .OCIv1.Config.Labels "org.opencontainers.image.version" }}' ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main)
 
-
-  build-kde-ver4a:
-    name: 'Build onc-kde:main-ver4a'
-    runs-on: oci-builder
-    needs: 'build-kde'
-    steps:
-      - uses: actions/checkout@v4
-
-      - run: cd ${{ env.GITHUB_WORKSPACE }}
-
-      - name: 'Log in to registry'
-        run: >
-          buildah login
-          -u ${{ vars.REGISTRY_USERNAME }}
-          -p ${{ secrets.REGISTRY_PASSWORD }}
-          ${{ vars.REGISTRY_DOMAIN }}
-
+      # base + ver4a's configuration
       - name: 'Build image - onc-kde:main-ver4a'
         run: >
           buildah bud
@@ -78,6 +62,7 @@ jobs:
           --userns=container
           --security-opt=no-new-privileges
           --annotation=quay.expires-after=
+          -v ${{ env.GITHUB_WORKSPACE }}/cache:/var/cache/libdnf5:Z
           --build-arg REGISTRY_DOMAIN=${{ vars.REGISTRY_DOMAIN }}
           --build-arg NAMESPACE=${{ vars.NAMESPACE }}
 
@@ -105,23 +90,7 @@ jobs:
           ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main-ver4a.expiring
           ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:$(buildah inspect -t image -f '{{ index .OCIv1.Config.Labels "org.opencontainers.image.version" }}' ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main-ver4a)-ver4a
 
-
-  build-kde-nvidia:
-    name: 'Build onc-kde:main-nvidia'
-    runs-on: oci-builder
-    needs: 'build-kde'
-    steps:
-      - uses: actions/checkout@v4
-
-      - run: cd ${{ env.GITHUB_WORKSPACE }}
-
-      - name: 'Log in to registry'
-        run: >
-          buildah login
-          -u ${{ vars.REGISTRY_USERNAME }}
-          -p ${{ secrets.REGISTRY_PASSWORD }}
-          ${{ vars.REGISTRY_DOMAIN }}
-
+      # base + nvidia
       - name: 'Build image - onc-kde:main-nvidia'
         run: >
           buildah bud
@@ -130,6 +99,7 @@ jobs:
           --userns=container
           --security-opt=no-new-privileges
           --annotation=quay.expires-after=
+          -v ${{ env.GITHUB_WORKSPACE }}/cache:/var/cache/libdnf5:Z
           --build-arg REGISTRY_DOMAIN=${{ vars.REGISTRY_DOMAIN }}
           --build-arg NAMESPACE=${{ vars.NAMESPACE }}
 
@@ -156,21 +126,7 @@ jobs:
           --compression-level=${{ vars.COMPRESSION_LEVEL }}
           ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main-nvidia.expiring
           ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:$(buildah inspect -t image -f '{{ index .OCIv1.Config.Labels "org.opencontainers.image.version" }}' ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main-nvidia)-nvidia
-
-
-  build-kde-nvidia-ver4a:
-    name: 'Build onc-kde:main-nvidia-ver4a'
-    runs-on: oci-builder
-    needs: 'build-kde-nvidia'
-    steps:
-      - uses: actions/checkout@v4
-      - run: cd ${{ env.GITHUB_WORKSPACE }}
-      - name: 'Log in to registry'
-        run: >
-          buildah login
-          -u ${{ vars.REGISTRY_USERNAME }}
-          -p ${{ secrets.REGISTRY_PASSWORD }}
-          ${{ vars.REGISTRY_DOMAIN }}
+      # base + nvidia + ver4a's configuration
       - name: 'Build image - onc-kde:main-nvidia-ver4a'
         run: >
           buildah bud
@@ -179,6 +135,7 @@ jobs:
           --userns=container
           --security-opt=no-new-privileges
           --annotation=quay.expires-after=
+          -v ${{ env.GITHUB_WORKSPACE }}/cache:/var/cache/libdnf5:Z
           --build-arg REGISTRY_DOMAIN=${{ vars.REGISTRY_DOMAIN }}
           --build-arg NAMESPACE=${{ vars.NAMESPACE }}