diff --git a/.github/workflows/ci-master-pr.yml b/.github/workflows/ci-master-pr.yml
index 9de8f58..5354c8f 100644
--- a/.github/workflows/ci-master-pr.yml
+++ b/.github/workflows/ci-master-pr.yml
@@ -33,10 +33,10 @@ jobs:
       run: |
         git diff --exit-code
 
-  build-7-3-alpine-3-17:
+  build-7-3:
     runs-on: ubuntu-latest
     env:
-      VARIANT: 7.3-alpine-3.17
+      VARIANT: 7.3
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -108,7 +108,7 @@ jobs:
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.3-alpine-3.17
+        context: variants/7.3
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: false
         tags: |
@@ -122,7 +122,7 @@ jobs:
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.3-alpine-3.17
+        context: variants/7.3
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -135,7 +135,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.3-alpine-3.17
+        context: variants/7.3
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -153,10 +153,10 @@ jobs:
         rm -rf /tmp/.buildx-cache
         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  build-7-3-alpine-3-17-git:
+  build-7-3-git:
     runs-on: ubuntu-latest
     env:
-      VARIANT: 7.3-alpine-3.17-git
+      VARIANT: 7.3-git
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -228,7 +228,7 @@ jobs:
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.3-alpine-3.17-git
+        context: variants/7.3-git
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: false
         tags: |
@@ -242,7 +242,7 @@ jobs:
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.3-alpine-3.17-git
+        context: variants/7.3-git
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -255,7 +255,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.3-alpine-3.17-git
+        context: variants/7.3-git
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -273,10 +273,10 @@ jobs:
         rm -rf /tmp/.buildx-cache
         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  build-7-3-alpine-3-17-git-sops:
+  build-7-3-git-sops:
     runs-on: ubuntu-latest
     env:
-      VARIANT: 7.3-alpine-3.17-git-sops
+      VARIANT: 7.3-git-sops
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -348,7 +348,7 @@ jobs:
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.3-alpine-3.17-git-sops
+        context: variants/7.3-git-sops
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: false
         tags: |
@@ -362,7 +362,7 @@ jobs:
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.3-alpine-3.17-git-sops
+        context: variants/7.3-git-sops
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -375,7 +375,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.3-alpine-3.17-git-sops
+        context: variants/7.3-git-sops
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -393,10 +393,10 @@ jobs:
         rm -rf /tmp/.buildx-cache
         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  build-7-2-alpine-3-17:
+  build-7-2:
     runs-on: ubuntu-latest
     env:
-      VARIANT: 7.2-alpine-3.17
+      VARIANT: 7.2
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -468,7 +468,7 @@ jobs:
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.2-alpine-3.17
+        context: variants/7.2
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: false
         tags: |
@@ -482,7 +482,7 @@ jobs:
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.2-alpine-3.17
+        context: variants/7.2
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -495,7 +495,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.2-alpine-3.17
+        context: variants/7.2
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -513,10 +513,10 @@ jobs:
         rm -rf /tmp/.buildx-cache
         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  build-7-2-alpine-3-17-git:
+  build-7-2-git:
     runs-on: ubuntu-latest
     env:
-      VARIANT: 7.2-alpine-3.17-git
+      VARIANT: 7.2-git
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -588,7 +588,7 @@ jobs:
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.2-alpine-3.17-git
+        context: variants/7.2-git
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: false
         tags: |
@@ -602,7 +602,7 @@ jobs:
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.2-alpine-3.17-git
+        context: variants/7.2-git
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -615,7 +615,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.2-alpine-3.17-git
+        context: variants/7.2-git
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -633,10 +633,10 @@ jobs:
         rm -rf /tmp/.buildx-cache
         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  build-7-2-alpine-3-17-git-sops:
+  build-7-2-git-sops:
     runs-on: ubuntu-latest
     env:
-      VARIANT: 7.2-alpine-3.17-git-sops
+      VARIANT: 7.2-git-sops
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -708,7 +708,7 @@ jobs:
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.2-alpine-3.17-git-sops
+        context: variants/7.2-git-sops
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: false
         tags: |
@@ -722,7 +722,7 @@ jobs:
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.2-alpine-3.17-git-sops
+        context: variants/7.2-git-sops
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -735,7 +735,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.2-alpine-3.17-git-sops
+        context: variants/7.2-git-sops
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -753,10 +753,10 @@ jobs:
         rm -rf /tmp/.buildx-cache
         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  build-7-1-5-alpine-3-13:
+  build-7-1:
     runs-on: ubuntu-latest
     env:
-      VARIANT: 7.1.5-alpine-3.13
+      VARIANT: 7.1
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -828,7 +828,7 @@ jobs:
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.1.5-alpine-3.13
+        context: variants/7.1
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: false
         tags: |
@@ -842,7 +842,7 @@ jobs:
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.1.5-alpine-3.13
+        context: variants/7.1
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -855,7 +855,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.1.5-alpine-3.13
+        context: variants/7.1
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -873,10 +873,10 @@ jobs:
         rm -rf /tmp/.buildx-cache
         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  build-7-1-5-alpine-3-13-git:
+  build-7-1-git:
     runs-on: ubuntu-latest
     env:
-      VARIANT: 7.1.5-alpine-3.13-git
+      VARIANT: 7.1-git
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -948,7 +948,7 @@ jobs:
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.1.5-alpine-3.13-git
+        context: variants/7.1-git
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: false
         tags: |
@@ -962,7 +962,7 @@ jobs:
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.1.5-alpine-3.13-git
+        context: variants/7.1-git
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -975,7 +975,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.1.5-alpine-3.13-git
+        context: variants/7.1-git
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -993,10 +993,10 @@ jobs:
         rm -rf /tmp/.buildx-cache
         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  build-7-1-5-alpine-3-13-git-sops:
+  build-7-1-git-sops:
     runs-on: ubuntu-latest
     env:
-      VARIANT: 7.1.5-alpine-3.13-git-sops
+      VARIANT: 7.1-git-sops
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -1068,7 +1068,7 @@ jobs:
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.1.5-alpine-3.13-git-sops
+        context: variants/7.1-git-sops
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: false
         tags: |
@@ -1082,7 +1082,7 @@ jobs:
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.1.5-alpine-3.13-git-sops
+        context: variants/7.1-git-sops
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -1095,7 +1095,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.1.5-alpine-3.13-git-sops
+        context: variants/7.1-git-sops
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -1113,10 +1113,10 @@ jobs:
         rm -rf /tmp/.buildx-cache
         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  build-7-0-3-alpine-3-9:
+  build-7-0:
     runs-on: ubuntu-latest
     env:
-      VARIANT: 7.0.3-alpine-3.9
+      VARIANT: 7.0
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -1188,7 +1188,7 @@ jobs:
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.0.3-alpine-3.9
+        context: variants/7.0
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: false
         tags: |
@@ -1202,7 +1202,7 @@ jobs:
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.0.3-alpine-3.9
+        context: variants/7.0
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -1215,7 +1215,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.0.3-alpine-3.9
+        context: variants/7.0
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -1233,10 +1233,10 @@ jobs:
         rm -rf /tmp/.buildx-cache
         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  build-7-0-3-alpine-3-9-git:
+  build-7-0-git:
     runs-on: ubuntu-latest
     env:
-      VARIANT: 7.0.3-alpine-3.9-git
+      VARIANT: 7.0-git
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -1308,7 +1308,7 @@ jobs:
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.0.3-alpine-3.9-git
+        context: variants/7.0-git
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: false
         tags: |
@@ -1322,7 +1322,7 @@ jobs:
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.0.3-alpine-3.9-git
+        context: variants/7.0-git
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -1335,7 +1335,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.0.3-alpine-3.9-git
+        context: variants/7.0-git
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -1353,10 +1353,10 @@ jobs:
         rm -rf /tmp/.buildx-cache
         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  build-7-0-3-alpine-3-9-git-sops:
+  build-7-0-git-sops:
     runs-on: ubuntu-latest
     env:
-      VARIANT: 7.0.3-alpine-3.9-git-sops
+      VARIANT: 7.0-git-sops
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -1428,7 +1428,7 @@ jobs:
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.0.3-alpine-3.9-git-sops
+        context: variants/7.0-git-sops
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: false
         tags: |
@@ -1442,7 +1442,7 @@ jobs:
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.0.3-alpine-3.9-git-sops
+        context: variants/7.0-git-sops
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -1455,7 +1455,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v3
       with:
-        context: variants/7.0.3-alpine-3.9-git-sops
+        context: variants/7.0-git-sops
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -1473,10 +1473,10 @@ jobs:
         rm -rf /tmp/.buildx-cache
         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  build-6-2-4-alpine-3-8:
+  build-6-2:
     runs-on: ubuntu-latest
     env:
-      VARIANT: 6.2.4-alpine-3.8
+      VARIANT: 6.2
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -1548,7 +1548,7 @@ jobs:
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v3
       with:
-        context: variants/6.2.4-alpine-3.8
+        context: variants/6.2
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: false
         tags: |
@@ -1562,7 +1562,7 @@ jobs:
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v3
       with:
-        context: variants/6.2.4-alpine-3.8
+        context: variants/6.2
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -1575,7 +1575,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v3
       with:
-        context: variants/6.2.4-alpine-3.8
+        context: variants/6.2
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -1593,10 +1593,10 @@ jobs:
         rm -rf /tmp/.buildx-cache
         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  build-6-2-4-alpine-3-8-git:
+  build-6-2-git:
     runs-on: ubuntu-latest
     env:
-      VARIANT: 6.2.4-alpine-3.8-git
+      VARIANT: 6.2-git
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -1668,7 +1668,7 @@ jobs:
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v3
       with:
-        context: variants/6.2.4-alpine-3.8-git
+        context: variants/6.2-git
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: false
         tags: |
@@ -1682,7 +1682,7 @@ jobs:
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v3
       with:
-        context: variants/6.2.4-alpine-3.8-git
+        context: variants/6.2-git
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -1695,7 +1695,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v3
       with:
-        context: variants/6.2.4-alpine-3.8-git
+        context: variants/6.2-git
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -1713,10 +1713,10 @@ jobs:
         rm -rf /tmp/.buildx-cache
         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  build-6-2-4-alpine-3-8-git-sops:
+  build-6-2-git-sops:
     runs-on: ubuntu-latest
     env:
-      VARIANT: 6.2.4-alpine-3.8-git-sops
+      VARIANT: 6.2-git-sops
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -1788,7 +1788,7 @@ jobs:
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v3
       with:
-        context: variants/6.2.4-alpine-3.8-git-sops
+        context: variants/6.2-git-sops
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: false
         tags: |
@@ -1802,7 +1802,7 @@ jobs:
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v3
       with:
-        context: variants/6.2.4-alpine-3.8-git-sops
+        context: variants/6.2-git-sops
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -1815,7 +1815,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v3
       with:
-        context: variants/6.2.4-alpine-3.8-git-sops
+        context: variants/6.2-git-sops
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -1833,10 +1833,10 @@ jobs:
         rm -rf /tmp/.buildx-cache
         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  build-6-1-3-alpine-3-8:
+  build-6-1:
     runs-on: ubuntu-latest
     env:
-      VARIANT: 6.1.3-alpine-3.8
+      VARIANT: 6.1
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -1908,7 +1908,7 @@ jobs:
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v3
       with:
-        context: variants/6.1.3-alpine-3.8
+        context: variants/6.1
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: false
         tags: |
@@ -1922,7 +1922,7 @@ jobs:
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v3
       with:
-        context: variants/6.1.3-alpine-3.8
+        context: variants/6.1
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -1935,7 +1935,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v3
       with:
-        context: variants/6.1.3-alpine-3.8
+        context: variants/6.1
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -1953,10 +1953,10 @@ jobs:
         rm -rf /tmp/.buildx-cache
         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  build-6-1-3-alpine-3-8-git:
+  build-6-1-git:
     runs-on: ubuntu-latest
     env:
-      VARIANT: 6.1.3-alpine-3.8-git
+      VARIANT: 6.1-git
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -2028,7 +2028,7 @@ jobs:
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v3
       with:
-        context: variants/6.1.3-alpine-3.8-git
+        context: variants/6.1-git
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: false
         tags: |
@@ -2042,7 +2042,7 @@ jobs:
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v3
       with:
-        context: variants/6.1.3-alpine-3.8-git
+        context: variants/6.1-git
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -2055,7 +2055,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v3
       with:
-        context: variants/6.1.3-alpine-3.8-git
+        context: variants/6.1-git
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -2073,10 +2073,10 @@ jobs:
         rm -rf /tmp/.buildx-cache
         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  build-6-1-3-alpine-3-8-git-sops:
+  build-6-1-git-sops:
     runs-on: ubuntu-latest
     env:
-      VARIANT: 6.1.3-alpine-3.8-git-sops
+      VARIANT: 6.1-git-sops
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -2148,7 +2148,7 @@ jobs:
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v3
       with:
-        context: variants/6.1.3-alpine-3.8-git-sops
+        context: variants/6.1-git-sops
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: false
         tags: |
@@ -2162,7 +2162,7 @@ jobs:
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v3
       with:
-        context: variants/6.1.3-alpine-3.8-git-sops
+        context: variants/6.1-git-sops
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -2175,7 +2175,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v3
       with:
-        context: variants/6.1.3-alpine-3.8-git-sops
+        context: variants/6.1-git-sops
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
         push: true
         tags: |
@@ -4715,7 +4715,7 @@ jobs:
         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
   update-draft-release:
-    needs: [build-7-3-alpine-3-17, build-7-3-alpine-3-17-git, build-7-3-alpine-3-17-git-sops, build-7-2-alpine-3-17, build-7-2-alpine-3-17-git, build-7-2-alpine-3-17-git-sops, build-7-1-5-alpine-3-13, build-7-1-5-alpine-3-13-git, build-7-1-5-alpine-3-13-git-sops, build-7-0-3-alpine-3-9, build-7-0-3-alpine-3-9-git, build-7-0-3-alpine-3-9-git-sops, build-6-2-4-alpine-3-8, build-6-2-4-alpine-3-8-git, build-6-2-4-alpine-3-8-git-sops, build-6-1-3-alpine-3-8, build-6-1-3-alpine-3-8-git, build-6-1-3-alpine-3-8-git-sops, build-7-3-ubuntu-22-04, build-7-3-ubuntu-22-04-git, build-7-3-ubuntu-22-04-git-sops, build-7-2-ubuntu-22-04, build-7-2-ubuntu-22-04-git, build-7-2-ubuntu-22-04-git-sops, build-7-1-5-ubuntu-20-04, build-7-1-5-ubuntu-20-04-git, build-7-1-5-ubuntu-20-04-git-sops, build-7-0-3-ubuntu-18-04, build-7-0-3-ubuntu-18-04-git, build-7-0-3-ubuntu-18-04-git-sops, build-6-2-4-ubuntu-18-04, build-6-2-4-ubuntu-18-04-git, build-6-2-4-ubuntu-18-04-git-sops, build-6-1-3-ubuntu-18-04, build-6-1-3-ubuntu-18-04-git, build-6-1-3-ubuntu-18-04-git-sops, build-6-0-4-ubuntu-16-04, build-6-0-4-ubuntu-16-04-git, build-6-0-4-ubuntu-16-04-git-sops]
+    needs: [build-7-3, build-7-3-git, build-7-3-git-sops, build-7-2, build-7-2-git, build-7-2-git-sops, build-7-1, build-7-1-git, build-7-1-git-sops, build-7-0, build-7-0-git, build-7-0-git-sops, build-6-2, build-6-2-git, build-6-2-git-sops, build-6-1, build-6-1-git, build-6-1-git-sops, build-7-3-ubuntu-22-04, build-7-3-ubuntu-22-04-git, build-7-3-ubuntu-22-04-git-sops, build-7-2-ubuntu-22-04, build-7-2-ubuntu-22-04-git, build-7-2-ubuntu-22-04-git-sops, build-7-1-5-ubuntu-20-04, build-7-1-5-ubuntu-20-04-git, build-7-1-5-ubuntu-20-04-git-sops, build-7-0-3-ubuntu-18-04, build-7-0-3-ubuntu-18-04-git, build-7-0-3-ubuntu-18-04-git-sops, build-6-2-4-ubuntu-18-04, build-6-2-4-ubuntu-18-04-git, build-6-2-4-ubuntu-18-04-git-sops, build-6-1-3-ubuntu-18-04, build-6-1-3-ubuntu-18-04-git, build-6-1-3-ubuntu-18-04-git-sops, build-6-0-4-ubuntu-16-04, build-6-0-4-ubuntu-16-04-git, build-6-0-4-ubuntu-16-04-git-sops]
     if: github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
     steps:
@@ -4728,7 +4728,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   publish-draft-release:
-    needs: [build-7-3-alpine-3-17, build-7-3-alpine-3-17-git, build-7-3-alpine-3-17-git-sops, build-7-2-alpine-3-17, build-7-2-alpine-3-17-git, build-7-2-alpine-3-17-git-sops, build-7-1-5-alpine-3-13, build-7-1-5-alpine-3-13-git, build-7-1-5-alpine-3-13-git-sops, build-7-0-3-alpine-3-9, build-7-0-3-alpine-3-9-git, build-7-0-3-alpine-3-9-git-sops, build-6-2-4-alpine-3-8, build-6-2-4-alpine-3-8-git, build-6-2-4-alpine-3-8-git-sops, build-6-1-3-alpine-3-8, build-6-1-3-alpine-3-8-git, build-6-1-3-alpine-3-8-git-sops, build-7-3-ubuntu-22-04, build-7-3-ubuntu-22-04-git, build-7-3-ubuntu-22-04-git-sops, build-7-2-ubuntu-22-04, build-7-2-ubuntu-22-04-git, build-7-2-ubuntu-22-04-git-sops, build-7-1-5-ubuntu-20-04, build-7-1-5-ubuntu-20-04-git, build-7-1-5-ubuntu-20-04-git-sops, build-7-0-3-ubuntu-18-04, build-7-0-3-ubuntu-18-04-git, build-7-0-3-ubuntu-18-04-git-sops, build-6-2-4-ubuntu-18-04, build-6-2-4-ubuntu-18-04-git, build-6-2-4-ubuntu-18-04-git-sops, build-6-1-3-ubuntu-18-04, build-6-1-3-ubuntu-18-04-git, build-6-1-3-ubuntu-18-04-git-sops, build-6-0-4-ubuntu-16-04, build-6-0-4-ubuntu-16-04-git, build-6-0-4-ubuntu-16-04-git-sops]
+    needs: [build-7-3, build-7-3-git, build-7-3-git-sops, build-7-2, build-7-2-git, build-7-2-git-sops, build-7-1, build-7-1-git, build-7-1-git-sops, build-7-0, build-7-0-git, build-7-0-git-sops, build-6-2, build-6-2-git, build-6-2-git-sops, build-6-1, build-6-1-git, build-6-1-git-sops, build-7-3-ubuntu-22-04, build-7-3-ubuntu-22-04-git, build-7-3-ubuntu-22-04-git-sops, build-7-2-ubuntu-22-04, build-7-2-ubuntu-22-04-git, build-7-2-ubuntu-22-04-git-sops, build-7-1-5-ubuntu-20-04, build-7-1-5-ubuntu-20-04-git, build-7-1-5-ubuntu-20-04-git-sops, build-7-0-3-ubuntu-18-04, build-7-0-3-ubuntu-18-04-git, build-7-0-3-ubuntu-18-04-git-sops, build-6-2-4-ubuntu-18-04, build-6-2-4-ubuntu-18-04-git, build-6-2-4-ubuntu-18-04-git-sops, build-6-1-3-ubuntu-18-04, build-6-1-3-ubuntu-18-04-git, build-6-1-3-ubuntu-18-04-git-sops, build-6-0-4-ubuntu-16-04, build-6-0-4-ubuntu-16-04-git, build-6-0-4-ubuntu-16-04-git-sops]
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     steps:
@@ -4743,7 +4743,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   update-dockerhub-description:
-    needs: [build-7-3-alpine-3-17, build-7-3-alpine-3-17-git, build-7-3-alpine-3-17-git-sops, build-7-2-alpine-3-17, build-7-2-alpine-3-17-git, build-7-2-alpine-3-17-git-sops, build-7-1-5-alpine-3-13, build-7-1-5-alpine-3-13-git, build-7-1-5-alpine-3-13-git-sops, build-7-0-3-alpine-3-9, build-7-0-3-alpine-3-9-git, build-7-0-3-alpine-3-9-git-sops, build-6-2-4-alpine-3-8, build-6-2-4-alpine-3-8-git, build-6-2-4-alpine-3-8-git-sops, build-6-1-3-alpine-3-8, build-6-1-3-alpine-3-8-git, build-6-1-3-alpine-3-8-git-sops, build-7-3-ubuntu-22-04, build-7-3-ubuntu-22-04-git, build-7-3-ubuntu-22-04-git-sops, build-7-2-ubuntu-22-04, build-7-2-ubuntu-22-04-git, build-7-2-ubuntu-22-04-git-sops, build-7-1-5-ubuntu-20-04, build-7-1-5-ubuntu-20-04-git, build-7-1-5-ubuntu-20-04-git-sops, build-7-0-3-ubuntu-18-04, build-7-0-3-ubuntu-18-04-git, build-7-0-3-ubuntu-18-04-git-sops, build-6-2-4-ubuntu-18-04, build-6-2-4-ubuntu-18-04-git, build-6-2-4-ubuntu-18-04-git-sops, build-6-1-3-ubuntu-18-04, build-6-1-3-ubuntu-18-04-git, build-6-1-3-ubuntu-18-04-git-sops, build-6-0-4-ubuntu-16-04, build-6-0-4-ubuntu-16-04-git, build-6-0-4-ubuntu-16-04-git-sops]
+    needs: [build-7-3, build-7-3-git, build-7-3-git-sops, build-7-2, build-7-2-git, build-7-2-git-sops, build-7-1, build-7-1-git, build-7-1-git-sops, build-7-0, build-7-0-git, build-7-0-git-sops, build-6-2, build-6-2-git, build-6-2-git-sops, build-6-1, build-6-1-git, build-6-1-git-sops, build-7-3-ubuntu-22-04, build-7-3-ubuntu-22-04-git, build-7-3-ubuntu-22-04-git-sops, build-7-2-ubuntu-22-04, build-7-2-ubuntu-22-04-git, build-7-2-ubuntu-22-04-git-sops, build-7-1-5-ubuntu-20-04, build-7-1-5-ubuntu-20-04-git, build-7-1-5-ubuntu-20-04-git-sops, build-7-0-3-ubuntu-18-04, build-7-0-3-ubuntu-18-04-git, build-7-0-3-ubuntu-18-04-git-sops, build-6-2-4-ubuntu-18-04, build-6-2-4-ubuntu-18-04-git, build-6-2-4-ubuntu-18-04-git-sops, build-6-1-3-ubuntu-18-04, build-6-1-3-ubuntu-18-04-git, build-6-1-3-ubuntu-18-04-git-sops, build-6-0-4-ubuntu-16-04, build-6-0-4-ubuntu-16-04-git, build-6-0-4-ubuntu-16-04-git-sops]
     if: github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
     steps:
diff --git a/README.md b/README.md
index 9b027da..964407b 100644
--- a/README.md
+++ b/README.md
@@ -8,26 +8,28 @@ Dockerized `powershell`, based on [mcr.microsoft.com/powershell](https://hub.doc
 
 ## Tags
 
+Variants without a distro are based on `alpine`.
+
 | Tag | Dockerfile Build Context |
 |:-------:|:---------:|
-| `:7.3-alpine-3.17` | [View](variants/7.3-alpine-3.17) |
-| `:7.3-alpine-3.17-git` | [View](variants/7.3-alpine-3.17-git) |
-| `:7.3-alpine-3.17-git-sops` | [View](variants/7.3-alpine-3.17-git-sops) |
-| `:7.2-alpine-3.17` | [View](variants/7.2-alpine-3.17) |
-| `:7.2-alpine-3.17-git` | [View](variants/7.2-alpine-3.17-git) |
-| `:7.2-alpine-3.17-git-sops` | [View](variants/7.2-alpine-3.17-git-sops) |
-| `:7.1.5-alpine-3.13` | [View](variants/7.1.5-alpine-3.13) |
-| `:7.1.5-alpine-3.13-git` | [View](variants/7.1.5-alpine-3.13-git) |
-| `:7.1.5-alpine-3.13-git-sops` | [View](variants/7.1.5-alpine-3.13-git-sops) |
-| `:7.0.3-alpine-3.9` | [View](variants/7.0.3-alpine-3.9) |
-| `:7.0.3-alpine-3.9-git` | [View](variants/7.0.3-alpine-3.9-git) |
-| `:7.0.3-alpine-3.9-git-sops` | [View](variants/7.0.3-alpine-3.9-git-sops) |
-| `:6.2.4-alpine-3.8` | [View](variants/6.2.4-alpine-3.8) |
-| `:6.2.4-alpine-3.8-git` | [View](variants/6.2.4-alpine-3.8-git) |
-| `:6.2.4-alpine-3.8-git-sops` | [View](variants/6.2.4-alpine-3.8-git-sops) |
-| `:6.1.3-alpine-3.8` | [View](variants/6.1.3-alpine-3.8) |
-| `:6.1.3-alpine-3.8-git` | [View](variants/6.1.3-alpine-3.8-git) |
-| `:6.1.3-alpine-3.8-git-sops` | [View](variants/6.1.3-alpine-3.8-git-sops) |
+| `:7.3` | [View](variants/7.3) |
+| `:7.3-git` | [View](variants/7.3-git) |
+| `:7.3-git-sops` | [View](variants/7.3-git-sops) |
+| `:7.2` | [View](variants/7.2) |
+| `:7.2-git` | [View](variants/7.2-git) |
+| `:7.2-git-sops` | [View](variants/7.2-git-sops) |
+| `:7.1` | [View](variants/7.1) |
+| `:7.1-git` | [View](variants/7.1-git) |
+| `:7.1-git-sops` | [View](variants/7.1-git-sops) |
+| `:7.0` | [View](variants/7.0) |
+| `:7.0-git` | [View](variants/7.0-git) |
+| `:7.0-git-sops` | [View](variants/7.0-git-sops) |
+| `:6.2` | [View](variants/6.2) |
+| `:6.2-git` | [View](variants/6.2-git) |
+| `:6.2-git-sops` | [View](variants/6.2-git-sops) |
+| `:6.1` | [View](variants/6.1) |
+| `:6.1-git` | [View](variants/6.1-git) |
+| `:6.1-git-sops` | [View](variants/6.1-git-sops) |
 | `:7.3-ubuntu-22.04`, `:latest` | [View](variants/7.3-ubuntu-22.04) |
 | `:7.3-ubuntu-22.04-git` | [View](variants/7.3-ubuntu-22.04-git) |
 | `:7.3-ubuntu-22.04-git-sops` | [View](variants/7.3-ubuntu-22.04-git-sops) |
diff --git a/generate/definitions/VARIANTS.ps1 b/generate/definitions/VARIANTS.ps1
index f77973b..7f47b19 100644
--- a/generate/definitions/VARIANTS.ps1
+++ b/generate/definitions/VARIANTS.ps1
@@ -48,7 +48,14 @@ $VARIANTS = @(
                 }
                 # Docker image tag. E.g. '7.1.5-alpine-3.13'
                 tag = @(
-                    $variant['base_image_tag'] -replace '^lts-', '' -replace '-\d{8}$', '' # Replace 'lts-' prefix and 8-digit calver suffix
+                    if ($variant['base_image_tag'] -match '^(lts-)?(\d+\.\d+)(\.\d+)?-(alpine|ubuntu)-(\d+\.\d+)') {
+                        if ($matches[4] -eq 'alpine') {
+                            $matches[2] # Only the version number
+                        }
+                        if ($matches[4] -eq 'ubuntu') {
+                            "$( $matches[2] )$( $matches[3] )-$( $matches[4] )-$( $matches[5] )" # Strip 'lts-' prefix and 8-digit calver suffix
+                        }
+                    }
                     $subVariant['components'] | ? { $_ }
                 ) -join '-'
                 tag_as_latest = if ($variant['base_image_tag'] -eq $local:BASE_IMAGE_TAG_LATEST_STABLE -and $subVariant['components'].Count -eq 0) { $true } else { $false }
diff --git a/generate/templates/README.md.ps1 b/generate/templates/README.md.ps1
index 0da119d..3cd0b3e 100644
--- a/generate/templates/README.md.ps1
+++ b/generate/templates/README.md.ps1
@@ -9,6 +9,8 @@ Dockerized ``powershell``, based on [mcr.microsoft.com/powershell](https://hub.d
 
 ## Tags
 
+Variants without a distro are based on ``alpine``.
+
 | Tag | Dockerfile Build Context |
 |:-------:|:---------:|
 $(
diff --git a/variants/6.1-git-sops/Dockerfile b/variants/6.1-git-sops/Dockerfile
new file mode 100644
index 0000000..a9e0b68
--- /dev/null
+++ b/variants/6.1-git-sops/Dockerfile
@@ -0,0 +1,29 @@
+FROM mcr.microsoft.com/powershell:6.1.3-alpine-3.8
+
+# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350
+ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_UPDATECHECK=Off
+ENV POWERSHELL_UPDATECHECK_OPTOUT=1
+ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
+ENV DOTNET_TELEMETRY_OPTOUT=1
+ENV COMPlus_EnableDiagnostics=0
+
+# Install Pester
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose'
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 5.0.0 -Force -ErrorAction Stop -Verbose'
+
+RUN apk add --no-cache git
+
+RUN set -eux; \
+    wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.1/sops-v3.7.1.linux > /usr/local/bin/sops; \
+    chmod +x /usr/local/bin/sops; \
+    sha256sum /usr/local/bin/sops | grep '^185348fd77fc160d5bdf3cd20ecbc796163504fd3df196d7cb29000773657b74 '; \
+    sops --version
+
+RUN apk add --no-cache gnupg
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/6.1-git-sops/docker-entrypoint.sh b/variants/6.1-git-sops/docker-entrypoint.sh
new file mode 100644
index 0000000..5b23d6d
--- /dev/null
+++ b/variants/6.1-git-sops/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/6.1-git/Dockerfile b/variants/6.1-git/Dockerfile
new file mode 100644
index 0000000..27f2340
--- /dev/null
+++ b/variants/6.1-git/Dockerfile
@@ -0,0 +1,21 @@
+FROM mcr.microsoft.com/powershell:6.1.3-alpine-3.8
+
+# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350
+ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_UPDATECHECK=Off
+ENV POWERSHELL_UPDATECHECK_OPTOUT=1
+ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
+ENV DOTNET_TELEMETRY_OPTOUT=1
+ENV COMPlus_EnableDiagnostics=0
+
+# Install Pester
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose'
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 5.0.0 -Force -ErrorAction Stop -Verbose'
+
+RUN apk add --no-cache git
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/6.1-git/docker-entrypoint.sh b/variants/6.1-git/docker-entrypoint.sh
new file mode 100644
index 0000000..5b23d6d
--- /dev/null
+++ b/variants/6.1-git/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/6.1/Dockerfile b/variants/6.1/Dockerfile
new file mode 100644
index 0000000..9c207b4
--- /dev/null
+++ b/variants/6.1/Dockerfile
@@ -0,0 +1,19 @@
+FROM mcr.microsoft.com/powershell:6.1.3-alpine-3.8
+
+# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350
+ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_UPDATECHECK=Off
+ENV POWERSHELL_UPDATECHECK_OPTOUT=1
+ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
+ENV DOTNET_TELEMETRY_OPTOUT=1
+ENV COMPlus_EnableDiagnostics=0
+
+# Install Pester
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose'
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 5.0.0 -Force -ErrorAction Stop -Verbose'
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/6.1/docker-entrypoint.sh b/variants/6.1/docker-entrypoint.sh
new file mode 100644
index 0000000..5b23d6d
--- /dev/null
+++ b/variants/6.1/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/6.2-git-sops/Dockerfile b/variants/6.2-git-sops/Dockerfile
new file mode 100644
index 0000000..5cdac9f
--- /dev/null
+++ b/variants/6.2-git-sops/Dockerfile
@@ -0,0 +1,29 @@
+FROM mcr.microsoft.com/powershell:6.2.4-alpine-3.8
+
+# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350
+ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_UPDATECHECK=Off
+ENV POWERSHELL_UPDATECHECK_OPTOUT=1
+ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
+ENV DOTNET_TELEMETRY_OPTOUT=1
+ENV COMPlus_EnableDiagnostics=0
+
+# Install Pester
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose'
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 5.0.0 -Force -ErrorAction Stop -Verbose'
+
+RUN apk add --no-cache git
+
+RUN set -eux; \
+    wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.1/sops-v3.7.1.linux > /usr/local/bin/sops; \
+    chmod +x /usr/local/bin/sops; \
+    sha256sum /usr/local/bin/sops | grep '^185348fd77fc160d5bdf3cd20ecbc796163504fd3df196d7cb29000773657b74 '; \
+    sops --version
+
+RUN apk add --no-cache gnupg
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/6.2-git-sops/docker-entrypoint.sh b/variants/6.2-git-sops/docker-entrypoint.sh
new file mode 100644
index 0000000..5b23d6d
--- /dev/null
+++ b/variants/6.2-git-sops/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/6.2-git/Dockerfile b/variants/6.2-git/Dockerfile
new file mode 100644
index 0000000..43e8047
--- /dev/null
+++ b/variants/6.2-git/Dockerfile
@@ -0,0 +1,21 @@
+FROM mcr.microsoft.com/powershell:6.2.4-alpine-3.8
+
+# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350
+ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_UPDATECHECK=Off
+ENV POWERSHELL_UPDATECHECK_OPTOUT=1
+ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
+ENV DOTNET_TELEMETRY_OPTOUT=1
+ENV COMPlus_EnableDiagnostics=0
+
+# Install Pester
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose'
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 5.0.0 -Force -ErrorAction Stop -Verbose'
+
+RUN apk add --no-cache git
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/6.2-git/docker-entrypoint.sh b/variants/6.2-git/docker-entrypoint.sh
new file mode 100644
index 0000000..5b23d6d
--- /dev/null
+++ b/variants/6.2-git/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/6.2/Dockerfile b/variants/6.2/Dockerfile
new file mode 100644
index 0000000..bdea3a1
--- /dev/null
+++ b/variants/6.2/Dockerfile
@@ -0,0 +1,19 @@
+FROM mcr.microsoft.com/powershell:6.2.4-alpine-3.8
+
+# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350
+ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_UPDATECHECK=Off
+ENV POWERSHELL_UPDATECHECK_OPTOUT=1
+ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
+ENV DOTNET_TELEMETRY_OPTOUT=1
+ENV COMPlus_EnableDiagnostics=0
+
+# Install Pester
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose'
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 5.0.0 -Force -ErrorAction Stop -Verbose'
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/6.2/docker-entrypoint.sh b/variants/6.2/docker-entrypoint.sh
new file mode 100644
index 0000000..5b23d6d
--- /dev/null
+++ b/variants/6.2/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/7.0-git-sops/Dockerfile b/variants/7.0-git-sops/Dockerfile
new file mode 100644
index 0000000..1d318f1
--- /dev/null
+++ b/variants/7.0-git-sops/Dockerfile
@@ -0,0 +1,29 @@
+FROM mcr.microsoft.com/powershell:7.0.3-alpine-3.9-20200928
+
+# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350
+ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_UPDATECHECK=Off
+ENV POWERSHELL_UPDATECHECK_OPTOUT=1
+ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
+ENV DOTNET_TELEMETRY_OPTOUT=1
+ENV COMPlus_EnableDiagnostics=0
+
+# Install Pester
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose'
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 5.0.0 -Force -ErrorAction Stop -Verbose'
+
+RUN apk add --no-cache git
+
+RUN set -eux; \
+    wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.1/sops-v3.7.1.linux > /usr/local/bin/sops; \
+    chmod +x /usr/local/bin/sops; \
+    sha256sum /usr/local/bin/sops | grep '^185348fd77fc160d5bdf3cd20ecbc796163504fd3df196d7cb29000773657b74 '; \
+    sops --version
+
+RUN apk add --no-cache gnupg
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/7.0-git-sops/docker-entrypoint.sh b/variants/7.0-git-sops/docker-entrypoint.sh
new file mode 100644
index 0000000..5b23d6d
--- /dev/null
+++ b/variants/7.0-git-sops/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/7.0-git/Dockerfile b/variants/7.0-git/Dockerfile
new file mode 100644
index 0000000..ffa9929
--- /dev/null
+++ b/variants/7.0-git/Dockerfile
@@ -0,0 +1,21 @@
+FROM mcr.microsoft.com/powershell:7.0.3-alpine-3.9-20200928
+
+# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350
+ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_UPDATECHECK=Off
+ENV POWERSHELL_UPDATECHECK_OPTOUT=1
+ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
+ENV DOTNET_TELEMETRY_OPTOUT=1
+ENV COMPlus_EnableDiagnostics=0
+
+# Install Pester
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose'
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 5.0.0 -Force -ErrorAction Stop -Verbose'
+
+RUN apk add --no-cache git
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/7.0-git/docker-entrypoint.sh b/variants/7.0-git/docker-entrypoint.sh
new file mode 100644
index 0000000..5b23d6d
--- /dev/null
+++ b/variants/7.0-git/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/7.0/Dockerfile b/variants/7.0/Dockerfile
new file mode 100644
index 0000000..df4c64c
--- /dev/null
+++ b/variants/7.0/Dockerfile
@@ -0,0 +1,19 @@
+FROM mcr.microsoft.com/powershell:7.0.3-alpine-3.9-20200928
+
+# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350
+ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_UPDATECHECK=Off
+ENV POWERSHELL_UPDATECHECK_OPTOUT=1
+ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
+ENV DOTNET_TELEMETRY_OPTOUT=1
+ENV COMPlus_EnableDiagnostics=0
+
+# Install Pester
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose'
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 5.0.0 -Force -ErrorAction Stop -Verbose'
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/7.0/docker-entrypoint.sh b/variants/7.0/docker-entrypoint.sh
new file mode 100644
index 0000000..5b23d6d
--- /dev/null
+++ b/variants/7.0/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/7.1-git-sops/Dockerfile b/variants/7.1-git-sops/Dockerfile
new file mode 100644
index 0000000..c200535
--- /dev/null
+++ b/variants/7.1-git-sops/Dockerfile
@@ -0,0 +1,29 @@
+FROM mcr.microsoft.com/powershell:7.1.5-alpine-3.13-20211021
+
+# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350
+ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_UPDATECHECK=Off
+ENV POWERSHELL_UPDATECHECK_OPTOUT=1
+ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
+ENV DOTNET_TELEMETRY_OPTOUT=1
+ENV COMPlus_EnableDiagnostics=0
+
+# Install Pester
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose'
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 5.0.0 -Force -ErrorAction Stop -Verbose'
+
+RUN apk add --no-cache git
+
+RUN set -eux; \
+    wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.1/sops-v3.7.1.linux > /usr/local/bin/sops; \
+    chmod +x /usr/local/bin/sops; \
+    sha256sum /usr/local/bin/sops | grep '^185348fd77fc160d5bdf3cd20ecbc796163504fd3df196d7cb29000773657b74 '; \
+    sops --version
+
+RUN apk add --no-cache gnupg
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/7.1-git-sops/docker-entrypoint.sh b/variants/7.1-git-sops/docker-entrypoint.sh
new file mode 100644
index 0000000..5b23d6d
--- /dev/null
+++ b/variants/7.1-git-sops/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/7.1-git/Dockerfile b/variants/7.1-git/Dockerfile
new file mode 100644
index 0000000..1e7689c
--- /dev/null
+++ b/variants/7.1-git/Dockerfile
@@ -0,0 +1,21 @@
+FROM mcr.microsoft.com/powershell:7.1.5-alpine-3.13-20211021
+
+# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350
+ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_UPDATECHECK=Off
+ENV POWERSHELL_UPDATECHECK_OPTOUT=1
+ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
+ENV DOTNET_TELEMETRY_OPTOUT=1
+ENV COMPlus_EnableDiagnostics=0
+
+# Install Pester
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose'
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 5.0.0 -Force -ErrorAction Stop -Verbose'
+
+RUN apk add --no-cache git
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/7.1-git/docker-entrypoint.sh b/variants/7.1-git/docker-entrypoint.sh
new file mode 100644
index 0000000..5b23d6d
--- /dev/null
+++ b/variants/7.1-git/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/7.1/Dockerfile b/variants/7.1/Dockerfile
new file mode 100644
index 0000000..774bb70
--- /dev/null
+++ b/variants/7.1/Dockerfile
@@ -0,0 +1,19 @@
+FROM mcr.microsoft.com/powershell:7.1.5-alpine-3.13-20211021
+
+# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350
+ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_UPDATECHECK=Off
+ENV POWERSHELL_UPDATECHECK_OPTOUT=1
+ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
+ENV DOTNET_TELEMETRY_OPTOUT=1
+ENV COMPlus_EnableDiagnostics=0
+
+# Install Pester
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose'
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 5.0.0 -Force -ErrorAction Stop -Verbose'
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/7.1/docker-entrypoint.sh b/variants/7.1/docker-entrypoint.sh
new file mode 100644
index 0000000..5b23d6d
--- /dev/null
+++ b/variants/7.1/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/7.2-git-sops/Dockerfile b/variants/7.2-git-sops/Dockerfile
new file mode 100644
index 0000000..6f9e3d5
--- /dev/null
+++ b/variants/7.2-git-sops/Dockerfile
@@ -0,0 +1,29 @@
+FROM mcr.microsoft.com/powershell:lts-7.2-alpine-3.17
+
+# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350
+ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_UPDATECHECK=Off
+ENV POWERSHELL_UPDATECHECK_OPTOUT=1
+ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
+ENV DOTNET_TELEMETRY_OPTOUT=1
+ENV COMPlus_EnableDiagnostics=0
+
+# Install Pester
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose'
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 5.0.0 -Force -ErrorAction Stop -Verbose'
+
+RUN apk add --no-cache git
+
+RUN set -eux; \
+    wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.1/sops-v3.7.1.linux > /usr/local/bin/sops; \
+    chmod +x /usr/local/bin/sops; \
+    sha256sum /usr/local/bin/sops | grep '^185348fd77fc160d5bdf3cd20ecbc796163504fd3df196d7cb29000773657b74 '; \
+    sops --version
+
+RUN apk add --no-cache gnupg
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/7.2-git-sops/docker-entrypoint.sh b/variants/7.2-git-sops/docker-entrypoint.sh
new file mode 100644
index 0000000..5b23d6d
--- /dev/null
+++ b/variants/7.2-git-sops/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/7.2-git/Dockerfile b/variants/7.2-git/Dockerfile
new file mode 100644
index 0000000..fba862d
--- /dev/null
+++ b/variants/7.2-git/Dockerfile
@@ -0,0 +1,21 @@
+FROM mcr.microsoft.com/powershell:lts-7.2-alpine-3.17
+
+# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350
+ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_UPDATECHECK=Off
+ENV POWERSHELL_UPDATECHECK_OPTOUT=1
+ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
+ENV DOTNET_TELEMETRY_OPTOUT=1
+ENV COMPlus_EnableDiagnostics=0
+
+# Install Pester
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose'
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 5.0.0 -Force -ErrorAction Stop -Verbose'
+
+RUN apk add --no-cache git
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/7.2-git/docker-entrypoint.sh b/variants/7.2-git/docker-entrypoint.sh
new file mode 100644
index 0000000..5b23d6d
--- /dev/null
+++ b/variants/7.2-git/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/7.2/Dockerfile b/variants/7.2/Dockerfile
new file mode 100644
index 0000000..da45003
--- /dev/null
+++ b/variants/7.2/Dockerfile
@@ -0,0 +1,19 @@
+FROM mcr.microsoft.com/powershell:lts-7.2-alpine-3.17
+
+# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350
+ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_UPDATECHECK=Off
+ENV POWERSHELL_UPDATECHECK_OPTOUT=1
+ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
+ENV DOTNET_TELEMETRY_OPTOUT=1
+ENV COMPlus_EnableDiagnostics=0
+
+# Install Pester
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose'
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 5.0.0 -Force -ErrorAction Stop -Verbose'
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/7.2/docker-entrypoint.sh b/variants/7.2/docker-entrypoint.sh
new file mode 100644
index 0000000..5b23d6d
--- /dev/null
+++ b/variants/7.2/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/7.3-git-sops/Dockerfile b/variants/7.3-git-sops/Dockerfile
new file mode 100644
index 0000000..bb5790c
--- /dev/null
+++ b/variants/7.3-git-sops/Dockerfile
@@ -0,0 +1,29 @@
+FROM mcr.microsoft.com/powershell:7.3-alpine-3.17
+
+# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350
+ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_UPDATECHECK=Off
+ENV POWERSHELL_UPDATECHECK_OPTOUT=1
+ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
+ENV DOTNET_TELEMETRY_OPTOUT=1
+ENV COMPlus_EnableDiagnostics=0
+
+# Install Pester
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose'
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 5.0.0 -Force -ErrorAction Stop -Verbose'
+
+RUN apk add --no-cache git
+
+RUN set -eux; \
+    wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.1/sops-v3.7.1.linux > /usr/local/bin/sops; \
+    chmod +x /usr/local/bin/sops; \
+    sha256sum /usr/local/bin/sops | grep '^185348fd77fc160d5bdf3cd20ecbc796163504fd3df196d7cb29000773657b74 '; \
+    sops --version
+
+RUN apk add --no-cache gnupg
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/7.3-git-sops/docker-entrypoint.sh b/variants/7.3-git-sops/docker-entrypoint.sh
new file mode 100644
index 0000000..5b23d6d
--- /dev/null
+++ b/variants/7.3-git-sops/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/7.3-git/Dockerfile b/variants/7.3-git/Dockerfile
new file mode 100644
index 0000000..92101d5
--- /dev/null
+++ b/variants/7.3-git/Dockerfile
@@ -0,0 +1,21 @@
+FROM mcr.microsoft.com/powershell:7.3-alpine-3.17
+
+# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350
+ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_UPDATECHECK=Off
+ENV POWERSHELL_UPDATECHECK_OPTOUT=1
+ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
+ENV DOTNET_TELEMETRY_OPTOUT=1
+ENV COMPlus_EnableDiagnostics=0
+
+# Install Pester
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose'
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 5.0.0 -Force -ErrorAction Stop -Verbose'
+
+RUN apk add --no-cache git
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/7.3-git/docker-entrypoint.sh b/variants/7.3-git/docker-entrypoint.sh
new file mode 100644
index 0000000..5b23d6d
--- /dev/null
+++ b/variants/7.3-git/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/7.3/Dockerfile b/variants/7.3/Dockerfile
new file mode 100644
index 0000000..13d7f6f
--- /dev/null
+++ b/variants/7.3/Dockerfile
@@ -0,0 +1,19 @@
+FROM mcr.microsoft.com/powershell:7.3-alpine-3.17
+
+# Disable telemetry for powershell 7.0.0 and above and .NET core: https://github.com/PowerShell/PowerShell/issues/16234#issuecomment-942139350
+ENV POWERSHELL_CLI_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_TELEMETRY_OPTOUT=1
+ENV POWERSHELL_UPDATECHECK=Off
+ENV POWERSHELL_UPDATECHECK_OPTOUT=1
+ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
+ENV DOTNET_TELEMETRY_OPTOUT=1
+ENV COMPlus_EnableDiagnostics=0
+
+# Install Pester
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 4.0.0 -MaximumVersion 4.10.1 -Force -ErrorAction Stop -Verbose'
+RUN pwsh -c 'Install-Module Pester -Scope AllUsers -MinimumVersion 5.0.0 -Force -ErrorAction Stop -Verbose'
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/7.3/docker-entrypoint.sh b/variants/7.3/docker-entrypoint.sh
new file mode 100644
index 0000000..5b23d6d
--- /dev/null
+++ b/variants/7.3/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- pwsh "$@"
+fi
+
+exec "$@"
\ No newline at end of file