diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eca34c897499c4b2204af8909d965f340e073a0f..6b2c5fcf59e687d19cb758994ae1017f5f9ab1ee 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -102,8 +102,13 @@ jobs:
       - name: push
         if: ${{ env.DEPLOY_IMAGES == 'true' }}
         run: docker push ghcr.io/mariadb/mariadb:${{ matrix.name }}
-      - name: MariaDB Operator Test
-        if: ${{ env.DEPLOY_IMAGES == 'true' }}
+      - name: MariaDB Operator Test (non-UBI)
+        if: ${{ env.DEPLOY_IMAGES == 'true' && !endsWith( matrix.name, 'ubi') }}
         run: gh workflow run test-image.yml --repo mariadb-operator/mariadb-operator -f mariadb_image=ghcr.io/mariadb/mariadb:${{ matrix.name }}
         env:
           GITHUB_TOKEN: "${{ secrets.MARIADB_OPERATOR_TOKEN }}"
+      - name: MariaDB Operator Test (UBI)
+        if: ${{ env.DEPLOY_IMAGES == 'true' && endsWith( matrix.name, 'ubi') }}
+        run: gh workflow run test-image-ent.yml --repo mariadb-operator/mariadb-operator -f mariadb_image=ghcr.io/mariadb/mariadb:${{ matrix.name }}
+        env:
+          GITHUB_TOKEN: "${{ secrets.MARIADB_OPERATOR_TOKEN }}"