diff --git a/.github/workflows/.container.template.j2 b/.github/workflows/.container.template.j2
index 55310cb..06dd9ab 100644
--- a/.github/workflows/.container.template.j2
+++ b/.github/workflows/.container.template.j2
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   matrix-generator:
     name: Generate Matrix
-    runs-on: linux-x86_64
+    runs-on: ubuntu-22.04
     outputs:
       tags: ${{ steps.set-matrix.outputs.tags }}
       name: ${{ steps.set-matrix.outputs.name }}
@@ -62,7 +62,7 @@ jobs:
           tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: matrix-generator
     name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     timeout-minutes: 600
@@ -150,7 +150,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
     if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
 
diff --git a/.github/workflows/amazonlinux-containers.yml b/.github/workflows/amazonlinux-containers.yml
index 5940da9..a037b29 100644
--- a/.github/workflows/amazonlinux-containers.yml
+++ b/.github/workflows/amazonlinux-containers.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   matrix-generator:
     name: Generate Matrix
-    runs-on: linux-x86_64
+    runs-on: ubuntu-22.04
     outputs:
       tags: ${{ steps.set-matrix.outputs.tags }}
       name: ${{ steps.set-matrix.outputs.name }}
@@ -62,7 +62,7 @@ jobs:
           tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: matrix-generator
     name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     timeout-minutes: 600
@@ -150,7 +150,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
     if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
 
diff --git a/.github/workflows/archlinux-containers.yml b/.github/workflows/archlinux-containers.yml
index 19e6aa0..8af7b69 100644
--- a/.github/workflows/archlinux-containers.yml
+++ b/.github/workflows/archlinux-containers.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   matrix-generator:
     name: Generate Matrix
-    runs-on: linux-x86_64
+    runs-on: ubuntu-22.04
     outputs:
       tags: ${{ steps.set-matrix.outputs.tags }}
       name: ${{ steps.set-matrix.outputs.name }}
@@ -62,7 +62,7 @@ jobs:
           tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: matrix-generator
     name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     timeout-minutes: 600
@@ -150,7 +150,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
     if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
 
diff --git a/.github/workflows/builddocs-containers.yml b/.github/workflows/builddocs-containers.yml
index b46cdd5..a6d3545 100644
--- a/.github/workflows/builddocs-containers.yml
+++ b/.github/workflows/builddocs-containers.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   matrix-generator:
     name: Generate Matrix
-    runs-on: linux-x86_64
+    runs-on: ubuntu-22.04
     outputs:
       tags: ${{ steps.set-matrix.outputs.tags }}
       name: ${{ steps.set-matrix.outputs.name }}
@@ -62,7 +62,7 @@ jobs:
           tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: matrix-generator
     name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     timeout-minutes: 600
@@ -150,7 +150,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
     if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
 
diff --git a/.github/workflows/busybox-containers.yml b/.github/workflows/busybox-containers.yml
index 67346a4..e9169fc 100644
--- a/.github/workflows/busybox-containers.yml
+++ b/.github/workflows/busybox-containers.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   matrix-generator:
     name: Generate Matrix
-    runs-on: linux-x86_64
+    runs-on: ubuntu-22.04
     outputs:
       tags: ${{ steps.set-matrix.outputs.tags }}
       name: ${{ steps.set-matrix.outputs.name }}
@@ -62,7 +62,7 @@ jobs:
           tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: matrix-generator
     name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     timeout-minutes: 600
@@ -150,7 +150,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
     if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
 
diff --git a/.github/workflows/consul-containers.yml b/.github/workflows/consul-containers.yml
index 2700e66..ef4720d 100644
--- a/.github/workflows/consul-containers.yml
+++ b/.github/workflows/consul-containers.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   matrix-generator:
     name: Generate Matrix
-    runs-on: linux-x86_64
+    runs-on: ubuntu-22.04
     outputs:
       tags: ${{ steps.set-matrix.outputs.tags }}
       name: ${{ steps.set-matrix.outputs.name }}
@@ -62,7 +62,7 @@ jobs:
           tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: matrix-generator
     name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     timeout-minutes: 600
@@ -150,7 +150,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
     if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
 
diff --git a/.github/workflows/debian-containers.yml b/.github/workflows/debian-containers.yml
index 6861d22..214229c 100644
--- a/.github/workflows/debian-containers.yml
+++ b/.github/workflows/debian-containers.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   matrix-generator:
     name: Generate Matrix
-    runs-on: linux-x86_64
+    runs-on: ubuntu-22.04
     outputs:
       tags: ${{ steps.set-matrix.outputs.tags }}
       name: ${{ steps.set-matrix.outputs.name }}
@@ -62,7 +62,7 @@ jobs:
           tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: matrix-generator
     name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     timeout-minutes: 600
@@ -150,7 +150,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
     if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
 
diff --git a/.github/workflows/etcd-v2-containers.yml b/.github/workflows/etcd-v2-containers.yml
index a39f3d7..7e88f06 100644
--- a/.github/workflows/etcd-v2-containers.yml
+++ b/.github/workflows/etcd-v2-containers.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   matrix-generator:
     name: Generate Matrix
-    runs-on: linux-x86_64
+    runs-on: ubuntu-22.04
     outputs:
       tags: ${{ steps.set-matrix.outputs.tags }}
       name: ${{ steps.set-matrix.outputs.name }}
@@ -62,7 +62,7 @@ jobs:
           tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: matrix-generator
     name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     timeout-minutes: 600
@@ -150,7 +150,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
     if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
 
diff --git a/.github/workflows/etcd-v3-containers.yml b/.github/workflows/etcd-v3-containers.yml
index 6c8110c..2ca0e68 100644
--- a/.github/workflows/etcd-v3-containers.yml
+++ b/.github/workflows/etcd-v3-containers.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   matrix-generator:
     name: Generate Matrix
-    runs-on: linux-x86_64
+    runs-on: ubuntu-22.04
     outputs:
       tags: ${{ steps.set-matrix.outputs.tags }}
       name: ${{ steps.set-matrix.outputs.name }}
@@ -62,7 +62,7 @@ jobs:
           tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: matrix-generator
     name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     timeout-minutes: 600
@@ -150,7 +150,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
     if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
 
diff --git a/.github/workflows/fedora-containers.yml b/.github/workflows/fedora-containers.yml
index 5cf9e7e..9e6f00b 100644
--- a/.github/workflows/fedora-containers.yml
+++ b/.github/workflows/fedora-containers.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   matrix-generator:
     name: Generate Matrix
-    runs-on: linux-x86_64
+    runs-on: ubuntu-22.04
     outputs:
       tags: ${{ steps.set-matrix.outputs.tags }}
       name: ${{ steps.set-matrix.outputs.name }}
@@ -62,7 +62,7 @@ jobs:
           tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: matrix-generator
     name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     timeout-minutes: 600
@@ -150,7 +150,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
     if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
 
diff --git a/.github/workflows/mariadb-containers.yml b/.github/workflows/mariadb-containers.yml
index ee88c34..8389c42 100644
--- a/.github/workflows/mariadb-containers.yml
+++ b/.github/workflows/mariadb-containers.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   matrix-generator:
     name: Generate Matrix
-    runs-on: linux-x86_64
+    runs-on: ubuntu-22.04
     outputs:
       tags: ${{ steps.set-matrix.outputs.tags }}
       name: ${{ steps.set-matrix.outputs.name }}
@@ -62,7 +62,7 @@ jobs:
           tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: matrix-generator
     name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     timeout-minutes: 600
@@ -150,7 +150,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
     if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
 
diff --git a/.github/workflows/mysql-server-containers.yml b/.github/workflows/mysql-server-containers.yml
index e8fbf94..c3540d4 100644
--- a/.github/workflows/mysql-server-containers.yml
+++ b/.github/workflows/mysql-server-containers.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   matrix-generator:
     name: Generate Matrix
-    runs-on: linux-x86_64
+    runs-on: ubuntu-22.04
     outputs:
       tags: ${{ steps.set-matrix.outputs.tags }}
       name: ${{ steps.set-matrix.outputs.name }}
@@ -62,7 +62,7 @@ jobs:
           tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: matrix-generator
     name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     timeout-minutes: 600
@@ -150,7 +150,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
     if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
 
diff --git a/.github/workflows/openldap-minion-containers.yml b/.github/workflows/openldap-minion-containers.yml
index 07ddbbe..99ecc31 100644
--- a/.github/workflows/openldap-minion-containers.yml
+++ b/.github/workflows/openldap-minion-containers.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   matrix-generator:
     name: Generate Matrix
