diff --git a/.github/workflows/stage0.yml b/.github/workflows/stage0.yml
index cfdf06cf..ed4166ea 100644
--- a/.github/workflows/stage0.yml
+++ b/.github/workflows/stage0.yml
@@ -11,23 +11,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
-      
     - name: Login to GitHub Container Registry
       uses: docker/login-action@v3
       with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.DOCKER_LOGIN }}
-
     - name: Extract metadata (tags, labels) for Docker
       id: meta
       uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
       with:
-        images: ghcr.io/${{ github.actor }}/docker_image:ol9
-
+        images: 
+          ghcr.io/${{ github.actor }}/oraclelinux:ol9
     - name: Build and push Docker image
       uses: docker/build-push-action@v5
       with:
@@ -37,14 +34,75 @@ jobs:
             OS_DISTRO=oraclelinux
             OS_RELEASE=9
         push: true
-        tags: ghcr.io/siskapavel/docker_image:ol9
+        tags: ghcr.io/siskapavel/oraclelinux:ol9
         cache-from: type=gha
-        cache-to: type=gha,mode=max    
+        cache-to: type=gha,mode=max
+  docker-image-ol8: 
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.DOCKER_LOGIN }}
+    - name: Extract metadata (tags, labels) for Docker
+      id: meta
+      uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+      with:
+        images: 
+          ghcr.io/${{ github.actor }}/oraclelinux:ol8
+    - name: Build and push Docker image
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        file: docker/Dockerfile
+        build-args: |
+            OS_DISTRO=oraclelinux
+            OS_RELEASE=9
+        push: true
+        tags: ghcr.io/siskapavel/oraclelinux:ol8
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
+    docker-image-rl8: 
+      runs-on: ubuntu-latest
+      steps:
+      - uses: actions/checkout@v4
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+            registry: ghcr.io
+            username: ${{ github.actor }}
+            password: ${{ secrets.DOCKER_LOGIN }}
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        with:
+          images: 
+            ghcr.io/${{ github.actor }}/rockylinux:rl8
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: docker/Dockerfile
+          build-args: |
+              OS_DISTRO=rockylinux
+              OS_RELEASE=8
+          push: true
+          tags: ghcr.io/siskapavel/rockylinux:rl8
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
   test_stage:
       runs-on: ubuntu-latest
       needs: docker-image-ol9
       container:
-        image: ghcr.io/siskapavel/docker_image:ol9
+        image: ghcr.io/siskapavel/oraclelinux:ol9
       steps:
       - uses: actions/checkout@v3
       - name: Check clang-format
@@ -53,7 +111,7 @@ jobs:
       runs-on: ubuntu-latest
       needs: test_stage
       container:
-        image: ghcr.io/siskapavel/docker_image:ol9
+        image: ghcr.io/siskapavel/oraclelinux:ol9
       steps:
       - uses: actions/checkout@v3
         with: