diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 72aecdf..004256d 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,13 +4,23 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+    groups:
+      all-github-actions:
+        patterns: [ "*" ]
 
   - package-ecosystem: "docker"
     directory: "/"
     schedule:
       interval: "weekly"
+    groups:
+      all-docker-versions:
+        patterns: [ "*" ]
 
   - package-ecosystem: "gomod"
     directory: "/"
     schedule:
       interval: "weekly"
+    groups:
+      all-go-mod-patch-and-minor:
+        patterns: [ "*" ]
+        update-types: [ "patch", "minor" ]
diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml
index 97b2de1..b862cd4 100644
--- a/.github/workflows/build-docker.yaml
+++ b/.github/workflows/build-docker.yaml
@@ -25,7 +25,7 @@ jobs:
           check-latest: true
 
       - name: Run Golangci lint
-        uses: golangci/golangci-lint-action@v4
+        uses: golangci/golangci-lint-action@v6
         with:
           version: latest
           args: --print-resources-usage
@@ -38,7 +38,7 @@ jobs:
       matrix:
         include:
           - Dockerfile: Dockerfile
-            target: "final-azcli"
+            target: "final-static"
             suffix: ""
             latest: "auto"
 
@@ -61,7 +61,9 @@ jobs:
         id: docker_meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ github.repository }},quay.io/${{ github.repository }}
+          images: |
+            ${{ github.repository }}
+            quay.io/${{ github.repository }}
           labels: |
             io.artifacthub.package.readme-url=https://raw.githubusercontent.com/${{ github.repository }}/${{ github.event.repository.default_branch }}/README.md
           flavor: |
@@ -90,7 +92,7 @@ jobs:
           password: ${{ secrets.QUAY_TOKEN }}
 
       - name: ${{ inputs.publish && 'Build and push' || 'Build' }}
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./${{ matrix.Dockerfile }}