-    runs-on: linux-x86_64
+    runs-on: ubuntu-22.04
     outputs:
       tags: ${{ steps.set-matrix.outputs.tags }}
       name: ${{ steps.set-matrix.outputs.name }}
@@ -62,7 +62,7 @@ jobs:
           tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: matrix-generator
     name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     timeout-minutes: 600
@@ -150,7 +150,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
     if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
 
diff --git a/.github/workflows/opensuse-containers.yml b/.github/workflows/opensuse-containers.yml
index c2442e7..de2ab0d 100644
--- a/.github/workflows/opensuse-containers.yml
+++ b/.github/workflows/opensuse-containers.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   matrix-generator:
     name: Generate Matrix
-    runs-on: linux-x86_64
+    runs-on: ubuntu-22.04
     outputs:
       tags: ${{ steps.set-matrix.outputs.tags }}
       name: ${{ steps.set-matrix.outputs.name }}
@@ -62,7 +62,7 @@ jobs:
           tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: matrix-generator
     name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     timeout-minutes: 600
@@ -150,7 +150,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
     if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
 
diff --git a/.github/workflows/packaging-containers.yml b/.github/workflows/packaging-containers.yml
index 4ec42fe..c7c784c 100644
--- a/.github/workflows/packaging-containers.yml
+++ b/.github/workflows/packaging-containers.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   matrix-generator:
     name: Generate Matrix
-    runs-on: linux-x86_64
+    runs-on: ubuntu-22.04
     outputs:
       tags: ${{ steps.set-matrix.outputs.tags }}
       name: ${{ steps.set-matrix.outputs.name }}
@@ -62,7 +62,7 @@ jobs:
           tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: matrix-generator
     name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     timeout-minutes: 600
@@ -150,7 +150,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
     if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
 
diff --git a/.github/workflows/percona-containers.yml b/.github/workflows/percona-containers.yml
index c2d5d8c..07aba00 100644
--- a/.github/workflows/percona-containers.yml
+++ b/.github/workflows/percona-containers.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   matrix-generator:
     name: Generate Matrix
-    runs-on: linux-x86_64
+    runs-on: ubuntu-22.04
     outputs:
       tags: ${{ steps.set-matrix.outputs.tags }}
       name: ${{ steps.set-matrix.outputs.name }}
@@ -62,7 +62,7 @@ jobs:
           tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: matrix-generator
     name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     timeout-minutes: 600
@@ -150,7 +150,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
     if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
 
diff --git a/.github/workflows/photon-containers.yml b/.github/workflows/photon-containers.yml
index 252991a..27326fc 100644
--- a/.github/workflows/photon-containers.yml
+++ b/.github/workflows/photon-containers.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   matrix-generator:
     name: Generate Matrix
-    runs-on: linux-x86_64
+    runs-on: ubuntu-22.04
     outputs:
       tags: ${{ steps.set-matrix.outputs.tags }}
       name: ${{ steps.set-matrix.outputs.name }}
@@ -62,7 +62,7 @@ jobs:
           tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: matrix-generator
     name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     timeout-minutes: 600
@@ -150,7 +150,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
     if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
 
diff --git a/.github/workflows/python-containers.yml b/.github/workflows/python-containers.yml
index 08fec80..9d2045a 100644
--- a/.github/workflows/python-containers.yml
+++ b/.github/workflows/python-containers.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   matrix-generator:
     name: Generate Matrix
-    runs-on: linux-x86_64
+    runs-on: ubuntu-22.04
     outputs:
       tags: ${{ steps.set-matrix.outputs.tags }}
       name: ${{ steps.set-matrix.outputs.name }}
@@ -62,7 +62,7 @@ jobs:
           tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: matrix-generator
     name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     timeout-minutes: 600
@@ -150,7 +150,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
     if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
 
diff --git a/.github/workflows/rabbitmq-containers.yml b/.github/workflows/rabbitmq-containers.yml
index b1a4685..a000253 100644
--- a/.github/workflows/rabbitmq-containers.yml
+++ b/.github/workflows/rabbitmq-containers.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   matrix-generator:
     name: Generate Matrix
