diff --git a/.github/workflows/ci-master-pr.yml b/.github/workflows/ci-master-pr.yml
index e900dfe..5a6412d 100644
--- a/.github/workflows/ci-master-pr.yml
+++ b/.github/workflows/ci-master-pr.yml
@@ -32,10 +32,10 @@ jobs:
       run: |
         git diff --exit-code
 
-  build-2-8-1-alpine-3-17:
+  build-2-8-1:
     runs-on: ubuntu-latest
     env:
-      VARIANT: 2.8.1-alpine-3.17
+      VARIANT: 2.8.1
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -107,7 +107,7 @@ jobs:
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v3
       with:
-        context: variants/2.8.1-alpine-3.17
+        context: variants/2.8.1
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: false
         tags: |
@@ -121,7 +121,7 @@ jobs:
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v3
       with:
-        context: variants/2.8.1-alpine-3.17
+        context: variants/2.8.1
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
@@ -134,7 +134,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v3
       with:
-        context: variants/2.8.1-alpine-3.17
+        context: variants/2.8.1
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
@@ -153,10 +153,10 @@ jobs:
         rm -rf /tmp/.buildx-cache
         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  build-2-8-1-libvirt-8-alpine-3-17:
+  build-2-8-1-libvirt-8:
     runs-on: ubuntu-latest
     env:
-      VARIANT: 2.8.1-libvirt-8-alpine-3.17
+      VARIANT: 2.8.1-libvirt-8
     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/2.8.1-libvirt-8-alpine-3.17
+        context: variants/2.8.1-libvirt-8
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: false
         tags: |
@@ -242,7 +242,7 @@ jobs:
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v3
       with:
-        context: variants/2.8.1-libvirt-8-alpine-3.17
+        context: variants/2.8.1-libvirt-8
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
@@ -255,7 +255,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v3
       with:
-        context: variants/2.8.1-libvirt-8-alpine-3.17
+        context: variants/2.8.1-libvirt-8
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
@@ -273,10 +273,10 @@ jobs:
         rm -rf /tmp/.buildx-cache
         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  build-2-8-1-curl-git-jq-sops-ssh-alpine-3-17:
+  build-2-8-1-curl-git-jq-sops-ssh:
     runs-on: ubuntu-latest
     env:
-      VARIANT: 2.8.1-curl-git-jq-sops-ssh-alpine-3.17
+      VARIANT: 2.8.1-curl-git-jq-sops-ssh
     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/2.8.1-curl-git-jq-sops-ssh-alpine-3.17
+        context: variants/2.8.1-curl-git-jq-sops-ssh
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: false
         tags: |
@@ -362,7 +362,7 @@ jobs:
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v3
       with:
-        context: variants/2.8.1-curl-git-jq-sops-ssh-alpine-3.17
+        context: variants/2.8.1-curl-git-jq-sops-ssh
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
@@ -375,7 +375,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v3
       with:
-        context: variants/2.8.1-curl-git-jq-sops-ssh-alpine-3.17
+        context: variants/2.8.1-curl-git-jq-sops-ssh
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
@@ -393,10 +393,10 @@ jobs:
         rm -rf /tmp/.buildx-cache
         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  build-2-8-1-libvirt-7-alpine-3-15:
+  build-2-8-1-libvirt-7:
     runs-on: ubuntu-latest
     env:
-      VARIANT: 2.8.1-libvirt-7-alpine-3.15
+      VARIANT: 2.8.1-libvirt-7
     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/2.8.1-libvirt-7-alpine-3.15
+        context: variants/2.8.1-libvirt-7
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: false
         tags: |
@@ -482,7 +482,7 @@ jobs:
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v3
       with:
-        context: variants/2.8.1-libvirt-7-alpine-3.15
+        context: variants/2.8.1-libvirt-7
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
@@ -495,7 +495,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v3
       with:
-        context: variants/2.8.1-libvirt-7-alpine-3.15
+        context: variants/2.8.1-libvirt-7
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
@@ -513,10 +513,10 @@ jobs:
         rm -rf /tmp/.buildx-cache
         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  build-2-8-1-libvirt-6-alpine-3-13:
+  build-2-8-1-libvirt-6:
     runs-on: ubuntu-latest
     env:
-      VARIANT: 2.8.1-libvirt-6-alpine-3.13
+      VARIANT: 2.8.1-libvirt-6
     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/2.8.1-libvirt-6-alpine-3.13
+        context: variants/2.8.1-libvirt-6
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: false
         tags: |
@@ -602,7 +602,7 @@ jobs:
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v3
       with:
-        context: variants/2.8.1-libvirt-6-alpine-3.13
+        context: variants/2.8.1-libvirt-6
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
@@ -615,7 +615,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v3
       with:
-        context: variants/2.8.1-libvirt-6-alpine-3.13
+        context: variants/2.8.1-libvirt-6
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
@@ -633,10 +633,10 @@ jobs:
         rm -rf /tmp/.buildx-cache
         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  build-2-7-0-alpine-3-17:
+  build-2-7-0:
     runs-on: ubuntu-latest
     env:
-      VARIANT: 2.7.0-alpine-3.17
+      VARIANT: 2.7.0
     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/2.7.0-alpine-3.17
+        context: variants/2.7.0
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: false
         tags: |
@@ -722,7 +722,7 @@ jobs:
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v3
       with:
-        context: variants/2.7.0-alpine-3.17
+        context: variants/2.7.0
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
@@ -735,7 +735,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v3
       with:
-        context: variants/2.7.0-alpine-3.17
+        context: variants/2.7.0
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
@@ -753,10 +753,10 @@ jobs:
         rm -rf /tmp/.buildx-cache
         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  build-2-7-0-libvirt-8-alpine-3-17:
+  build-2-7-0-libvirt-8:
     runs-on: ubuntu-latest
     env:
-      VARIANT: 2.7.0-libvirt-8-alpine-3.17
+      VARIANT: 2.7.0-libvirt-8
     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/2.7.0-libvirt-8-alpine-3.17
+        context: variants/2.7.0-libvirt-8
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: false
         tags: |
@@ -842,7 +842,7 @@ jobs:
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v3
       with:
-        context: variants/2.7.0-libvirt-8-alpine-3.17
+        context: variants/2.7.0-libvirt-8
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
@@ -855,7 +855,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v3
       with:
-        context: variants/2.7.0-libvirt-8-alpine-3.17
+        context: variants/2.7.0-libvirt-8
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
@@ -873,10 +873,10 @@ jobs:
         rm -rf /tmp/.buildx-cache
         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  build-2-7-0-curl-git-jq-sops-ssh-alpine-3-17:
+  build-2-7-0-curl-git-jq-sops-ssh:
     runs-on: ubuntu-latest
     env:
-      VARIANT: 2.7.0-curl-git-jq-sops-ssh-alpine-3.17
+      VARIANT: 2.7.0-curl-git-jq-sops-ssh
     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/2.7.0-curl-git-jq-sops-ssh-alpine-3.17
+        context: variants/2.7.0-curl-git-jq-sops-ssh
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: false
         tags: |
@@ -962,7 +962,7 @@ jobs:
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v3
       with:
-        context: variants/2.7.0-curl-git-jq-sops-ssh-alpine-3.17
+        context: variants/2.7.0-curl-git-jq-sops-ssh
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
@@ -975,7 +975,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v3
       with:
-        context: variants/2.7.0-curl-git-jq-sops-ssh-alpine-3.17
+        context: variants/2.7.0-curl-git-jq-sops-ssh
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
@@ -993,10 +993,10 @@ jobs:
         rm -rf /tmp/.buildx-cache
         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  build-2-7-0-libvirt-7-alpine-3-15:
+  build-2-7-0-libvirt-7:
     runs-on: ubuntu-latest
     env:
-      VARIANT: 2.7.0-libvirt-7-alpine-3.15
+      VARIANT: 2.7.0-libvirt-7
     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/2.7.0-libvirt-7-alpine-3.15
+        context: variants/2.7.0-libvirt-7
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: false
         tags: |
@@ -1082,7 +1082,7 @@ jobs:
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v3
       with:
-        context: variants/2.7.0-libvirt-7-alpine-3.15
+        context: variants/2.7.0-libvirt-7
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
@@ -1095,7 +1095,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v3
       with:
-        context: variants/2.7.0-libvirt-7-alpine-3.15
+        context: variants/2.7.0-libvirt-7
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
@@ -1113,10 +1113,10 @@ jobs:
         rm -rf /tmp/.buildx-cache
         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-  build-2-7-0-libvirt-6-alpine-3-13:
+  build-2-7-0-libvirt-6:
     runs-on: ubuntu-latest
     env:
-      VARIANT: 2.7.0-libvirt-6-alpine-3.13
+      VARIANT: 2.7.0-libvirt-6
     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/2.7.0-libvirt-6-alpine-3.13
+        context: variants/2.7.0-libvirt-6
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: false
         tags: |
@@ -1202,7 +1202,7 @@ jobs:
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v3
       with:
-        context: variants/2.7.0-libvirt-6-alpine-3.13
+        context: variants/2.7.0-libvirt-6
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
@@ -1215,7 +1215,7 @@ jobs:
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v3
       with:
-        context: variants/2.7.0-libvirt-6-alpine-3.13
+        context: variants/2.7.0-libvirt-6
         platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
@@ -1234,7 +1234,7 @@ jobs:
         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
   update-draft-release:
-    needs: [build-2-8-1-alpine-3-17, build-2-8-1-libvirt-8-alpine-3-17, build-2-8-1-curl-git-jq-sops-ssh-alpine-3-17, build-2-8-1-libvirt-7-alpine-3-15, build-2-8-1-libvirt-6-alpine-3-13, build-2-7-0-alpine-3-17, build-2-7-0-libvirt-8-alpine-3-17, build-2-7-0-curl-git-jq-sops-ssh-alpine-3-17, build-2-7-0-libvirt-7-alpine-3-15, build-2-7-0-libvirt-6-alpine-3-13]
+    needs: [build-2-8-1, build-2-8-1-libvirt-8, build-2-8-1-curl-git-jq-sops-ssh, build-2-8-1-libvirt-7, build-2-8-1-libvirt-6, build-2-7-0, build-2-7-0-libvirt-8, build-2-7-0-curl-git-jq-sops-ssh, build-2-7-0-libvirt-7, build-2-7-0-libvirt-6]
     if: github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
     steps:
@@ -1247,7 +1247,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   publish-draft-release:
-    needs: [build-2-8-1-alpine-3-17, build-2-8-1-libvirt-8-alpine-3-17, build-2-8-1-curl-git-jq-sops-ssh-alpine-3-17, build-2-8-1-libvirt-7-alpine-3-15, build-2-8-1-libvirt-6-alpine-3-13, build-2-7-0-alpine-3-17, build-2-7-0-libvirt-8-alpine-3-17, build-2-7-0-curl-git-jq-sops-ssh-alpine-3-17, build-2-7-0-libvirt-7-alpine-3-15, build-2-7-0-libvirt-6-alpine-3-13]
+    needs: [build-2-8-1, build-2-8-1-libvirt-8, build-2-8-1-curl-git-jq-sops-ssh, build-2-8-1-libvirt-7, build-2-8-1-libvirt-6, build-2-7-0, build-2-7-0-libvirt-8, build-2-7-0-curl-git-jq-sops-ssh, build-2-7-0-libvirt-7, build-2-7-0-libvirt-6]
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     steps:
@@ -1262,7 +1262,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   update-dockerhub-description:
-    needs: [build-2-8-1-alpine-3-17, build-2-8-1-libvirt-8-alpine-3-17, build-2-8-1-curl-git-jq-sops-ssh-alpine-3-17, build-2-8-1-libvirt-7-alpine-3-15, build-2-8-1-libvirt-6-alpine-3-13, build-2-7-0-alpine-3-17, build-2-7-0-libvirt-8-alpine-3-17, build-2-7-0-curl-git-jq-sops-ssh-alpine-3-17, build-2-7-0-libvirt-7-alpine-3-15, build-2-7-0-libvirt-6-alpine-3-13]
+    needs: [build-2-8-1, build-2-8-1-libvirt-8, build-2-8-1-curl-git-jq-sops-ssh, build-2-8-1-libvirt-7, build-2-8-1-libvirt-6, build-2-7-0, build-2-7-0-libvirt-8, build-2-7-0-curl-git-jq-sops-ssh, build-2-7-0-libvirt-7, build-2-7-0-libvirt-6]
     if: github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
     steps:
diff --git a/README.md b/README.md
index a409c6d..9573fc7 100644
--- a/README.md
+++ b/README.md
@@ -10,16 +10,16 @@ Dockerized [`webhook`](https://github.com/adnanh/webhook) with useful tools.
 
 | Tag | Dockerfile Build Context |
 |:-------:|:---------:|
-| `:2.8.1-alpine-3.17`, `:latest` | [View](variants/2.8.1-alpine-3.17) |
-| `:2.8.1-libvirt-8-alpine-3.17` | [View](variants/2.8.1-libvirt-8-alpine-3.17) |
-| `:2.8.1-curl-git-jq-sops-ssh-alpine-3.17` | [View](variants/2.8.1-curl-git-jq-sops-ssh-alpine-3.17) |
-| `:2.8.1-libvirt-7-alpine-3.15` | [View](variants/2.8.1-libvirt-7-alpine-3.15) |
-| `:2.8.1-libvirt-6-alpine-3.13` | [View](variants/2.8.1-libvirt-6-alpine-3.13) |
-| `:2.7.0-alpine-3.17` | [View](variants/2.7.0-alpine-3.17) |
-| `:2.7.0-libvirt-8-alpine-3.17` | [View](variants/2.7.0-libvirt-8-alpine-3.17) |
-| `:2.7.0-curl-git-jq-sops-ssh-alpine-3.17` | [View](variants/2.7.0-curl-git-jq-sops-ssh-alpine-3.17) |
-| `:2.7.0-libvirt-7-alpine-3.15` | [View](variants/2.7.0-libvirt-7-alpine-3.15) |
-| `:2.7.0-libvirt-6-alpine-3.13` | [View](variants/2.7.0-libvirt-6-alpine-3.13) |
+| `:2.8.1`, `:latest` | [View](variants/2.8.1) |
+| `:2.8.1-libvirt-8` | [View](variants/2.8.1-libvirt-8) |
+| `:2.8.1-curl-git-jq-sops-ssh` | [View](variants/2.8.1-curl-git-jq-sops-ssh) |
+| `:2.8.1-libvirt-7` | [View](variants/2.8.1-libvirt-7) |
+| `:2.8.1-libvirt-6` | [View](variants/2.8.1-libvirt-6) |
+| `:2.7.0` | [View](variants/2.7.0) |
+| `:2.7.0-libvirt-8` | [View](variants/2.7.0-libvirt-8) |
+| `:2.7.0-curl-git-jq-sops-ssh` | [View](variants/2.7.0-curl-git-jq-sops-ssh) |
+| `:2.7.0-libvirt-7` | [View](variants/2.7.0-libvirt-7) |
+| `:2.7.0-libvirt-6` | [View](variants/2.7.0-libvirt-6) |
 
 ## Usage
 
diff --git a/generate/definitions/VARIANTS.ps1 b/generate/definitions/VARIANTS.ps1
index fb4784f..c6bf940 100644
--- a/generate/definitions/VARIANTS.ps1
+++ b/generate/definitions/VARIANTS.ps1
@@ -55,12 +55,12 @@ $VARIANTS = @(
                     }
                     components = $subVariant['components']
                 }
-                # Docker image tag. E.g. '3.8-curl'
+                # Docker image tag. E.g. '2.8.1' or '2.8.1-libvirt-8'
                 tag = @(
                         $variant['package_version']
                         $subVariant['components'] | ? { $_ }
-                        $variant['distro']
-                        $variant['distro_version']
+                        # $variant['distro']
+                        # $variant['distro_version']
                 ) -join '-'
                 tag_as_latest = if ($variant['package_version'] -eq $local:VARIANTS_MATRIX[0]['package_version'] -and $variant['distro_version'] -eq $local:VARIANTS_MATRIX[0]['distro_version']  -and $subVariant['components'].Count -eq 0) { $true } else { $false }
             }
diff --git a/variants/2.7.0-curl-git-jq-sops-ssh/Dockerfile b/variants/2.7.0-curl-git-jq-sops-ssh/Dockerfile
new file mode 100644
index 0000000..32d0040
--- /dev/null
+++ b/variants/2.7.0-curl-git-jq-sops-ssh/Dockerfile
@@ -0,0 +1,34 @@
+FROM golang:1.20-alpine as builder
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
+
+RUN set -eux; \
+    apk add --no-cache git; \
+    git clone https://github.com/adnanh/webhook.git /src --branch 2.7.0; \
+    cd /src; \
+    go build -ldflags="-s -w" -o /usr/local/bin/webhook;
+
+FROM alpine:3.17
+COPY --from=builder /usr/local/bin/webhook /usr/local/bin/webhook
+RUN webhook --version
+
+RUN apk add --no-cache ca-certificates
+RUN apk add --no-cache curl
+RUN apk add --no-cache git
+RUN apk add --no-cache jq
+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
+RUN apk add --no-cache openssh-client
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+WORKDIR /config
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
+EXPOSE 9000
+CMD [ "-verbose", "-hooks=/config/hooks.yml", "-hotreload" ]
diff --git a/variants/2.7.0-curl-git-jq-sops-ssh/docker-entrypoint.sh b/variants/2.7.0-curl-git-jq-sops-ssh/docker-entrypoint.sh
new file mode 100644
index 0000000..ff38c47
--- /dev/null
+++ b/variants/2.7.0-curl-git-jq-sops-ssh/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- webhook "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/2.7.0-libvirt-6/Dockerfile b/variants/2.7.0-libvirt-6/Dockerfile
new file mode 100644
index 0000000..822ce9d
--- /dev/null
+++ b/variants/2.7.0-libvirt-6/Dockerfile
@@ -0,0 +1,24 @@
+FROM golang:1.20-alpine as builder
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
+
+RUN set -eux; \
+    apk add --no-cache git; \
+    git clone https://github.com/adnanh/webhook.git /src --branch 2.7.0; \
+    cd /src; \
+    go build -ldflags="-s -w" -o /usr/local/bin/webhook;
+
+FROM alpine:3.13
+COPY --from=builder /usr/local/bin/webhook /usr/local/bin/webhook
+RUN webhook --version
+
+RUN apk add --no-cache ca-certificates
+RUN apk add --no-cache libvirt-client
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+WORKDIR /config
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
+EXPOSE 9000
+CMD [ "-verbose", "-hooks=/config/hooks.yml", "-hotreload" ]
diff --git a/variants/2.7.0-libvirt-6/docker-entrypoint.sh b/variants/2.7.0-libvirt-6/docker-entrypoint.sh
new file mode 100644
index 0000000..ff38c47
--- /dev/null
+++ b/variants/2.7.0-libvirt-6/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- webhook "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/2.7.0-libvirt-7/Dockerfile b/variants/2.7.0-libvirt-7/Dockerfile
new file mode 100644
index 0000000..72a29f0
--- /dev/null
+++ b/variants/2.7.0-libvirt-7/Dockerfile
@@ -0,0 +1,24 @@
+FROM golang:1.20-alpine as builder
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
+
+RUN set -eux; \
+    apk add --no-cache git; \
+    git clone https://github.com/adnanh/webhook.git /src --branch 2.7.0; \
+    cd /src; \
+    go build -ldflags="-s -w" -o /usr/local/bin/webhook;
+
+FROM alpine:3.15
+COPY --from=builder /usr/local/bin/webhook /usr/local/bin/webhook
+RUN webhook --version
+
+RUN apk add --no-cache ca-certificates
+RUN apk add --no-cache libvirt-client
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+WORKDIR /config
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
+EXPOSE 9000
+CMD [ "-verbose", "-hooks=/config/hooks.yml", "-hotreload" ]
diff --git a/variants/2.7.0-libvirt-7/docker-entrypoint.sh b/variants/2.7.0-libvirt-7/docker-entrypoint.sh
new file mode 100644
index 0000000..ff38c47
--- /dev/null
+++ b/variants/2.7.0-libvirt-7/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- webhook "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/2.7.0-libvirt-8/Dockerfile b/variants/2.7.0-libvirt-8/Dockerfile
new file mode 100644
index 0000000..cb27c5b
--- /dev/null
+++ b/variants/2.7.0-libvirt-8/Dockerfile
@@ -0,0 +1,24 @@
+FROM golang:1.20-alpine as builder
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
+
+RUN set -eux; \
+    apk add --no-cache git; \
+    git clone https://github.com/adnanh/webhook.git /src --branch 2.7.0; \
+    cd /src; \
+    go build -ldflags="-s -w" -o /usr/local/bin/webhook;
+
+FROM alpine:3.17
+COPY --from=builder /usr/local/bin/webhook /usr/local/bin/webhook
+RUN webhook --version
+
+RUN apk add --no-cache ca-certificates
+RUN apk add --no-cache libvirt-client
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+WORKDIR /config
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
+EXPOSE 9000
+CMD [ "-verbose", "-hooks=/config/hooks.yml", "-hotreload" ]
diff --git a/variants/2.7.0-libvirt-8/docker-entrypoint.sh b/variants/2.7.0-libvirt-8/docker-entrypoint.sh
new file mode 100644
index 0000000..ff38c47
--- /dev/null
+++ b/variants/2.7.0-libvirt-8/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- webhook "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/2.7.0/Dockerfile b/variants/2.7.0/Dockerfile
new file mode 100644
index 0000000..16da6f8
--- /dev/null
+++ b/variants/2.7.0/Dockerfile
@@ -0,0 +1,23 @@
+FROM golang:1.20-alpine as builder
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
+
+RUN set -eux; \
+    apk add --no-cache git; \
+    git clone https://github.com/adnanh/webhook.git /src --branch 2.7.0; \
+    cd /src; \
+    go build -ldflags="-s -w" -o /usr/local/bin/webhook;
+
+FROM alpine:3.17
+COPY --from=builder /usr/local/bin/webhook /usr/local/bin/webhook
+RUN webhook --version
+
+RUN apk add --no-cache ca-certificates
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+WORKDIR /config
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
+EXPOSE 9000
+CMD [ "-verbose", "-hooks=/config/hooks.yml", "-hotreload" ]
diff --git a/variants/2.7.0/docker-entrypoint.sh b/variants/2.7.0/docker-entrypoint.sh
new file mode 100644
index 0000000..ff38c47
--- /dev/null
+++ b/variants/2.7.0/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- webhook "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/2.8.1-curl-git-jq-sops-ssh/Dockerfile b/variants/2.8.1-curl-git-jq-sops-ssh/Dockerfile
new file mode 100644
index 0000000..8f30c23
--- /dev/null
+++ b/variants/2.8.1-curl-git-jq-sops-ssh/Dockerfile
@@ -0,0 +1,34 @@
+FROM golang:1.20-alpine as builder
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
+
+RUN set -eux; \
+    apk add --no-cache git; \
+    git clone https://github.com/adnanh/webhook.git /src --branch 2.8.1; \
+    cd /src; \
+    go build -ldflags="-s -w" -o /usr/local/bin/webhook;
+
+FROM alpine:3.17
+COPY --from=builder /usr/local/bin/webhook /usr/local/bin/webhook
+RUN webhook --version
+
+RUN apk add --no-cache ca-certificates
+RUN apk add --no-cache curl
+RUN apk add --no-cache git
+RUN apk add --no-cache jq
+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
+RUN apk add --no-cache openssh-client
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+WORKDIR /config
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
+EXPOSE 9000
+CMD [ "-verbose", "-hooks=/config/hooks.yml", "-hotreload" ]
diff --git a/variants/2.8.1-curl-git-jq-sops-ssh/docker-entrypoint.sh b/variants/2.8.1-curl-git-jq-sops-ssh/docker-entrypoint.sh
new file mode 100644
index 0000000..ff38c47
--- /dev/null
+++ b/variants/2.8.1-curl-git-jq-sops-ssh/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- webhook "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/2.8.1-libvirt-6/Dockerfile b/variants/2.8.1-libvirt-6/Dockerfile
new file mode 100644
index 0000000..75e4f3a
--- /dev/null
+++ b/variants/2.8.1-libvirt-6/Dockerfile
@@ -0,0 +1,24 @@
+FROM golang:1.20-alpine as builder
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
+
+RUN set -eux; \
+    apk add --no-cache git; \
+    git clone https://github.com/adnanh/webhook.git /src --branch 2.8.1; \
+    cd /src; \
+    go build -ldflags="-s -w" -o /usr/local/bin/webhook;
+
+FROM alpine:3.13
+COPY --from=builder /usr/local/bin/webhook /usr/local/bin/webhook
+RUN webhook --version
+
+RUN apk add --no-cache ca-certificates
+RUN apk add --no-cache libvirt-client
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+WORKDIR /config
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
+EXPOSE 9000
+CMD [ "-verbose", "-hooks=/config/hooks.yml", "-hotreload" ]
diff --git a/variants/2.8.1-libvirt-6/docker-entrypoint.sh b/variants/2.8.1-libvirt-6/docker-entrypoint.sh
new file mode 100644
index 0000000..ff38c47
--- /dev/null
+++ b/variants/2.8.1-libvirt-6/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- webhook "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/2.8.1-libvirt-7/Dockerfile b/variants/2.8.1-libvirt-7/Dockerfile
new file mode 100644
index 0000000..1abf1ca
--- /dev/null
+++ b/variants/2.8.1-libvirt-7/Dockerfile
@@ -0,0 +1,24 @@
+FROM golang:1.20-alpine as builder
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
+
+RUN set -eux; \
+    apk add --no-cache git; \
+    git clone https://github.com/adnanh/webhook.git /src --branch 2.8.1; \
+    cd /src; \
+    go build -ldflags="-s -w" -o /usr/local/bin/webhook;
+
+FROM alpine:3.15
+COPY --from=builder /usr/local/bin/webhook /usr/local/bin/webhook
+RUN webhook --version
+
+RUN apk add --no-cache ca-certificates
+RUN apk add --no-cache libvirt-client
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+WORKDIR /config
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
+EXPOSE 9000
+CMD [ "-verbose", "-hooks=/config/hooks.yml", "-hotreload" ]
diff --git a/variants/2.8.1-libvirt-7/docker-entrypoint.sh b/variants/2.8.1-libvirt-7/docker-entrypoint.sh
new file mode 100644
index 0000000..ff38c47
--- /dev/null
+++ b/variants/2.8.1-libvirt-7/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- webhook "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/2.8.1-libvirt-8/Dockerfile b/variants/2.8.1-libvirt-8/Dockerfile
new file mode 100644
index 0000000..98f9628
--- /dev/null
+++ b/variants/2.8.1-libvirt-8/Dockerfile
@@ -0,0 +1,24 @@
+FROM golang:1.20-alpine as builder
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
+
+RUN set -eux; \
+    apk add --no-cache git; \
+    git clone https://github.com/adnanh/webhook.git /src --branch 2.8.1; \
+    cd /src; \
+    go build -ldflags="-s -w" -o /usr/local/bin/webhook;
+
+FROM alpine:3.17
+COPY --from=builder /usr/local/bin/webhook /usr/local/bin/webhook
+RUN webhook --version
+
+RUN apk add --no-cache ca-certificates
+RUN apk add --no-cache libvirt-client
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+WORKDIR /config
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
+EXPOSE 9000
+CMD [ "-verbose", "-hooks=/config/hooks.yml", "-hotreload" ]
diff --git a/variants/2.8.1-libvirt-8/docker-entrypoint.sh b/variants/2.8.1-libvirt-8/docker-entrypoint.sh
new file mode 100644
index 0000000..ff38c47
--- /dev/null
+++ b/variants/2.8.1-libvirt-8/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- webhook "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/2.8.1/Dockerfile b/variants/2.8.1/Dockerfile
new file mode 100644
index 0000000..bb17b74
--- /dev/null
+++ b/variants/2.8.1/Dockerfile
@@ -0,0 +1,23 @@
+FROM golang:1.20-alpine as builder
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
+
+RUN set -eux; \
+    apk add --no-cache git; \
+    git clone https://github.com/adnanh/webhook.git /src --branch 2.8.1; \
+    cd /src; \
+    go build -ldflags="-s -w" -o /usr/local/bin/webhook;
+
+FROM alpine:3.17
+COPY --from=builder /usr/local/bin/webhook /usr/local/bin/webhook
+RUN webhook --version
+
+RUN apk add --no-cache ca-certificates
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+WORKDIR /config
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
+EXPOSE 9000
+CMD [ "-verbose", "-hooks=/config/hooks.yml", "-hotreload" ]
diff --git a/variants/2.8.1/docker-entrypoint.sh b/variants/2.8.1/docker-entrypoint.sh
new file mode 100644
index 0000000..ff38c47
--- /dev/null
+++ b/variants/2.8.1/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- webhook "$@"
+fi
+
+exec "$@"
\ No newline at end of file