diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 3e66abf..39459ab 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -6,7 +6,11 @@ updates:
     directory: /
     schedule:
       interval: weekly
+    labels:
+      - 'ready for review'
   - package-ecosystem: github-actions
     directory: /
     schedule:
       interval: monthly
+    labels:
+      - 'ready for review'
diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index 11810ec..c5c3415 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -14,63 +14,57 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - dockerfile_path: "10.3"
-            dockerfile: "Dockerfile"
+          - dockerfile: "10.3/Dockerfile"
             registry_namespace: "centos7"
             quayio_username: "QUAY_IMAGE_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_BUILDER_TOKEN"
             tag: "centos7"
-            suffix: "centos7"
-          - dockerfile_path: "10.5"
-            dockerfile: "Dockerfile"
+            image_name: "mariadb-103-centos7"
+          - dockerfile: "10.5/Dockerfile"
             registry_namespace: "centos7"
             quayio_username: "QUAY_IMAGE_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_BUILDER_TOKEN"
             tag: "centos7"
-            suffix: "centos7"
-          - dockerfile_path: "10.5"
-            dockerfile: "Dockerfile.c9s"
+            image_name: "mariadb-105-centos7"
+          - dockerfile: "10.5/Dockerfile.c9s"
             registry_namespace: "sclorg"
             quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
             tag: "c9s"
-            suffix: "c9s"
-          - dockerfile_path: "10.5"
-            dockerfile: "Dockerfile.c8s"
+            image_name: "mariadb-105-c9s"
+          - dockerfile: "10.5/Dockerfile.c8s"
             registry_namespace: "sclorg"
             quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
             tag: "c8s"
-            suffix: "c8s"
-          - dockerfile_path: "10.3"
-            dockerfile: "Dockerfile.c8s"
+            image_name: "mariadb-105-c8s"
+          - dockerfile: "10.3/Dockerfile.c8s"
             registry_namespace: "sclorg"
             quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
             tag: "c8s"
-            suffix: "c8s"
-          - dockerfile_path: "10.5"
-            dockerfile: "Dockerfile.fedora"
+            image_name: "mariadb-103-c8s"
+          - dockerfile: "10.5/Dockerfile.fedora"
             registry_namespace: "fedora"
             quayio_username: "QUAY_IMAGE_FEDORA_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN"
             tag: "fedora"
-          - dockerfile_path: "10.3"
-            dockerfile: "Dockerfile.fedora"
+            image_name: "mariadb-105"
+          - dockerfile: "10.3/Dockerfile.fedora"
             registry_namespace: "fedora"
             quayio_username: "QUAY_IMAGE_FEDORA_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN"
             tag: "fedora"
+            image_name: "mariadb-103"
 
     steps:
       - name: Build and push to quay.io registry
-        uses: sclorg/build-and-push-action@v2
+        uses: sclorg/build-and-push-action@v4
         with:
           registry: "quay.io"
           registry_namespace: ${{ matrix.registry_namespace }}
           registry_username: ${{ secrets[matrix.quayio_username] }}
           registry_token: ${{ secrets[matrix.quayio_token] }}
           dockerfile: ${{ matrix.dockerfile }}
-          dockerfile_path: ${{ matrix.dockerfile_path }}
           tag: ${{ matrix.tag }}
-          suffix: ${{ matrix.suffix }}
+          image_name: ${{ matrix.image_name }}