-    runs-on: linux-x86_64
+    runs-on: ubuntu-22.04
     outputs:
       tags: ${{ steps.set-matrix.outputs.tags }}
       name: ${{ steps.set-matrix.outputs.name }}
@@ -62,7 +62,7 @@ jobs:
           tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: matrix-generator
     name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     timeout-minutes: 600
@@ -150,7 +150,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
     if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
 
diff --git a/.github/workflows/redis-containers.yml b/.github/workflows/redis-containers.yml
index 9d3c78f..1af8fb5 100644
--- a/.github/workflows/redis-containers.yml
+++ b/.github/workflows/redis-containers.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   matrix-generator:
     name: Generate Matrix
-    runs-on: linux-x86_64
+    runs-on: ubuntu-22.04
     outputs:
       tags: ${{ steps.set-matrix.outputs.tags }}
       name: ${{ steps.set-matrix.outputs.name }}
@@ -62,7 +62,7 @@ jobs:
           tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: matrix-generator
     name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     timeout-minutes: 600
@@ -150,7 +150,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
     if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
 
diff --git a/.github/workflows/rockylinux-containers.yml b/.github/workflows/rockylinux-containers.yml
index a63f976..21c1b9c 100644
--- a/.github/workflows/rockylinux-containers.yml
+++ b/.github/workflows/rockylinux-containers.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   matrix-generator:
     name: Generate Matrix
-    runs-on: linux-x86_64
+    runs-on: ubuntu-22.04
     outputs:
       tags: ${{ steps.set-matrix.outputs.tags }}
       name: ${{ steps.set-matrix.outputs.name }}
@@ -62,7 +62,7 @@ jobs:
           tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: matrix-generator
     name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     timeout-minutes: 600
@@ -150,7 +150,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
     if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
 
diff --git a/.github/workflows/salt-containers.yml b/.github/workflows/salt-containers.yml
index b8f0019..aa2370e 100644
--- a/.github/workflows/salt-containers.yml
+++ b/.github/workflows/salt-containers.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   matrix-generator:
     name: Generate Matrix
-    runs-on: linux-x86_64
+    runs-on: ubuntu-22.04
     outputs:
       tags: ${{ steps.set-matrix.outputs.tags }}
       name: ${{ steps.set-matrix.outputs.name }}
@@ -62,7 +62,7 @@ jobs:
           tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: matrix-generator
     name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     timeout-minutes: 600
@@ -150,7 +150,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
     if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
 
diff --git a/.github/workflows/salt-gitfs-http-containers.yml b/.github/workflows/salt-gitfs-http-containers.yml
index b3ee7c3..3814aa5 100644
--- a/.github/workflows/salt-gitfs-http-containers.yml
+++ b/.github/workflows/salt-gitfs-http-containers.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   matrix-generator:
     name: Generate Matrix
-    runs-on: linux-x86_64
+    runs-on: ubuntu-22.04
     outputs:
       tags: ${{ steps.set-matrix.outputs.tags }}
       name: ${{ steps.set-matrix.outputs.name }}
@@ -62,7 +62,7 @@ jobs:
           tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: matrix-generator
     name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     timeout-minutes: 600
@@ -150,7 +150,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
     if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
 
diff --git a/.github/workflows/ssh-minion-containers.yml b/.github/workflows/ssh-minion-containers.yml
index 8b90728..cb7fc0c 100644
--- a/.github/workflows/ssh-minion-containers.yml
+++ b/.github/workflows/ssh-minion-containers.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   matrix-generator:
     name: Generate Matrix
-    runs-on: linux-x86_64
+    runs-on: ubuntu-22.04
     outputs:
       tags: ${{ steps.set-matrix.outputs.tags }}
       name: ${{ steps.set-matrix.outputs.name }}
@@ -62,7 +62,7 @@ jobs:
           tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: matrix-generator
     name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     timeout-minutes: 600
@@ -150,7 +150,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
     if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
 
diff --git a/.github/workflows/testing-containers.yml b/.github/workflows/testing-containers.yml
index 2f40e5c..204c2f1 100644
--- a/.github/workflows/testing-containers.yml
+++ b/.github/workflows/testing-containers.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   matrix-generator:
     name: Generate Matrix
-    runs-on: linux-x86_64
+    runs-on: ubuntu-22.04
     outputs:
       tags: ${{ steps.set-matrix.outputs.tags }}
       name: ${{ steps.set-matrix.outputs.name }}
