diff --git a/.gitea/workflows/master.yaml b/.gitea/workflows/master.yaml
index bb664df..d4aa3e8 100644
--- a/.gitea/workflows/master.yaml
+++ b/.gitea/workflows/master.yaml
@@ -26,6 +26,21 @@ jobs:
             major_version: "8"
             major_edition: "true"
             version: "8.10"
+          - edition: "micro"
+            major_version: "9"
+            major_edition: "true"
+            latest: "true"
+            version: "9.5"
+          - edition: "minimal"
+            major_version: "9"
+            major_edition: "true"
+            latest: "true"
+            version: "9.5"
+          - edition: "base"
+            major_version: "9"
+            major_edition: "true"
+            latest: "true"
+            version: "9.5"
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4
@@ -39,8 +54,8 @@ jobs:
       #   uses: docker/setup-qemu-action@v3
       - name: Setup Docker buildx
         uses: docker/setup-buildx-action@v3
-      - if: ${{ matrix.params.edition != 'base' && matrix.params.major_edition != 'true' && matrix.params.latest != 'true' }}
-        name: Build and push almalinux
+      - if: ${{ matrix.params.edition != 'base' }}
+        name: Build and push edition release
         uses: docker/build-push-action@v5
         with:
           # platforms: linux/amd64,linux/arm64
@@ -51,8 +66,8 @@ jobs:
             OS_VERSION=${{ matrix.params.version }}            
           tags: |
             quay.io/teras/almalinux:${{ matrix.params.version }}-${{ matrix.params.edition }}
-      - if: ${{ matrix.params.edition != 'base' && matrix.params.major_edition == 'true' && matrix.params.latest != 'true' }}
-        name: Build and push almalinux
+      - if: ${{ matrix.params.edition == 'base' }}
+        name: Build and push edition release
         uses: docker/build-push-action@v5
         with:
           # platforms: linux/amd64,linux/arm64
@@ -62,10 +77,9 @@ jobs:
           build-args: |
             OS_VERSION=${{ matrix.params.version }}            
           tags: |
-            quay.io/teras/almalinux:${{ matrix.params.version }}-${{ matrix.params.edition }}
-            quay.io/teras/almalinux:${{ matrix.params.major_version }}-${{ matrix.params.edition }}
-      - if: ${{ matrix.params.edition == 'base' && matrix.params.major_edition != 'true' && matrix.params.latest != 'true' }}
-        name: Build and push almalinux
+            quay.io/teras/almalinux:${{ matrix.params.version }}
+      - if: ${{ matrix.params.edition != 'base' && matrix.params.major_edition == 'true' }}
+        name: Build and push edition release
         uses: docker/build-push-action@v5
         with:
           # platforms: linux/amd64,linux/arm64
@@ -73,33 +87,92 @@ jobs:
           context: .
           file: ./${{ matrix.params.major_version }}/Dockerfile.${{ matrix.params.edition }}
           build-args: |
-            OS_VERSION=${{ matrix.params.version }}
+            OS_VERSION=${{ matrix.params.version }}-${{ matrix.params.edition }}
           tags: |
-            quay.io/teras/almalinux:${{ matrix.params.version }}
-      - if: ${{ matrix.params.edition == 'base' && matrix.params.major_edition == 'true' && matrix.params.latest != 'true' }}
-        name: Build and push almalinux
-        uses: docker/build-push-action@v5
-        with:
-          # platforms: linux/amd64,linux/arm64
-          push: true
-          context: .
-          file: ./${{ matrix.params.major_version }}/Dockerfile.${{ matrix.params.edition }}
-          build-args: |
-            OS_VERSION=${{ matrix.params.version }}
-          tags: |
-            quay.io/teras/almalinux:${{ matrix.params.version }}
             quay.io/teras/almalinux:${{ matrix.params.major_version }}
