diff --git a/.gitea/workflows/almalinux8.yaml b/.gitea/workflows/almalinux8.yaml
index 2d5f1ad..42267ab 100644
--- a/.gitea/workflows/almalinux8.yaml
+++ b/.gitea/workflows/almalinux8.yaml
@@ -22,6 +22,16 @@ jobs:
           microdnf -y install git nodejs buildah podman
       - name: Check out repository code
         uses: actions/checkout@v4
+      - name: Login to quay.io
+        uses: docker/login-action@v3
+        with:
+          registry: quay.io
+          username: ${{ vars.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_SECRET }}
+      # - name: Set up QEMU
+      #   uses: docker/setup-qemu-action@v3
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v3
       - if: ${{ matrix.flavor == 'default' }}
         name: Build almalinux default image
         uses: redhat-actions/buildah-build@v2
@@ -33,14 +43,18 @@ jobs:
             ALMALINUX_VERSION=${{ matrix.version }}
           tags: |
             quay.io/sindigilive/almalinux:${{ matrix.version }}
-      - if: ${{ matrix.flavor == 'default' }}
-        name: Push To quay.io
-        uses: redhat-actions/push-to-registry@v2
+      - if: ${{ matrix.flavor == 'micro' }} 
+        name: Build and push almalinux flavor
+        uses: docker/build-push-action@v5
         with:
-          tags: quay.io/sindigilive/almalinux:${{ matrix.version }}
-          registry: quay.io
-          username: ${{ vars.QUAY_USERNAME }}
-          password: ${{ secrets.QUAY_SECRET }}
+          # platforms: linux/amd64,linux/arm64
+          push: true
+          context: .
+          file: ./8/Dockerfile.${{ matrix.flavor }}
+          build-args: |
+            ALMALINUX_VERSION=${{ matrix.version }}
+          tags: |
+            quay.io/sindigilive/almalinux:${{ matrix.version }}-${{ matrix.flavor }}
       - if: ${{ matrix.flavor == 'default' }}
         name: Scan almalinux image with Trivy
         uses: aquasecurity/trivy-action@0.20.0
@@ -89,16 +103,26 @@ jobs:
           microdnf -y install git nodejs buildah podman
       - name: Check out repository code
         uses: actions/checkout@v4
-      - name: Build and push latest almalinux8-micro
-        uses: redhat-actions/buildah-build@v2
+      - name: Login to quay.io
+        uses: docker/login-action@v3
+        with:
+          registry: quay.io
+          username: ${{ vars.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_SECRET }}
+      # - name: Set up QEMU
+      #   uses: docker/setup-qemu-action@v3
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Build and push latest almalinux9-micro
+        uses: docker/build-push-action@v5
         with:
           context: .
           containerfiles: |
             8/Dockerfile.micro
           tags: |
             quay.io/sindigilive/almalinux:8-micro
-      - name: Build and push latest-almalinux8
-        uses: redhat-actions/buildah-build@v2
+      - name: Build and push latest almalinux9
+        uses: docker/build-push-action@v5
         with:
           context: .
           containerfiles: |
@@ -112,5 +136,4 @@ jobs:
           username: ${{ vars.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_SECRET }}
           tags: |
-            quay.io/sindigilive/almalinux:8-micro
             quay.io/sindigilive/almalinux:8
diff --git a/.gitea/workflows/almalinux9.yaml b/.gitea/workflows/almalinux9.yaml
index 82c66f8..2c7dad2 100644
--- a/.gitea/workflows/almalinux9.yaml
+++ b/.gitea/workflows/almalinux9.yaml
@@ -22,9 +22,19 @@ jobs:
           microdnf -y install git nodejs buildah podman
       - name: Check out repository code
         uses: actions/checkout@v4
-      - if: ${{ matrix.flavor == 'default' }}
-        name: Build almalinux default image
-        uses: redhat-actions/buildah-build@v2
+      - name: Login to docker.io
+        uses: docker/login-action@v3
+        with:
+          registry: quay.io
+          username: ${{ vars.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_SECRET }}
+      # - name: Set up QEMU
+      #   uses: docker/setup-qemu-action@v3
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v3
+      - if: ${{ matrix.flavor  == 'default' }}
+        name: Build and push almalinux
+        uses: docker/build-push-action@v5
         with:
           context: .
           containerfiles: |
@@ -33,14 +43,18 @@ jobs:
             ALMALINUX_VERSION=${{ matrix.version }}
           tags: |
             quay.io/sindigilive/almalinux:${{ matrix.version }}
-      - if: ${{ matrix.flavor == 'default' }}
-        name: Push To quay.io
-        uses: redhat-actions/push-to-registry@v2
+      - if: ${{ matrix.flavor == 'micro' }}
+        name: Build and push almalinux
+        uses: docker/build-push-action@v5
         with:
-          tags: quay.io/sindigilive/almalinux:${{ matrix.version }}
-          registry: quay.io
-          username: ${{ vars.QUAY_USERNAME }}
-          password: ${{ secrets.QUAY_SECRET }}
+          # platforms: linux/amd64,linux/arm64
+          push: true
+          context: .
+          file: ./9/Dockerfile.${{ matrix.flavor }}
+          build-args: |
+            ALMALINUX_VERSION=${{ matrix.version }}
+          tags: |
+            quay.io/sindigilive/almalinux:${{ matrix.version }}-${{ matrix.flavor }}
       - if: ${{ matrix.flavor == 'default' }}
         name: Scan almalinux image with Trivy
         uses: aquasecurity/trivy-action@0.20.0
@@ -89,6 +103,16 @@ jobs:
           microdnf -y install git nodejs buildah podman
       - name: Check out repository code
         uses: actions/checkout@v4
+      - name: Login to docker.io
+        uses: docker/login-action@v3
+        with:
+          registry: quay.io
+          username: ${{ vars.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_SECRET }}
+      # - name: Set up QEMU
+      #   uses: docker/setup-qemu-action@v3
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v3
       - name: Build and push latest almalinux9-micro
         uses: redhat-actions/buildah-build@v2
         with:
@@ -98,8 +122,8 @@ jobs:
           tags: |
             quay.io/sindigilive/almalinux:9-micro
             quay.io/sindigilive/almalinux:micro
-      - name: Build and push latest-almalinux9
-        uses: redhat-actions/buildah-build@v2
+      - name: Build and push latest almalinux9
+        uses: docker/build-push-action@v5
         with:
           context: .
           containerfiles: |
@@ -114,7 +138,5 @@ jobs:
           username: ${{ vars.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_SECRET }}
           tags: |
-            quay.io/sindigilive/almalinux:9-micro
-            quay.io/sindigilive/almalinux:micro
             quay.io/sindigilive/almalinux:9
             quay.io/sindigilive/almalinux:latest