@@ -62,7 +62,7 @@ jobs:
           tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: matrix-generator
     name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     timeout-minutes: 600
@@ -150,7 +150,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
     if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
 
diff --git a/.github/workflows/tinyproxy-containers.yml b/.github/workflows/tinyproxy-containers.yml
index efcc77c..86edc95 100644
--- a/.github/workflows/tinyproxy-containers.yml
+++ b/.github/workflows/tinyproxy-containers.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   matrix-generator:
     name: Generate Matrix
-    runs-on: linux-x86_64
+    runs-on: ubuntu-22.04
     outputs:
       tags: ${{ steps.set-matrix.outputs.tags }}
       name: ${{ steps.set-matrix.outputs.name }}
@@ -62,7 +62,7 @@ jobs:
           tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: matrix-generator
     name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     timeout-minutes: 600
@@ -150,7 +150,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
     if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
 
diff --git a/.github/workflows/ubuntu-containers.yml b/.github/workflows/ubuntu-containers.yml
index 665a66b..fe98d22 100644
--- a/.github/workflows/ubuntu-containers.yml
+++ b/.github/workflows/ubuntu-containers.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   matrix-generator:
     name: Generate Matrix
-    runs-on: linux-x86_64
+    runs-on: ubuntu-22.04
     outputs:
       tags: ${{ steps.set-matrix.outputs.tags }}
       name: ${{ steps.set-matrix.outputs.name }}
@@ -62,7 +62,7 @@ jobs:
           tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: matrix-generator
     name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     timeout-minutes: 600
@@ -150,7 +150,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
     if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
 
diff --git a/.github/workflows/vault-containers.yml b/.github/workflows/vault-containers.yml
index 135b901..cd86aa4 100644
--- a/.github/workflows/vault-containers.yml
+++ b/.github/workflows/vault-containers.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   matrix-generator:
     name: Generate Matrix
-    runs-on: linux-x86_64
+    runs-on: ubuntu-22.04
     outputs:
       tags: ${{ steps.set-matrix.outputs.tags }}
       name: ${{ steps.set-matrix.outputs.name }}
@@ -62,7 +62,7 @@ jobs:
           tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: matrix-generator
     name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     timeout-minutes: 600
@@ -150,7 +150,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
     if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
 
diff --git a/.github/workflows/virt-minion-containers.yml b/.github/workflows/virt-minion-containers.yml
index cd191be..9acefa7 100644
--- a/.github/workflows/virt-minion-containers.yml
+++ b/.github/workflows/virt-minion-containers.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   matrix-generator:
     name: Generate Matrix
-    runs-on: linux-x86_64
+    runs-on: ubuntu-22.04
     outputs:
       tags: ${{ steps.set-matrix.outputs.tags }}
       name: ${{ steps.set-matrix.outputs.name }}
@@ -62,7 +62,7 @@ jobs:
           tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: matrix-generator
     name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     timeout-minutes: 600
@@ -150,7 +150,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
     if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}
 
diff --git a/.github/workflows/zookeeper-containers.yml b/.github/workflows/zookeeper-containers.yml
index 41cd41b..7b9f902 100644
--- a/.github/workflows/zookeeper-containers.yml
+++ b/.github/workflows/zookeeper-containers.yml
@@ -30,7 +30,7 @@ concurrency:
 jobs:
   matrix-generator:
     name: Generate Matrix
-    runs-on: linux-x86_64
+    runs-on: ubuntu-22.04
     outputs:
       tags: ${{ steps.set-matrix.outputs.tags }}
       name: ${{ steps.set-matrix.outputs.name }}
@@ -62,7 +62,7 @@ jobs:
           tools ci matrix ${{ env.PATH_IN_REPO }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: matrix-generator
     name: "Build ${{ matrix.dockerinfo.name }}:${{ matrix.dockerinfo.tag }}${{ matrix.dockerinfo.platform && format(' ({0})', matrix.dockerinfo.platform) || ''}}"
     timeout-minutes: 600
@@ -150,7 +150,7 @@ jobs:
           retention-days: 1
 
   merge:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: "Merge ${{ needs.matrix-generator.outputs.name }}:${{ matrix.tag }}"
     if: ${{ github.repository == 'saltstack/salt-ci-containers' && contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) }}