diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml
index f872e34c05..38d6a59749 100644
--- a/.github/workflows/containers.yml
+++ b/.github/workflows/containers.yml
@@ -13,11 +13,18 @@ env:
   IMAGE_REGISTRY: quay.io
   can_push: ${{ github.repository_owner == 'oVirt' }}
 jobs:
-  container:
+  container-network:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        container: [ functional, integration, unit ]
+        distro: [ centos-8, centos-9, alma-9 ]
+        include:
+          - directory: docker/network
+            prefix: ovirt/vdsm-network-tests
+            container: [ functional, integration, unit ]
+          - directory: docker
+            prefix: ovirt/vdsm
+            container: [ test ]
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
@@ -25,15 +32,42 @@ jobs:
           sudo apt update
           sudo apt install podman
       - name: Build container images
-        working-directory: docker/network
-        run: make ${{ matrix.container }}
+        working-directory: ${{ matrix.directory }}
+        run: make ${{ matrix.distro }}
       - name: Push to Quay.io
         if: ${{ env.can_push == 'true' }}
         id: push-to-quay
         uses: redhat-actions/push-to-registry@v2
         with:
-          image: ovirt/vdsm-network-tests-${{ matrix.container }}
-          tags: alma-9 centos-8 centos-9
+          image: ${{ matrix.prefix }}-${{ matrix.container }}
+          tags: ${{ matrix.distro }}
+          registry: ${{ env.IMAGE_REGISTRY }}
+          username: ${{ secrets.QUAY_USERNAME  }}
+          password: ${{ secrets.QUAY_TOKEN }}
+      - name: Print image url
+        if: ${{ env.can_push == 'true' }}
+        run: echo "Image pushed to ${{ steps.push-to-quay.outputs.registry-paths }}"
+  container-test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        distro: [ centos-8, centos-9, alma-9 ]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: |
+          sudo apt update
+          sudo apt install podman
+      - name: Build container images
+        working-directory: docker
+        run: make ${{ matrix.distro }}
+      - name: Push to Quay.io
+        if: ${{ env.can_push == 'true' }}
+        id: push-to-quay
+        uses: redhat-actions/push-to-registry@v2
+        with:
+          image: ovirt/vdsm-test
+          tags: ${{ matrix.distro }}
           registry: ${{ env.IMAGE_REGISTRY }}
           username: ${{ secrets.QUAY_USERNAME  }}
           password: ${{ secrets.QUAY_TOKEN }}