-      # - if: ${{ matrix.flavor == 'micro' || matrix.flavor == 'minimal' }}
-      #   name: Build and push almalinux
+      - if: ${{ matrix.params.edition == 'base' && matrix.params.major_edition == 'true' }}
+        name: Build and push edition release
+        uses: docker/build-push-action@v5
+        with:
+          # platforms: linux/amd64,linux/arm64
+          push: true
+          context: .
+          file: ./${{ matrix.params.major_version }}/Dockerfile.${{ matrix.params.edition }}
+          build-args: |
+            OS_VERSION=${{ matrix.params.version }}            
+          tags: |
+            quay.io/teras/almalinux:${{ matrix.params.major_version }}
+      - if: ${{ matrix.params.edition != 'base' && matrix.params.latest == 'true' }}
+        name: Build and push edition release
+        uses: docker/build-push-action@v5
+        with:
+          # platforms: linux/amd64,linux/arm64
+          push: true
+          context: .
+          file: ./${{ matrix.params.major_version }}/Dockerfile.${{ matrix.params.edition }}
+          build-args: |
+            OS_VERSION=${{ matrix.params.version }}            
+          tags: |
+            quay.io/teras/almalinux:latest-${{ matrix.params.edition }}
+      - if: ${{ matrix.params.edition == 'base' && matrix.params.latest == 'true' }}
+        name: Build and push edition release
+        uses: docker/build-push-action@v5
+        with:
+          # platforms: linux/amd64,linux/arm64
+          push: true
+          context: .
+          file: ./${{ matrix.params.major_version }}/Dockerfile.${{ matrix.params.edition }}
+          build-args: |
+            OS_VERSION=${{ matrix.params.version }}            
+          tags: |
+            quay.io/teras/almalinux:latest
+      # - if: ${{ matrix.params.edition != 'base' && matrix.params.major_edition == 'true' && matrix.params.latest != 'true' }}
+      #   name: Build and push edition release
       #   uses: docker/build-push-action@v5
       #   with:
       #     # platforms: linux/amd64,linux/arm64
       #     push: true
       #     context: .
-      #     file: ./9/Dockerfile.${{ matrix.flavor }}
+      #     file: ./${{ matrix.params.major_version }}/Dockerfile.${{ matrix.params.edition }}
       #     build-args: |
-      #       ALMALINUX_VERSION=${{ matrix.version }}            
+      #       OS_VERSION=${{ matrix.params.version }}            
       #     tags: |
-      #       quay.io/teras/almalinux:${{ matrix.version }}-${{ matrix.flavor }}
-      #       quay.io/teras/almalinux:9-${{ matrix.flavor }}
-      #       quay.io/teras/almalinux:${{ matrix.flavor }}
\ No newline at end of file
+      #       quay.io/teras/almalinux:${{ matrix.params.version }}-${{ matrix.params.edition }}
+      #       quay.io/teras/almalinux:${{ matrix.params.major_version }}-${{ matrix.params.edition }}
+      # - if: ${{ matrix.params.edition == 'base' && matrix.params.major_edition != 'true' && matrix.params.latest != 'true' }}
+      #   name: Build and push base release
+      #   uses: docker/build-push-action@v5
+      #   with:
+      #     # platforms: linux/amd64,linux/arm64
+      #     push: true
+      #     context: .
+      #     file: ./${{ matrix.params.major_version }}/Dockerfile.${{ matrix.params.edition }}
+      #     build-args: |
+      #       OS_VERSION=${{ matrix.params.version }}
+      #     tags: |
+      #       quay.io/teras/almalinux:${{ matrix.params.version }}
+      # - if: ${{ matrix.params.edition == 'base' && matrix.params.major_edition == 'true' && matrix.params.latest != 'true' }}
+      #   name: Build and push base release
+      #   uses: docker/build-push-action@v5
+      #   with:
+      #     # platforms: linux/amd64,linux/arm64
+      #     push: true
+      #     context: .
+      #     file: ./${{ matrix.params.major_version }}/Dockerfile.${{ matrix.params.edition }}
+      #     build-args: |
+      #       OS_VERSION=${{ matrix.params.version }}
+      #     tags: |
+      #       quay.io/teras/almalinux:${{ matrix.params.version }}
+      #       quay.io/teras/almalinux:${{ matrix.params.major_version }}
+      # - if: ${{ matrix.params.edition != 'base' && matrix.params.latest == 'true' }}
+      #   name: Build and push latest edition release
+      #   uses: docker/build-push-action@v5
+      #   with:
+      #     # platforms: linux/amd64,linux/arm64
+      #     push: true
+      #     context: .
+      #     file: ./${{ matrix.params.major_version }}/Dockerfile.${{ matrix.params.edition }}
+      #     build-args: |
+      #       OS_VERSION=${{ matrix.params.version }}            
+      #     tags: |
+      #       quay.io/teras/almalinux:${{ matrix.params.version }}-${{ matrix.params.edition }}
\ No newline at end of file