diff --git a/.gitea/workflows/almalinux8.yaml b/.gitea/workflows/almalinux8.yaml
index 1d2a20c..639efeb 100644
--- a/.gitea/workflows/almalinux8.yaml
+++ b/.gitea/workflows/almalinux8.yaml
@@ -18,53 +18,59 @@ jobs:
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4
-      - name: Login to docker.io
-        uses: docker/login-action@v3
-        with:
-          username: ${{ vars.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      # - 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 base
-        uses: docker/build-push-action@v5
+        name: Build almalinux default image
+        uses: redhat-actions/build-push-action@v5
         with:
-          # platforms: linux/amd64,linux/arm64
-          push: true
           context: .
-          file: ./8/Dockerfile.${{ matrix.flavor }}
+          containerfiles: |
+            8/Containerfile.${{ matrix.flavor }}
           build-args: |
             ALMALINUX_VERSION=${{ matrix.version }}
           tags: |
-            ${{ vars.DOCKERHUB_USERNAME }}/almalinux:${{ matrix.version }}
-      - if: ${{ matrix.flavor == 'micro' }} 
+            quay.io/sindigilive/almalinux:${{ matrix.version }}
+      - if: ${{ matrix.flavor == 'default' }}
+        name: Push To quay.io
+        uses: redhat-actions/push-to-registry@v2
+        with:
+          tags: quay.io/sindigilive/almalinux:${{ matrix.version }}
+          registry: quay.io
+          username: ${{ vars.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_SECRET }}
+      - if: ${{ matrix.flavor == 'default' }}
+        name: Scan almalinux image with Trivy
+        uses: aquasecurity/trivy-action@0.20.0
+        with:
+          image-ref: 'quay.io/sindigilive/almalinux:${{ matrix.version }}'
+          format: 'sarif'
+          output: 'trivy-results.sarif'
+      - if: ${{ matrix.flavor != 'default' }} 
         name: Build and push almalinux flavor
-        uses: docker/build-push-action@v5
+        uses: redhat-actions/build-push-action@v5
         with:
-          # platforms: linux/amd64,linux/arm64
-          push: true
           context: .
-          file: ./8/Dockerfile.${{ matrix.flavor }}
+          containerfiles: |
+            8/Dockerfile.${{ matrix.flavor }}
           build-args: |
             ALMALINUX_VERSION=${{ matrix.version }}
           tags: |
-            ${{ vars.DOCKERHUB_USERNAME }}/almalinux:${{ matrix.version }}-${{ matrix.flavor }}
-      - if: ${{ matrix.flavor == 'default' }}
-        name: Scan almalinux image with Trivy
+            quay.io/sindigilive/almalinux:${{ matrix.version }}-${{ matrix.flavor }}
+      - if: ${{ matrix.flavor != 'default' }}
+        name: Push almalinux flavor image to quay.io
+        uses: redhat-actions/push-to-registry@v2
+        with:
+          tags: quay.io/sindigilive/almalinux:${{ matrix.version }}-${{ matrix.flavor }}
+          registry: quay.io
+          username: ${{ vars.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_SECRET }}
+      - if: ${{ matrix.flavor != 'default' }}
+        name: Scan almalinux flavor image with Trivy
         uses: aquasecurity/trivy-action@0.20.0
         with:
-          image-ref: '${{ vars.DOCKERHUB_USERNAME }}/almalinux:${{ matrix.version }}'
-          format: 'sarif'
-          output: 'trivy-results.sarif'
-      - if: ${{ matrix.flavor == 'micro' }}
-        name: Scan almalinux image with Trivy
-        uses: aquasecurity/trivy-action@0.20.0
-        with:
-          image-ref: '${{ vars.DOCKERHUB_USERNAME }}/almalinux:${{ matrix.version }}-${{ matrix.flavor }}'
+          image-ref: 'quay.io/sindigilive/almalinux:${{ matrix.version }}-${{ matrix.flavor }}'
           format: 'sarif'
           output: 'trivy-results.sarif'
+
   build-latest:
     name: Build latest almalinux8 container images
     runs-on: ubuntu-latest
@@ -75,30 +81,28 @@ jobs:
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4
-      - name: Login to docker.io
-        uses: docker/login-action@v3
+      - name: Build and push latest almalinux8-micro
+        uses: redhat-actions/build-push-action@v5
         with:
-          username: ${{ vars.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      # - 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:
-          # platforms: linux/amd64,linux/arm64
-          push: true
           context: .
-          file: ./8/Dockerfile.micro
+          containerfiles: |
+            8/Dockerfile.micro
           tags: |
-            ${{ vars.DOCKERHUB_USERNAME }}/almalinux:8-micro
-      - name: Build and push latest almalinux9
-        uses: docker/build-push-action@v5
+            quay.io/sindigilive/almalinux:8-micro
+      - name: Build and push latest-almalinux8
+        uses: redhat-actions/build-push-action@v5
         with:
-          # platforms: linux/amd64,linux/arm64
-          push: true
           context: .
-          file: ./8/Dockerfile.default
+          containerfiles: |
+            8/Dockerfile.micro
           tags: |
-            ${{ vars.DOCKERHUB_USERNAME }}/almalinux:8
+            quay.io/sindigilive/almalinux:8
+      - name: Push latest almalinux image to quay.io
+        uses: redhat-actions/push-to-registry@v2
+        with:
+          registry: quay.io
+          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 6bcf3a8..64fc999 100644
--- a/.gitea/workflows/almalinux9.yaml
+++ b/.gitea/workflows/almalinux9.yaml
@@ -14,57 +14,63 @@ jobs:
     strategy:
       matrix:
         flavor: ["default", "micro"]
-        version: ["9.3", "9.4", "9.5"]
+        version: ["9.5"]
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4
-      - name: Login to docker.io
-        uses: docker/login-action@v3
-        with:
-          username: ${{ vars.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      # - 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:
-          # platforms: linux/amd64,linux/arm64
-          push: true
-          context: .
-          file: ./9/Dockerfile.${{ matrix.flavor }}
-          build-args: |
-            ALMALINUX_VERSION=${{ matrix.version }}
-          tags: |
-            ${{ vars.DOCKERHUB_USERNAME }}/almalinux:${{ matrix.version }}
-      - if: ${{ matrix.flavor == 'micro' }}
-        name: Build and push almalinux
-        uses: docker/build-push-action@v5
-        with:
-          # platforms: linux/amd64,linux/arm64
-          push: true
-          context: .
-          file: ./9/Dockerfile.${{ matrix.flavor }}
-          build-args: |
-            ALMALINUX_VERSION=${{ matrix.version }}
-          tags: |
-            ${{ vars.DOCKERHUB_USERNAME }}/almalinux:${{ matrix.version }}-${{ matrix.flavor }}
       - if: ${{ matrix.flavor == 'default' }}
-        name: Scan almalinux9 image with Trivy
+        name: Build almalinux default image
+        uses: redhat-actions/build-push-action@v5
+        with:
+          context: .
+          containerfiles: |
+            9/Containerfile.${{ matrix.flavor }}
+          build-args: |
+            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
+        with:
+          tags: quay.io/sindigilive/almalinux:${{ matrix.version }}
+          registry: quay.io
+          username: ${{ vars.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_SECRET }}
+      - if: ${{ matrix.flavor == 'default' }}
+        name: Scan almalinux image with Trivy
         uses: aquasecurity/trivy-action@0.20.0
         with:
-          image-ref: '${{ vars.DOCKERHUB_USERNAME }}/almalinux:${{ matrix.version }}'
+          image-ref: 'quay.io/sindigilive/almalinux:${{ matrix.version }}'
           format: 'sarif'
           output: 'trivy-results.sarif'
-      - if: ${{ matrix.flavor == 'micro' }}
-        name: Scan almalinux9 image with Trivy
+      - if: ${{ matrix.flavor != 'default' }} 
+        name: Build and push almalinux flavor
+        uses: redhat-actions/build-push-action@v5
+        with:
+          context: .
+          containerfiles: |
+            9/Dockerfile.${{ matrix.flavor }}
+          build-args: |
+            ALMALINUX_VERSION=${{ matrix.version }}
+          tags: |
+            quay.io/sindigilive/almalinux:${{ matrix.version }}-${{ matrix.flavor }}
+      - if: ${{ matrix.flavor != 'default' }}
+        name: Push almalinux flavor image to quay.io
+        uses: redhat-actions/push-to-registry@v2
+        with:
+          tags: quay.io/sindigilive/almalinux:${{ matrix.version }}-${{ matrix.flavor }}
+          registry: quay.io
+          username: ${{ vars.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_SECRET }}
+      - if: ${{ matrix.flavor != 'default' }}
+        name: Scan almalinux flavor image with Trivy
         uses: aquasecurity/trivy-action@0.20.0
         with:
-          image-ref: '${{ vars.DOCKERHUB_USERNAME }}/almalinux:${{ matrix.version }}-${{ matrix.flavor }}'
+          image-ref: 'quay.io/sindigilive/almalinux:${{ matrix.version }}-${{ matrix.flavor }}'
           format: 'sarif'
           output: 'trivy-results.sarif'
+
   build-latest:
     name: Build latest almalinux9 container images
     runs-on: ubuntu-latest
@@ -75,32 +81,32 @@ jobs:
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4
-      - name: Login to docker.io
-        uses: docker/login-action@v3
-        with:
-          username: ${{ vars.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      # - 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
+        uses: redhat-actions/build-push-action@v5
         with:
-          # platforms: linux/amd64,linux/arm64
-          push: true
           context: .
-          file: ./9/Dockerfile.micro
+          containerfiles: |
+            9/Dockerfile.micro
           tags: |
-            ${{ vars.DOCKERHUB_USERNAME }}/almalinux:9-micro
-            ${{ vars.DOCKERHUB_USERNAME }}/almalinux:micro
-      - name: Build and push latest almalinux9
-        uses: docker/build-push-action@v5
+            quay.io/sindigilive/almalinux:9-micro
+            quay.io/sindigilive/almalinux:micro
+      - name: Build and push latest-almalinux9
+        uses: redhat-actions/build-push-action@v5
         with:
-          # platforms: linux/amd64,linux/arm64
-          push: true
           context: .
-          file: ./9/Dockerfile.default
+          containerfiles: |
+            9/Dockerfile.micro
           tags: |
-            ${{ vars.DOCKERHUB_USERNAME }}/almalinux:9
-            ${{ vars.DOCKERHUB_USERNAME }}/almalinux:latest
+            quay.io/sindigilive/almalinux:9
+            quay.io/sindigilive/almalinux:latest
+      - name: Push latest almalinux image to quay.io
+        uses: redhat-actions/push-to-registry@v2
+        with:
+          registry: quay.io
+          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
diff --git a/10/Dockerfile.default b/10/Dockerfile.default
deleted file mode 100644
index e69de29..0000000
diff --git a/8/Dockerfile.default b/8/Containerfile.default
similarity index 97%
rename from 8/Dockerfile.default
rename to 8/Containerfile.default
index 0c89324..d4a6976 100644
--- a/8/Dockerfile.default
+++ b/8/Containerfile.default
@@ -1,6 +1,6 @@
 ARG ALMALINUX_VERSION=8.10
 
-FROM docker.io/almalinux:${ALMALINUX_VERSION} AS builder
+FROM quay.io/almalinuxorg/almalinux:${ALMALINUX_VERSION} AS builder
 
 RUN mkdir -p /mnt/rootfs; \
     dnf -y install \
diff --git a/8/Dockerfile.micro b/8/Containerfile.micro
similarity index 87%
rename from 8/Dockerfile.micro
rename to 8/Containerfile.micro
index 174a182..14bbb3d 100644
--- a/8/Dockerfile.micro
+++ b/8/Containerfile.micro
@@ -1,6 +1,6 @@
 ARG ALMALINUX_VERSION=8.10
 
-FROM docker.io/almalinux:${ALMALINUX_VERSION} AS builder
+FROM quay.io/almalinuxorg/almalinux:${ALMALINUX_VERSION} AS builder
 
 RUN mkdir -p /mnt/rootfs; \
     dnf install --installroot /mnt/rootfs \
@@ -21,7 +21,9 @@ RUN rm -rf /mnt/rootfs/var/cache/dnf /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/li
     touch /mnt/rootfs/etc/resolv.conf; \
     touch /mnt/rootfs/etc/hostname; \
     chmod 600 /mnt/rootfs/etc/.pwd.lock; \
-    rm -rf /mnt/rootfs/usr/share/locale/en* /mnt/rootfs/boot /mnt/rootfs/dev/null /mnt/rootfs/var/log/hawkey.log; \
+    rm -rf /mnt/rootfs/usr/share/locale/en* /mnt/rootfs/boot /mnt/rootfs/dev/null /mnt/rootfs/var/log/hawkey.log \
+           /mnt/rootfs/usr/share/zoneinfo /mnt/rootfs/usr/share/licenses/* \
+           /mnt/rootfs/etc/yum.repos.d ; \
     echo '0.000000 1728971976 0.000000' > /mnt/rootfs/etc/adjtime; \
     echo '1728971976' >> /mnt/rootfs/etc/adjtime; \
     echo 'LOCAL' >> /mnt/rootfs/etc/adjtime; \
@@ -30,8 +32,7 @@ RUN rm -rf /mnt/rootfs/var/cache/dnf /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/li
     # echo 'PERMITROOTLOGIN="-oPermitRootLogin=yes"' >> /mnt/rootfs/etc/sysconfig/sshd-permitrootlogin ;\
     echo 'KEYMAP="us"' > /mnt/rootfs/etc/vconsole.conf; \
     echo 'FONT="eurlatgr"' >> /mnt/rootfs/etc/vconsole.conf; \
-    cd /mnt/rootfs/etc ; \
-    ln -s ../usr/share/zoneinfo/Asia/Jakarta localtime
+    cp ../usr/share/zoneinfo/Asia/Jakarta /mnt/rootfs/etc/localtime ;
 
 FROM scratch
 
diff --git a/9/Dockerfile.default b/9/Containerfile.default
similarity index 98%
rename from 9/Dockerfile.default
rename to 9/Containerfile.default
index d90aabd..85c3d16 100644
--- a/9/Dockerfile.default
+++ b/9/Containerfile.default
@@ -1,6 +1,6 @@
 ARG ALMALINUX_VERSION=9.5
 
-FROM docker.io/almalinux:${ALMALINUX_VERSION} AS builder
+FROM quay.io/almalinuxorg/almalinux:${ALMALINUX_VERSION} AS builder
 
 # Install almalinux-release and required dependencies
 RUN mkdir -p /mnt/rootfs; \
diff --git a/9/Dockerfile.micro b/9/Containerfile.micro
similarity index 86%
rename from 9/Dockerfile.micro
rename to 9/Containerfile.micro
index 9c50efa..c2ff3aa 100644
--- a/9/Dockerfile.micro
+++ b/9/Containerfile.micro
@@ -1,6 +1,6 @@
 ARG ALMALINUX_VERSION=9.5
 
-FROM docker.io/almalinux:${ALMALINUX_VERSION} AS builder
+FROM quay.io/almalinuxorg/almalinux:${ALMALINUX_VERSION} AS builder
 
 RUN mkdir -p /mnt/rootfs; \
     dnf install --installroot /mnt/rootfs \
@@ -21,7 +21,9 @@ RUN rm -rf /mnt/rootfs/var/cache/dnf /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/li
     touch /mnt/rootfs/etc/hostname; \
     touch /mnt/rootfs/etc/.pwd.lock; \
     chmod 600 /mnt/rootfs/etc/.pwd.lock; \
-    rm -rf /mnt/rootfs/usr/share/locale/en* /mnt/rootfs/boot /mnt/rootfs/dev/null /mnt/rootfs/var/log/hawkey.log ; \
+    rm -rf /mnt/rootfs/usr/share/locale/en* /mnt/rootfs/boot /mnt/rootfs/dev/null /mnt/rootfs/var/log/hawkey.log \
+           /mnt/rootfs/usr/share/zoneinfo /mnt/rootfs/usr/share/licenses/* \
+           /mnt/rootfs/etc/yum.repos.d ; \
     echo '0.000000 1728971976 0.000000' > /mnt/rootfs/etc/adjtime; \
     echo '1728971976' >> /mnt/rootfs/etc/adjtime; \
     echo 'LOCAL' >> /mnt/rootfs/etc/adjtime; \
@@ -31,11 +33,12 @@ RUN rm -rf /mnt/rootfs/var/cache/dnf /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/li
     echo 'KEYMAP="us"' > /mnt/rootfs/etc/vconsole.conf; \
     echo 'FONT="eurlatgr"' >> /mnt/rootfs/etc/vconsole.conf; \
     mkdir -p /mnt/rootfs/run/lock; \
-    cd /mnt/rootfs/etc ; \
-    ln -s ../usr/share/zoneinfo/Asia/Jakarta localtime
+    cp ../usr/share/zoneinfo/Asia/Jakarta /mnt/rootfs/etc/localtime ;
 
 FROM scratch
 
+ARG ALMALINUX_VERSION=9.5
+
 LABEL maintainer="Muhamad Aditya Prima <aprimediet@gmail.com>"
 LABEL name="almalinux-micro"
 LABEL version="${ALMALINUX_VERSION}"
diff --git a/README.md b/README.md
index 57fcc57..440a754 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # Almalinux Container Images
 
-Built with docker, contains preinstalled epel-release and timezone changed to Asia/Jakarta
+Built with buildah, contains preinstalled epel-release and timezone changed to Asia/Jakarta
 
 Build:
 
-Base
-Micro
\ No newline at end of file
+- Base
+- Micro
\ No newline at end of file