diff --git a/.github/workflows/ci-master-pr.yml b/.github/workflows/ci-master-pr.yml
index 1c5690d..3eabc88 100644
--- a/.github/workflows/ci-master-pr.yml
+++ b/.github/workflows/ci-master-pr.yml
@@ -147,7 +147,7 @@ jobs:
 
     # This step generates the docker tags
     - name: Prepare
-      id: prep-10-5-0-sops-ssh-alpine-edge
+      id: prep-10-5-0-sops-ssh-step-alpine-edge
       run: |
         set -e
 
@@ -160,7 +160,7 @@ jobs:
         # Generate docker image tags
         # E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
         # E.g. 'master-<variant>' and 'master-abc0123-<variant>'
-        VARIANT="10.5.0-sops-ssh-alpine-edge"
+        VARIANT="10.5.0-sops-ssh-step-alpine-edge"
         REF_VARIANT="${REF}-${VARIANT}"
         REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
 
@@ -170,45 +170,45 @@ jobs:
         echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
         echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
 
-    - name: 10.5.0-sops-ssh-alpine-edge - Build (PRs)
+    - name: 10.5.0-sops-ssh-step-alpine-edge - Build (PRs)
       # Run only on pull requests
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v5
       with:
-        context: variants/10.5.0-sops-ssh-alpine-edge
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/10.5.0-sops-ssh-step-alpine-edge
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: false
         tags: |
-          ${{ github.repository }}:${{ steps.prep-10-5-0-sops-ssh-alpine-edge.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-10-5-0-sops-ssh-alpine-edge.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-10-5-0-sops-ssh-step-alpine-edge.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-10-5-0-sops-ssh-step-alpine-edge.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 10.5.0-sops-ssh-alpine-edge - Build and push (master)
+    - name: 10.5.0-sops-ssh-step-alpine-edge - Build and push (master)
       # Run only on master
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v5
       with:
-        context: variants/10.5.0-sops-ssh-alpine-edge
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/10.5.0-sops-ssh-step-alpine-edge
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-10-5-0-sops-ssh-alpine-edge.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-10-5-0-sops-ssh-alpine-edge.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-10-5-0-sops-ssh-step-alpine-edge.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-10-5-0-sops-ssh-step-alpine-edge.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 10.5.0-sops-ssh-alpine-edge - Build and push (release)
+    - name: 10.5.0-sops-ssh-step-alpine-edge - Build and push (release)
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v5
       with:
-        context: variants/10.5.0-sops-ssh-alpine-edge
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/10.5.0-sops-ssh-step-alpine-edge
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-10-5-0-sops-ssh-alpine-edge.outputs.VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-10-5-0-sops-ssh-alpine-edge.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-10-5-0-sops-ssh-alpine-edge.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-10-5-0-sops-ssh-step-alpine-edge.outputs.VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-10-5-0-sops-ssh-step-alpine-edge.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-10-5-0-sops-ssh-step-alpine-edge.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
@@ -333,7 +333,7 @@ jobs:
 
     # This step generates the docker tags
     - name: Prepare
-      id: prep-9-5-1-sops-ssh-alpine-3-20
+      id: prep-9-5-1-sops-ssh-step-alpine-3-20
       run: |
         set -e
 
@@ -346,7 +346,7 @@ jobs:
         # Generate docker image tags
         # E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
         # E.g. 'master-<variant>' and 'master-abc0123-<variant>'
-        VARIANT="9.5.1-sops-ssh-alpine-3.20"
+        VARIANT="9.5.1-sops-ssh-step-alpine-3.20"
         REF_VARIANT="${REF}-${VARIANT}"
         REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
 
@@ -356,45 +356,45 @@ jobs:
         echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
         echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
 
-    - name: 9.5.1-sops-ssh-alpine-3.20 - Build (PRs)
+    - name: 9.5.1-sops-ssh-step-alpine-3.20 - Build (PRs)
       # Run only on pull requests
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v5
       with:
-        context: variants/9.5.1-sops-ssh-alpine-3.20
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/9.5.1-sops-ssh-step-alpine-3.20
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: false
         tags: |
-          ${{ github.repository }}:${{ steps.prep-9-5-1-sops-ssh-alpine-3-20.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-9-5-1-sops-ssh-alpine-3-20.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-9-5-1-sops-ssh-step-alpine-3-20.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-9-5-1-sops-ssh-step-alpine-3-20.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 9.5.1-sops-ssh-alpine-3.20 - Build and push (master)
+    - name: 9.5.1-sops-ssh-step-alpine-3.20 - Build and push (master)
       # Run only on master
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v5
       with:
-        context: variants/9.5.1-sops-ssh-alpine-3.20
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/9.5.1-sops-ssh-step-alpine-3.20
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-9-5-1-sops-ssh-alpine-3-20.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-9-5-1-sops-ssh-alpine-3-20.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-9-5-1-sops-ssh-step-alpine-3-20.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-9-5-1-sops-ssh-step-alpine-3-20.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 9.5.1-sops-ssh-alpine-3.20 - Build and push (release)
+    - name: 9.5.1-sops-ssh-step-alpine-3.20 - Build and push (release)
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v5
       with:
-        context: variants/9.5.1-sops-ssh-alpine-3.20
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/9.5.1-sops-ssh-step-alpine-3.20
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-9-5-1-sops-ssh-alpine-3-20.outputs.VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-9-5-1-sops-ssh-alpine-3-20.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-9-5-1-sops-ssh-alpine-3-20.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-9-5-1-sops-ssh-step-alpine-3-20.outputs.VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-9-5-1-sops-ssh-step-alpine-3-20.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-9-5-1-sops-ssh-step-alpine-3-20.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
@@ -519,7 +519,7 @@ jobs:
 
     # This step generates the docker tags
     - name: Prepare
-      id: prep-8-6-1-sops-ssh-alpine-3-19
+      id: prep-8-6-1-sops-ssh-step-alpine-3-19
       run: |
         set -e
 
@@ -532,7 +532,7 @@ jobs:
         # Generate docker image tags
         # E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
         # E.g. 'master-<variant>' and 'master-abc0123-<variant>'
-        VARIANT="8.6.1-sops-ssh-alpine-3.19"
+        VARIANT="8.6.1-sops-ssh-step-alpine-3.19"
         REF_VARIANT="${REF}-${VARIANT}"
         REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
 
@@ -542,45 +542,45 @@ jobs:
         echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
         echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
 
-    - name: 8.6.1-sops-ssh-alpine-3.19 - Build (PRs)
+    - name: 8.6.1-sops-ssh-step-alpine-3.19 - Build (PRs)
       # Run only on pull requests
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v5
       with:
-        context: variants/8.6.1-sops-ssh-alpine-3.19
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/8.6.1-sops-ssh-step-alpine-3.19
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: false
         tags: |
-          ${{ github.repository }}:${{ steps.prep-8-6-1-sops-ssh-alpine-3-19.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-8-6-1-sops-ssh-alpine-3-19.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-8-6-1-sops-ssh-step-alpine-3-19.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-8-6-1-sops-ssh-step-alpine-3-19.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 8.6.1-sops-ssh-alpine-3.19 - Build and push (master)
+    - name: 8.6.1-sops-ssh-step-alpine-3.19 - Build and push (master)
       # Run only on master
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v5
       with:
-        context: variants/8.6.1-sops-ssh-alpine-3.19
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/8.6.1-sops-ssh-step-alpine-3.19
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-8-6-1-sops-ssh-alpine-3-19.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-8-6-1-sops-ssh-alpine-3-19.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-8-6-1-sops-ssh-step-alpine-3-19.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-8-6-1-sops-ssh-step-alpine-3-19.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 8.6.1-sops-ssh-alpine-3.19 - Build and push (release)
+    - name: 8.6.1-sops-ssh-step-alpine-3.19 - Build and push (release)
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v5
       with:
-        context: variants/8.6.1-sops-ssh-alpine-3.19
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/8.6.1-sops-ssh-step-alpine-3.19
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-8-6-1-sops-ssh-alpine-3-19.outputs.VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-8-6-1-sops-ssh-alpine-3-19.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-8-6-1-sops-ssh-alpine-3-19.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-8-6-1-sops-ssh-step-alpine-3-19.outputs.VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-8-6-1-sops-ssh-step-alpine-3-19.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-8-6-1-sops-ssh-step-alpine-3-19.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
@@ -705,7 +705,7 @@ jobs:
 
     # This step generates the docker tags
     - name: Prepare
-      id: prep-7-5-0-sops-ssh-alpine-3-18
+      id: prep-7-5-0-sops-ssh-step-alpine-3-18
       run: |
         set -e
 
@@ -718,7 +718,7 @@ jobs:
         # Generate docker image tags
         # E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
         # E.g. 'master-<variant>' and 'master-abc0123-<variant>'
-        VARIANT="7.5.0-sops-ssh-alpine-3.18"
+        VARIANT="7.5.0-sops-ssh-step-alpine-3.18"
         REF_VARIANT="${REF}-${VARIANT}"
         REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
 
@@ -728,45 +728,45 @@ jobs:
         echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
         echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
 
-    - name: 7.5.0-sops-ssh-alpine-3.18 - Build (PRs)
+    - name: 7.5.0-sops-ssh-step-alpine-3.18 - Build (PRs)
       # Run only on pull requests
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v5
       with:
-        context: variants/7.5.0-sops-ssh-alpine-3.18
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/7.5.0-sops-ssh-step-alpine-3.18
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: false
         tags: |
-          ${{ github.repository }}:${{ steps.prep-7-5-0-sops-ssh-alpine-3-18.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-7-5-0-sops-ssh-alpine-3-18.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-7-5-0-sops-ssh-step-alpine-3-18.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-7-5-0-sops-ssh-step-alpine-3-18.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 7.5.0-sops-ssh-alpine-3.18 - Build and push (master)
+    - name: 7.5.0-sops-ssh-step-alpine-3.18 - Build and push (master)
       # Run only on master
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v5
       with:
-        context: variants/7.5.0-sops-ssh-alpine-3.18
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/7.5.0-sops-ssh-step-alpine-3.18
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-7-5-0-sops-ssh-alpine-3-18.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-7-5-0-sops-ssh-alpine-3-18.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-7-5-0-sops-ssh-step-alpine-3-18.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-7-5-0-sops-ssh-step-alpine-3-18.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 7.5.0-sops-ssh-alpine-3.18 - Build and push (release)
+    - name: 7.5.0-sops-ssh-step-alpine-3.18 - Build and push (release)
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v5
       with:
-        context: variants/7.5.0-sops-ssh-alpine-3.18
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/7.5.0-sops-ssh-step-alpine-3.18
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-7-5-0-sops-ssh-alpine-3-18.outputs.VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-7-5-0-sops-ssh-alpine-3-18.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-7-5-0-sops-ssh-alpine-3-18.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-7-5-0-sops-ssh-step-alpine-3-18.outputs.VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-7-5-0-sops-ssh-step-alpine-3-18.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-7-5-0-sops-ssh-step-alpine-3-18.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
@@ -891,7 +891,7 @@ jobs:
 
     # This step generates the docker tags
     - name: Prepare
-      id: prep-6-6-0-sops-ssh-alpine-3-17
+      id: prep-6-6-0-sops-ssh-step-alpine-3-17
       run: |
         set -e
 
@@ -904,7 +904,7 @@ jobs:
         # Generate docker image tags
         # E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
         # E.g. 'master-<variant>' and 'master-abc0123-<variant>'
-        VARIANT="6.6.0-sops-ssh-alpine-3.17"
+        VARIANT="6.6.0-sops-ssh-step-alpine-3.17"
         REF_VARIANT="${REF}-${VARIANT}"
         REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
 
@@ -914,45 +914,45 @@ jobs:
         echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
         echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
 
-    - name: 6.6.0-sops-ssh-alpine-3.17 - Build (PRs)
+    - name: 6.6.0-sops-ssh-step-alpine-3.17 - Build (PRs)
       # Run only on pull requests
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v5
       with:
-        context: variants/6.6.0-sops-ssh-alpine-3.17
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/6.6.0-sops-ssh-step-alpine-3.17
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: false
         tags: |
-          ${{ github.repository }}:${{ steps.prep-6-6-0-sops-ssh-alpine-3-17.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-6-6-0-sops-ssh-alpine-3-17.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-6-6-0-sops-ssh-step-alpine-3-17.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-6-6-0-sops-ssh-step-alpine-3-17.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 6.6.0-sops-ssh-alpine-3.17 - Build and push (master)
+    - name: 6.6.0-sops-ssh-step-alpine-3.17 - Build and push (master)
       # Run only on master
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v5
       with:
-        context: variants/6.6.0-sops-ssh-alpine-3.17
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/6.6.0-sops-ssh-step-alpine-3.17
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-6-6-0-sops-ssh-alpine-3-17.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-6-6-0-sops-ssh-alpine-3-17.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-6-6-0-sops-ssh-step-alpine-3-17.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-6-6-0-sops-ssh-step-alpine-3-17.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 6.6.0-sops-ssh-alpine-3.17 - Build and push (release)
+    - name: 6.6.0-sops-ssh-step-alpine-3.17 - Build and push (release)
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v5
       with:
-        context: variants/6.6.0-sops-ssh-alpine-3.17
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/6.6.0-sops-ssh-step-alpine-3.17
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-6-6-0-sops-ssh-alpine-3-17.outputs.VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-6-6-0-sops-ssh-alpine-3-17.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-6-6-0-sops-ssh-alpine-3-17.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-6-6-0-sops-ssh-step-alpine-3-17.outputs.VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-6-6-0-sops-ssh-step-alpine-3-17.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-6-6-0-sops-ssh-step-alpine-3-17.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
@@ -1077,7 +1077,7 @@ jobs:
 
     # This step generates the docker tags
     - name: Prepare
-      id: prep-5-8-0-sops-ssh-alpine-3-16
+      id: prep-5-8-0-sops-ssh-step-alpine-3-16
       run: |
         set -e
 
@@ -1090,7 +1090,7 @@ jobs:
         # Generate docker image tags
         # E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
         # E.g. 'master-<variant>' and 'master-abc0123-<variant>'
-        VARIANT="5.8.0-sops-ssh-alpine-3.16"
+        VARIANT="5.8.0-sops-ssh-step-alpine-3.16"
         REF_VARIANT="${REF}-${VARIANT}"
         REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
 
@@ -1100,45 +1100,45 @@ jobs:
         echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
         echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
 
-    - name: 5.8.0-sops-ssh-alpine-3.16 - Build (PRs)
+    - name: 5.8.0-sops-ssh-step-alpine-3.16 - Build (PRs)
       # Run only on pull requests
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v5
       with:
-        context: variants/5.8.0-sops-ssh-alpine-3.16
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/5.8.0-sops-ssh-step-alpine-3.16
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: false
         tags: |
-          ${{ github.repository }}:${{ steps.prep-5-8-0-sops-ssh-alpine-3-16.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-5-8-0-sops-ssh-alpine-3-16.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-5-8-0-sops-ssh-step-alpine-3-16.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-5-8-0-sops-ssh-step-alpine-3-16.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 5.8.0-sops-ssh-alpine-3.16 - Build and push (master)
+    - name: 5.8.0-sops-ssh-step-alpine-3.16 - Build and push (master)
       # Run only on master
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v5
       with:
-        context: variants/5.8.0-sops-ssh-alpine-3.16
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/5.8.0-sops-ssh-step-alpine-3.16
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-5-8-0-sops-ssh-alpine-3-16.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-5-8-0-sops-ssh-alpine-3-16.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-5-8-0-sops-ssh-step-alpine-3-16.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-5-8-0-sops-ssh-step-alpine-3-16.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 5.8.0-sops-ssh-alpine-3.16 - Build and push (release)
+    - name: 5.8.0-sops-ssh-step-alpine-3.16 - Build and push (release)
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v5
       with:
-        context: variants/5.8.0-sops-ssh-alpine-3.16
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/5.8.0-sops-ssh-step-alpine-3.16
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-5-8-0-sops-ssh-alpine-3-16.outputs.VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-5-8-0-sops-ssh-alpine-3-16.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-5-8-0-sops-ssh-alpine-3-16.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-5-8-0-sops-ssh-step-alpine-3-16.outputs.VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-5-8-0-sops-ssh-step-alpine-3-16.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-5-8-0-sops-ssh-step-alpine-3-16.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
@@ -1263,7 +1263,7 @@ jobs:
 
     # This step generates the docker tags
     - name: Prepare
-      id: prep-4-8-0-sops-ssh-alpine-3-15
+      id: prep-4-8-0-sops-ssh-step-alpine-3-15
       run: |
         set -e
 
@@ -1276,7 +1276,7 @@ jobs:
         # Generate docker image tags
         # E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
         # E.g. 'master-<variant>' and 'master-abc0123-<variant>'
-        VARIANT="4.8.0-sops-ssh-alpine-3.15"
+        VARIANT="4.8.0-sops-ssh-step-alpine-3.15"
         REF_VARIANT="${REF}-${VARIANT}"
         REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
 
@@ -1286,45 +1286,45 @@ jobs:
         echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
         echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
 
-    - name: 4.8.0-sops-ssh-alpine-3.15 - Build (PRs)
+    - name: 4.8.0-sops-ssh-step-alpine-3.15 - Build (PRs)
       # Run only on pull requests
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v5
       with:
-        context: variants/4.8.0-sops-ssh-alpine-3.15
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/4.8.0-sops-ssh-step-alpine-3.15
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: false
         tags: |
-          ${{ github.repository }}:${{ steps.prep-4-8-0-sops-ssh-alpine-3-15.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-4-8-0-sops-ssh-alpine-3-15.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-4-8-0-sops-ssh-step-alpine-3-15.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-4-8-0-sops-ssh-step-alpine-3-15.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 4.8.0-sops-ssh-alpine-3.15 - Build and push (master)
+    - name: 4.8.0-sops-ssh-step-alpine-3.15 - Build and push (master)
       # Run only on master
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v5
       with:
-        context: variants/4.8.0-sops-ssh-alpine-3.15
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/4.8.0-sops-ssh-step-alpine-3.15
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-4-8-0-sops-ssh-alpine-3-15.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-4-8-0-sops-ssh-alpine-3-15.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-4-8-0-sops-ssh-step-alpine-3-15.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-4-8-0-sops-ssh-step-alpine-3-15.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 4.8.0-sops-ssh-alpine-3.15 - Build and push (release)
+    - name: 4.8.0-sops-ssh-step-alpine-3.15 - Build and push (release)
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v5
       with:
-        context: variants/4.8.0-sops-ssh-alpine-3.15
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/4.8.0-sops-ssh-step-alpine-3.15
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-4-8-0-sops-ssh-alpine-3-15.outputs.VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-4-8-0-sops-ssh-alpine-3-15.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-4-8-0-sops-ssh-alpine-3-15.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-4-8-0-sops-ssh-step-alpine-3-15.outputs.VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-4-8-0-sops-ssh-step-alpine-3-15.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-4-8-0-sops-ssh-step-alpine-3-15.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
@@ -1449,7 +1449,7 @@ jobs:
 
     # This step generates the docker tags
     - name: Prepare
-      id: prep-2-10-7-sops-ssh-alpine-3-13
+      id: prep-2-10-7-sops-ssh-step-alpine-3-13
       run: |
         set -e
 
@@ -1462,7 +1462,7 @@ jobs:
         # Generate docker image tags
         # E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
         # E.g. 'master-<variant>' and 'master-abc0123-<variant>'
-        VARIANT="2.10.7-sops-ssh-alpine-3.13"
+        VARIANT="2.10.7-sops-ssh-step-alpine-3.13"
         REF_VARIANT="${REF}-${VARIANT}"
         REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
 
@@ -1472,45 +1472,45 @@ jobs:
         echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
         echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
 
-    - name: 2.10.7-sops-ssh-alpine-3.13 - Build (PRs)
+    - name: 2.10.7-sops-ssh-step-alpine-3.13 - Build (PRs)
       # Run only on pull requests
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v5
       with:
-        context: variants/2.10.7-sops-ssh-alpine-3.13
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/2.10.7-sops-ssh-step-alpine-3.13
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: false
         tags: |
-          ${{ github.repository }}:${{ steps.prep-2-10-7-sops-ssh-alpine-3-13.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-10-7-sops-ssh-alpine-3-13.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-10-7-sops-ssh-step-alpine-3-13.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-10-7-sops-ssh-step-alpine-3-13.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 2.10.7-sops-ssh-alpine-3.13 - Build and push (master)
+    - name: 2.10.7-sops-ssh-step-alpine-3.13 - Build and push (master)
       # Run only on master
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v5
       with:
-        context: variants/2.10.7-sops-ssh-alpine-3.13
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/2.10.7-sops-ssh-step-alpine-3.13
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-2-10-7-sops-ssh-alpine-3-13.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-10-7-sops-ssh-alpine-3-13.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-10-7-sops-ssh-step-alpine-3-13.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-10-7-sops-ssh-step-alpine-3-13.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 2.10.7-sops-ssh-alpine-3.13 - Build and push (release)
+    - name: 2.10.7-sops-ssh-step-alpine-3.13 - Build and push (release)
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v5
       with:
-        context: variants/2.10.7-sops-ssh-alpine-3.13
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/2.10.7-sops-ssh-step-alpine-3.13
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-2-10-7-sops-ssh-alpine-3-13.outputs.VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-10-7-sops-ssh-alpine-3-13.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-10-7-sops-ssh-alpine-3-13.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-10-7-sops-ssh-step-alpine-3-13.outputs.VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-10-7-sops-ssh-step-alpine-3-13.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-10-7-sops-ssh-step-alpine-3-13.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
@@ -1635,7 +1635,7 @@ jobs:
 
     # This step generates the docker tags
     - name: Prepare
-      id: prep-2-9-18-sops-ssh-alpine-3-11
+      id: prep-2-9-18-sops-ssh-step-alpine-3-11
       run: |
         set -e
 
@@ -1648,7 +1648,7 @@ jobs:
         # Generate docker image tags
         # E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
         # E.g. 'master-<variant>' and 'master-abc0123-<variant>'
-        VARIANT="2.9.18-sops-ssh-alpine-3.11"
+        VARIANT="2.9.18-sops-ssh-step-alpine-3.11"
         REF_VARIANT="${REF}-${VARIANT}"
         REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
 
@@ -1658,45 +1658,45 @@ jobs:
         echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
         echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
 
-    - name: 2.9.18-sops-ssh-alpine-3.11 - Build (PRs)
+    - name: 2.9.18-sops-ssh-step-alpine-3.11 - Build (PRs)
       # Run only on pull requests
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v5
       with:
-        context: variants/2.9.18-sops-ssh-alpine-3.11
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/2.9.18-sops-ssh-step-alpine-3.11
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: false
         tags: |
-          ${{ github.repository }}:${{ steps.prep-2-9-18-sops-ssh-alpine-3-11.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-9-18-sops-ssh-alpine-3-11.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-9-18-sops-ssh-step-alpine-3-11.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-9-18-sops-ssh-step-alpine-3-11.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 2.9.18-sops-ssh-alpine-3.11 - Build and push (master)
+    - name: 2.9.18-sops-ssh-step-alpine-3.11 - Build and push (master)
       # Run only on master
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v5
       with:
-        context: variants/2.9.18-sops-ssh-alpine-3.11
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/2.9.18-sops-ssh-step-alpine-3.11
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-2-9-18-sops-ssh-alpine-3-11.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-9-18-sops-ssh-alpine-3-11.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-9-18-sops-ssh-step-alpine-3-11.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-9-18-sops-ssh-step-alpine-3-11.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 2.9.18-sops-ssh-alpine-3.11 - Build and push (release)
+    - name: 2.9.18-sops-ssh-step-alpine-3.11 - Build and push (release)
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v5
       with:
-        context: variants/2.9.18-sops-ssh-alpine-3.11
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/2.9.18-sops-ssh-step-alpine-3.11
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-2-9-18-sops-ssh-alpine-3-11.outputs.VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-9-18-sops-ssh-alpine-3-11.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-9-18-sops-ssh-alpine-3-11.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-9-18-sops-ssh-step-alpine-3-11.outputs.VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-9-18-sops-ssh-step-alpine-3-11.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-9-18-sops-ssh-step-alpine-3-11.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
@@ -1821,7 +1821,7 @@ jobs:
 
     # This step generates the docker tags
     - name: Prepare
-      id: prep-2-8-19-sops-ssh-alpine-3-10
+      id: prep-2-8-19-sops-ssh-step-alpine-3-10
       run: |
         set -e
 
@@ -1834,7 +1834,7 @@ jobs:
         # Generate docker image tags
         # E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
         # E.g. 'master-<variant>' and 'master-abc0123-<variant>'
-        VARIANT="2.8.19-sops-ssh-alpine-3.10"
+        VARIANT="2.8.19-sops-ssh-step-alpine-3.10"
         REF_VARIANT="${REF}-${VARIANT}"
         REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
 
@@ -1844,45 +1844,45 @@ jobs:
         echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
         echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
 
-    - name: 2.8.19-sops-ssh-alpine-3.10 - Build (PRs)
+    - name: 2.8.19-sops-ssh-step-alpine-3.10 - Build (PRs)
       # Run only on pull requests
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v5
       with:
-        context: variants/2.8.19-sops-ssh-alpine-3.10
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/2.8.19-sops-ssh-step-alpine-3.10
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: false
         tags: |
-          ${{ github.repository }}:${{ steps.prep-2-8-19-sops-ssh-alpine-3-10.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-8-19-sops-ssh-alpine-3-10.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-8-19-sops-ssh-step-alpine-3-10.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-8-19-sops-ssh-step-alpine-3-10.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 2.8.19-sops-ssh-alpine-3.10 - Build and push (master)
+    - name: 2.8.19-sops-ssh-step-alpine-3.10 - Build and push (master)
       # Run only on master
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v5
       with:
-        context: variants/2.8.19-sops-ssh-alpine-3.10
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/2.8.19-sops-ssh-step-alpine-3.10
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-2-8-19-sops-ssh-alpine-3-10.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-8-19-sops-ssh-alpine-3-10.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-8-19-sops-ssh-step-alpine-3-10.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-8-19-sops-ssh-step-alpine-3-10.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 2.8.19-sops-ssh-alpine-3.10 - Build and push (release)
+    - name: 2.8.19-sops-ssh-step-alpine-3.10 - Build and push (release)
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v5
       with:
-        context: variants/2.8.19-sops-ssh-alpine-3.10
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/2.8.19-sops-ssh-step-alpine-3.10
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-2-8-19-sops-ssh-alpine-3-10.outputs.VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-8-19-sops-ssh-alpine-3-10.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-8-19-sops-ssh-alpine-3-10.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-8-19-sops-ssh-step-alpine-3-10.outputs.VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-8-19-sops-ssh-step-alpine-3-10.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-8-19-sops-ssh-step-alpine-3-10.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
@@ -2007,7 +2007,7 @@ jobs:
 
     # This step generates the docker tags
     - name: Prepare
-      id: prep-2-7-17-sops-ssh-alpine-3-9
+      id: prep-2-7-17-sops-ssh-step-alpine-3-9
       run: |
         set -e
 
@@ -2020,7 +2020,7 @@ jobs:
         # Generate docker image tags
         # E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
         # E.g. 'master-<variant>' and 'master-abc0123-<variant>'
-        VARIANT="2.7.17-sops-ssh-alpine-3.9"
+        VARIANT="2.7.17-sops-ssh-step-alpine-3.9"
         REF_VARIANT="${REF}-${VARIANT}"
         REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
 
@@ -2030,45 +2030,45 @@ jobs:
         echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
         echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
 
-    - name: 2.7.17-sops-ssh-alpine-3.9 - Build (PRs)
+    - name: 2.7.17-sops-ssh-step-alpine-3.9 - Build (PRs)
       # Run only on pull requests
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v5
       with:
-        context: variants/2.7.17-sops-ssh-alpine-3.9
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/2.7.17-sops-ssh-step-alpine-3.9
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: false
         tags: |
-          ${{ github.repository }}:${{ steps.prep-2-7-17-sops-ssh-alpine-3-9.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-7-17-sops-ssh-alpine-3-9.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-7-17-sops-ssh-step-alpine-3-9.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-7-17-sops-ssh-step-alpine-3-9.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 2.7.17-sops-ssh-alpine-3.9 - Build and push (master)
+    - name: 2.7.17-sops-ssh-step-alpine-3.9 - Build and push (master)
       # Run only on master
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v5
       with:
-        context: variants/2.7.17-sops-ssh-alpine-3.9
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/2.7.17-sops-ssh-step-alpine-3.9
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-2-7-17-sops-ssh-alpine-3-9.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-7-17-sops-ssh-alpine-3-9.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-7-17-sops-ssh-step-alpine-3-9.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-7-17-sops-ssh-step-alpine-3-9.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 2.7.17-sops-ssh-alpine-3.9 - Build and push (release)
+    - name: 2.7.17-sops-ssh-step-alpine-3.9 - Build and push (release)
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v5
       with:
-        context: variants/2.7.17-sops-ssh-alpine-3.9
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/2.7.17-sops-ssh-step-alpine-3.9
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-2-7-17-sops-ssh-alpine-3-9.outputs.VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-7-17-sops-ssh-alpine-3-9.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-7-17-sops-ssh-alpine-3-9.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-7-17-sops-ssh-step-alpine-3-9.outputs.VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-7-17-sops-ssh-step-alpine-3-9.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-7-17-sops-ssh-step-alpine-3-9.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
@@ -2193,7 +2193,7 @@ jobs:
 
     # This step generates the docker tags
     - name: Prepare
-      id: prep-2-6-20-sops-ssh-alpine-3-8
+      id: prep-2-6-20-sops-ssh-step-alpine-3-8
       run: |
         set -e
 
@@ -2206,7 +2206,7 @@ jobs:
         # Generate docker image tags
         # E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
         # E.g. 'master-<variant>' and 'master-abc0123-<variant>'
-        VARIANT="2.6.20-sops-ssh-alpine-3.8"
+        VARIANT="2.6.20-sops-ssh-step-alpine-3.8"
         REF_VARIANT="${REF}-${VARIANT}"
         REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
 
@@ -2216,45 +2216,45 @@ jobs:
         echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
         echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
 
-    - name: 2.6.20-sops-ssh-alpine-3.8 - Build (PRs)
+    - name: 2.6.20-sops-ssh-step-alpine-3.8 - Build (PRs)
       # Run only on pull requests
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v5
       with:
-        context: variants/2.6.20-sops-ssh-alpine-3.8
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/2.6.20-sops-ssh-step-alpine-3.8
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: false
         tags: |
-          ${{ github.repository }}:${{ steps.prep-2-6-20-sops-ssh-alpine-3-8.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-6-20-sops-ssh-alpine-3-8.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-6-20-sops-ssh-step-alpine-3-8.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-6-20-sops-ssh-step-alpine-3-8.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 2.6.20-sops-ssh-alpine-3.8 - Build and push (master)
+    - name: 2.6.20-sops-ssh-step-alpine-3.8 - Build and push (master)
       # Run only on master
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v5
       with:
-        context: variants/2.6.20-sops-ssh-alpine-3.8
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/2.6.20-sops-ssh-step-alpine-3.8
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-2-6-20-sops-ssh-alpine-3-8.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-6-20-sops-ssh-alpine-3-8.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-6-20-sops-ssh-step-alpine-3-8.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-6-20-sops-ssh-step-alpine-3-8.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 2.6.20-sops-ssh-alpine-3.8 - Build and push (release)
+    - name: 2.6.20-sops-ssh-step-alpine-3.8 - Build and push (release)
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v5
       with:
-        context: variants/2.6.20-sops-ssh-alpine-3.8
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/2.6.20-sops-ssh-step-alpine-3.8
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-2-6-20-sops-ssh-alpine-3-8.outputs.VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-6-20-sops-ssh-alpine-3-8.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-6-20-sops-ssh-alpine-3-8.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-6-20-sops-ssh-step-alpine-3-8.outputs.VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-6-20-sops-ssh-step-alpine-3-8.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-6-20-sops-ssh-step-alpine-3-8.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
@@ -2379,7 +2379,7 @@ jobs:
 
     # This step generates the docker tags
     - name: Prepare
-      id: prep-2-4-6-0-sops-ssh-alpine-3-7
+      id: prep-2-4-6-0-sops-ssh-step-alpine-3-7
       run: |
         set -e
 
@@ -2392,7 +2392,7 @@ jobs:
         # Generate docker image tags
         # E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
         # E.g. 'master-<variant>' and 'master-abc0123-<variant>'
-        VARIANT="2.4.6.0-sops-ssh-alpine-3.7"
+        VARIANT="2.4.6.0-sops-ssh-step-alpine-3.7"
         REF_VARIANT="${REF}-${VARIANT}"
         REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
 
@@ -2402,45 +2402,45 @@ jobs:
         echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
         echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
 
-    - name: 2.4.6.0-sops-ssh-alpine-3.7 - Build (PRs)
+    - name: 2.4.6.0-sops-ssh-step-alpine-3.7 - Build (PRs)
       # Run only on pull requests
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v5
       with:
-        context: variants/2.4.6.0-sops-ssh-alpine-3.7
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/2.4.6.0-sops-ssh-step-alpine-3.7
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: false
         tags: |
-          ${{ github.repository }}:${{ steps.prep-2-4-6-0-sops-ssh-alpine-3-7.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-4-6-0-sops-ssh-alpine-3-7.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-4-6-0-sops-ssh-step-alpine-3-7.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-4-6-0-sops-ssh-step-alpine-3-7.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 2.4.6.0-sops-ssh-alpine-3.7 - Build and push (master)
+    - name: 2.4.6.0-sops-ssh-step-alpine-3.7 - Build and push (master)
       # Run only on master
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v5
       with:
-        context: variants/2.4.6.0-sops-ssh-alpine-3.7
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/2.4.6.0-sops-ssh-step-alpine-3.7
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-2-4-6-0-sops-ssh-alpine-3-7.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-4-6-0-sops-ssh-alpine-3-7.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-4-6-0-sops-ssh-step-alpine-3-7.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-4-6-0-sops-ssh-step-alpine-3-7.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 2.4.6.0-sops-ssh-alpine-3.7 - Build and push (release)
+    - name: 2.4.6.0-sops-ssh-step-alpine-3.7 - Build and push (release)
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v5
       with:
-        context: variants/2.4.6.0-sops-ssh-alpine-3.7
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/2.4.6.0-sops-ssh-step-alpine-3.7
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-2-4-6-0-sops-ssh-alpine-3-7.outputs.VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-4-6-0-sops-ssh-alpine-3-7.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-4-6-0-sops-ssh-alpine-3-7.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-4-6-0-sops-ssh-step-alpine-3-7.outputs.VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-4-6-0-sops-ssh-step-alpine-3-7.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-4-6-0-sops-ssh-step-alpine-3-7.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
@@ -2565,7 +2565,7 @@ jobs:
 
     # This step generates the docker tags
     - name: Prepare
-      id: prep-2-3-0-0-sops-ssh-alpine-3-6
+      id: prep-2-3-0-0-sops-ssh-step-alpine-3-6
       run: |
         set -e
 
@@ -2578,7 +2578,7 @@ jobs:
         # Generate docker image tags
         # E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
         # E.g. 'master-<variant>' and 'master-abc0123-<variant>'
-        VARIANT="2.3.0.0-sops-ssh-alpine-3.6"
+        VARIANT="2.3.0.0-sops-ssh-step-alpine-3.6"
         REF_VARIANT="${REF}-${VARIANT}"
         REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
 
@@ -2588,45 +2588,45 @@ jobs:
         echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
         echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
 
-    - name: 2.3.0.0-sops-ssh-alpine-3.6 - Build (PRs)
+    - name: 2.3.0.0-sops-ssh-step-alpine-3.6 - Build (PRs)
       # Run only on pull requests
       if: github.event_name == 'pull_request'
       uses: docker/build-push-action@v5
       with:
-        context: variants/2.3.0.0-sops-ssh-alpine-3.6
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/2.3.0.0-sops-ssh-step-alpine-3.6
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: false
         tags: |
-          ${{ github.repository }}:${{ steps.prep-2-3-0-0-sops-ssh-alpine-3-6.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-3-0-0-sops-ssh-alpine-3-6.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-3-0-0-sops-ssh-step-alpine-3-6.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-3-0-0-sops-ssh-step-alpine-3-6.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 2.3.0.0-sops-ssh-alpine-3.6 - Build and push (master)
+    - name: 2.3.0.0-sops-ssh-step-alpine-3.6 - Build and push (master)
       # Run only on master
       if: github.ref == 'refs/heads/master'
       uses: docker/build-push-action@v5
       with:
-        context: variants/2.3.0.0-sops-ssh-alpine-3.6
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/2.3.0.0-sops-ssh-step-alpine-3.6
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-2-3-0-0-sops-ssh-alpine-3-6.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-3-0-0-sops-ssh-alpine-3-6.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-3-0-0-sops-ssh-step-alpine-3-6.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-3-0-0-sops-ssh-step-alpine-3-6.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
-    - name: 2.3.0.0-sops-ssh-alpine-3.6 - Build and push (release)
+    - name: 2.3.0.0-sops-ssh-step-alpine-3.6 - Build and push (release)
       if: startsWith(github.ref, 'refs/tags/')
       uses: docker/build-push-action@v5
       with:
-        context: variants/2.3.0.0-sops-ssh-alpine-3.6
-        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        context: variants/2.3.0.0-sops-ssh-step-alpine-3.6
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
         push: true
         tags: |
-          ${{ github.repository }}:${{ steps.prep-2-3-0-0-sops-ssh-alpine-3-6.outputs.VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-3-0-0-sops-ssh-alpine-3-6.outputs.REF_VARIANT }}
-          ${{ github.repository }}:${{ steps.prep-2-3-0-0-sops-ssh-alpine-3-6.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-3-0-0-sops-ssh-step-alpine-3-6.outputs.VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-3-0-0-sops-ssh-step-alpine-3-6.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-2-3-0-0-sops-ssh-step-alpine-3-6.outputs.REF_SHA_VARIANT }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
diff --git a/README.md b/README.md
index 2d7f80e..a6f0971 100644
--- a/README.md
+++ b/README.md
@@ -11,33 +11,33 @@ Dockerized `ansible` with useful tools.
 | Tag | Dockerfile Build Context |
 |:-------:|:---------:|
 | `:10.5.0-alpine-edge`, `:latest` | [View](variants/10.5.0-alpine-edge) |
-| `:10.5.0-sops-ssh-alpine-edge` | [View](variants/10.5.0-sops-ssh-alpine-edge) |
+| `:10.5.0-sops-ssh-step-alpine-edge` | [View](variants/10.5.0-sops-ssh-step-alpine-edge) |
 | `:9.5.1-alpine-3.20` | [View](variants/9.5.1-alpine-3.20) |
-| `:9.5.1-sops-ssh-alpine-3.20` | [View](variants/9.5.1-sops-ssh-alpine-3.20) |
+| `:9.5.1-sops-ssh-step-alpine-3.20` | [View](variants/9.5.1-sops-ssh-step-alpine-3.20) |
 | `:8.6.1-alpine-3.19` | [View](variants/8.6.1-alpine-3.19) |
-| `:8.6.1-sops-ssh-alpine-3.19` | [View](variants/8.6.1-sops-ssh-alpine-3.19) |
+| `:8.6.1-sops-ssh-step-alpine-3.19` | [View](variants/8.6.1-sops-ssh-step-alpine-3.19) |
 | `:7.5.0-alpine-3.18` | [View](variants/7.5.0-alpine-3.18) |
-| `:7.5.0-sops-ssh-alpine-3.18` | [View](variants/7.5.0-sops-ssh-alpine-3.18) |
+| `:7.5.0-sops-ssh-step-alpine-3.18` | [View](variants/7.5.0-sops-ssh-step-alpine-3.18) |
 | `:6.6.0-alpine-3.17` | [View](variants/6.6.0-alpine-3.17) |
-| `:6.6.0-sops-ssh-alpine-3.17` | [View](variants/6.6.0-sops-ssh-alpine-3.17) |
+| `:6.6.0-sops-ssh-step-alpine-3.17` | [View](variants/6.6.0-sops-ssh-step-alpine-3.17) |
 | `:5.8.0-alpine-3.16` | [View](variants/5.8.0-alpine-3.16) |
-| `:5.8.0-sops-ssh-alpine-3.16` | [View](variants/5.8.0-sops-ssh-alpine-3.16) |
+| `:5.8.0-sops-ssh-step-alpine-3.16` | [View](variants/5.8.0-sops-ssh-step-alpine-3.16) |
 | `:4.8.0-alpine-3.15` | [View](variants/4.8.0-alpine-3.15) |
-| `:4.8.0-sops-ssh-alpine-3.15` | [View](variants/4.8.0-sops-ssh-alpine-3.15) |
+| `:4.8.0-sops-ssh-step-alpine-3.15` | [View](variants/4.8.0-sops-ssh-step-alpine-3.15) |
 | `:2.10.7-alpine-3.13` | [View](variants/2.10.7-alpine-3.13) |
-| `:2.10.7-sops-ssh-alpine-3.13` | [View](variants/2.10.7-sops-ssh-alpine-3.13) |
+| `:2.10.7-sops-ssh-step-alpine-3.13` | [View](variants/2.10.7-sops-ssh-step-alpine-3.13) |
 | `:2.9.18-alpine-3.11` | [View](variants/2.9.18-alpine-3.11) |
-| `:2.9.18-sops-ssh-alpine-3.11` | [View](variants/2.9.18-sops-ssh-alpine-3.11) |
+| `:2.9.18-sops-ssh-step-alpine-3.11` | [View](variants/2.9.18-sops-ssh-step-alpine-3.11) |
 | `:2.8.19-alpine-3.10` | [View](variants/2.8.19-alpine-3.10) |
-| `:2.8.19-sops-ssh-alpine-3.10` | [View](variants/2.8.19-sops-ssh-alpine-3.10) |
+| `:2.8.19-sops-ssh-step-alpine-3.10` | [View](variants/2.8.19-sops-ssh-step-alpine-3.10) |
 | `:2.7.17-alpine-3.9` | [View](variants/2.7.17-alpine-3.9) |
-| `:2.7.17-sops-ssh-alpine-3.9` | [View](variants/2.7.17-sops-ssh-alpine-3.9) |
+| `:2.7.17-sops-ssh-step-alpine-3.9` | [View](variants/2.7.17-sops-ssh-step-alpine-3.9) |
 | `:2.6.20-alpine-3.8` | [View](variants/2.6.20-alpine-3.8) |
-| `:2.6.20-sops-ssh-alpine-3.8` | [View](variants/2.6.20-sops-ssh-alpine-3.8) |
+| `:2.6.20-sops-ssh-step-alpine-3.8` | [View](variants/2.6.20-sops-ssh-step-alpine-3.8) |
 | `:2.4.6.0-alpine-3.7` | [View](variants/2.4.6.0-alpine-3.7) |
-| `:2.4.6.0-sops-ssh-alpine-3.7` | [View](variants/2.4.6.0-sops-ssh-alpine-3.7) |
+| `:2.4.6.0-sops-ssh-step-alpine-3.7` | [View](variants/2.4.6.0-sops-ssh-step-alpine-3.7) |
 | `:2.3.0.0-alpine-3.6` | [View](variants/2.3.0.0-alpine-3.6) |
-| `:2.3.0.0-sops-ssh-alpine-3.6` | [View](variants/2.3.0.0-sops-ssh-alpine-3.6) |
+| `:2.3.0.0-sops-ssh-step-alpine-3.6` | [View](variants/2.3.0.0-sops-ssh-step-alpine-3.6) |
 
 ## Development
 
diff --git a/generate/definitions/VARIANTS.ps1 b/generate/definitions/VARIANTS.ps1
index 9a5f3f4..287ad1a 100755
--- a/generate/definitions/VARIANTS.ps1
+++ b/generate/definitions/VARIANTS.ps1
@@ -10,7 +10,7 @@ $local:VARIANTS_MATRIX = @(
         distro_version = 'edge'
         subvariants = @(
             @{ components = @() }
-            @{ components = @( 'sops', 'ssh' ) }
+            @{ components = @( 'sops', 'ssh', 'step' ) }
         )
     }
     @{
@@ -20,7 +20,7 @@ $local:VARIANTS_MATRIX = @(
         distro_version = '3.20'
         subvariants = @(
             @{ components = @() }
-            @{ components = @( 'sops', 'ssh' ) }
+            @{ components = @( 'sops', 'ssh', 'step' ) }
         )
     }
     @{
@@ -30,7 +30,7 @@ $local:VARIANTS_MATRIX = @(
         distro_version = '3.19'
         subvariants = @(
             @{ components = @() }
-            @{ components = @( 'sops', 'ssh' ) }
+            @{ components = @( 'sops', 'ssh', 'step' ) }
         )
     }
     @{
@@ -40,7 +40,7 @@ $local:VARIANTS_MATRIX = @(
         distro_version = '3.18'
         subvariants = @(
             @{ components = @() }
-            @{ components = @( 'sops', 'ssh' ) }
+            @{ components = @( 'sops', 'ssh', 'step' ) }
         )
     }
     @{
@@ -50,7 +50,7 @@ $local:VARIANTS_MATRIX = @(
         distro_version = '3.17'
         subvariants = @(
             @{ components = @() }
-            @{ components = @( 'sops', 'ssh' ) }
+            @{ components = @( 'sops', 'ssh', 'step' ) }
         )
     }
     @{
@@ -60,7 +60,7 @@ $local:VARIANTS_MATRIX = @(
         distro_version = '3.16'
         subvariants = @(
             @{ components = @() }
-            @{ components = @( 'sops', 'ssh' ) }
+            @{ components = @( 'sops', 'ssh', 'step' ) }
         )
     }
     @{
@@ -70,7 +70,7 @@ $local:VARIANTS_MATRIX = @(
         distro_version = '3.15'
         subvariants = @(
             @{ components = @() }
-            @{ components = @( 'sops', 'ssh' ) }
+            @{ components = @( 'sops', 'ssh', 'step' ) }
         )
     }
     @{
@@ -80,7 +80,7 @@ $local:VARIANTS_MATRIX = @(
         distro_version = '3.13'
         subvariants = @(
             @{ components = $null }
-            @{ components = @( 'sops', 'ssh' ) }
+            @{ components = @( 'sops', 'ssh', 'step' ) }
         )
     }
     @{
@@ -90,7 +90,7 @@ $local:VARIANTS_MATRIX = @(
         distro_version = '3.11'
         subvariants = @(
             @{ components = $null }
-            @{ components = @( 'sops', 'ssh' ) }
+            @{ components = @( 'sops', 'ssh', 'step' ) }
         )
     }
     @{
@@ -100,7 +100,7 @@ $local:VARIANTS_MATRIX = @(
         distro_version = '3.10'
         subvariants = @(
             @{ components = $null }
-            @{ components = @( 'sops', 'ssh' ) }
+            @{ components = @( 'sops', 'ssh', 'step' ) }
         )
     }
     @{
@@ -110,7 +110,7 @@ $local:VARIANTS_MATRIX = @(
         distro_version = '3.9'
         subvariants = @(
             @{ components = @() }
-            @{ components = @( 'sops', 'ssh' ) }
+            @{ components = @( 'sops', 'ssh', 'step' ) }
         )
     }
     @{
@@ -120,7 +120,7 @@ $local:VARIANTS_MATRIX = @(
         distro_version = '3.8'
         subvariants = @(
             @{ components = @() }
-            @{ components = @( 'sops', 'ssh' ) }
+            @{ components = @( 'sops', 'ssh', 'step' ) }
         )
     }
     @{
@@ -130,7 +130,7 @@ $local:VARIANTS_MATRIX = @(
         distro_version = '3.7'
         subvariants = @(
             @{ components = @() }
-            @{ components = @( 'sops', 'ssh' ) }
+            @{ components = @( 'sops', 'ssh', 'step' ) }
         )
     }
     @{
@@ -140,7 +140,7 @@ $local:VARIANTS_MATRIX = @(
         distro_version = '3.6'
         subvariants = @(
             @{ components = @() }
-            @{ components = @( 'sops', 'ssh' ) }
+            @{ components = @( 'sops', 'ssh', 'step' ) }
         )
     }
 )
@@ -158,7 +158,11 @@ $VARIANTS = @(
                         if ($variant['distro'] -eq 'alpine' -and $variant['distro_version'] -in @('3.3', '3.4', '3.5')) {
                             'linux/amd64'
                         }else {
-                            'linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x'
+                            if ($subVariant['components'] -contains 'step') {
+                                'linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64'
+                            }else {
+                                'linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x'
+                            }
                         }
                     }
                     components = $subVariant['components']
diff --git a/generate/functions/Checksums.ps1 b/generate/functions/Checksums.ps1
new file mode 100644
index 0000000..7a089c2
--- /dev/null
+++ b/generate/functions/Checksums.ps1
@@ -0,0 +1,25 @@
+# Global cache for checksums
+function Set-Checksums($k, $url) {
+    $global:CHECKSUMS = if (Get-Variable -Scope Global -Name CHECKSUMS -ErrorAction SilentlyContinue) { $global:CHECKSUMS } else { @{} }
+    $global:CHECKSUMS[$k] = if ($global:CHECKSUMS[$k]) { $global:CHECKSUMS[$k] } else {
+        $r = Invoke-WebRequest $url
+        $c = if ($r.headers['Content-Type'] -eq 'text/plain') { $r.Content } else { [System.Text.Encoding]::UTF8.GetString($r.Content) }
+        $c -split "`n"
+    }
+}
+function Get-ChecksumsFile ($k, $keyword) {
+    $file = $global:CHECKSUMS[$k] | ? { $_ -match $keyword } | % { $_ -split "\s" } | Select-Object -Last 1 | % { $_.TrimStart('*') }
+    if ($file) {
+        $file
+    }else {
+        "No file among $k checksums matching regex: $keyword" | Write-Warning
+    }
+}
+function Get-ChecksumsSha ($k, $keyword) {
+    $sha = $global:CHECKSUMS[$k] | ? { $_ -match $keyword } | % { $_ -split "\s" } | Select-Object -First 1
+    if ($sha) {
+        $sha
+    }else {
+        "No sha among $k checksums matching regex: $keyword" | Write-Warning
+    }
+}
diff --git a/generate/functions/Generate-DownloadBinary.ps1 b/generate/functions/Generate-DownloadBinary.ps1
new file mode 100644
index 0000000..1e6f4c9
--- /dev/null
+++ b/generate/functions/Generate-DownloadBinary.ps1
@@ -0,0 +1,174 @@
+# Version 0.1.0
+function Generate-DownloadBinary ($o) {
+    Set-StrictMode -Version Latest
+
+    $checksumsKey = "$( $o['binary'] )-$( $o['version'] )"
+    $files = [ordered]@{}
+    if ($o['checksumsUrl']) {
+        Set-Checksums $checksumsKey  $o['checksumsUrl']
+    }else {
+        $release = Invoke-RestMethod "https://api.github.com/repos/$( $o['repository'] )/releases/tags/$( $o['version'] )"
+        $releaseAssetsFiles = $release.assets | ? { $_.name -match [regex]::Escape($o['binary']) -and $_.name -notmatch '\.sha\d+$' }
+        foreach ($f in $releaseAssetsFiles ) {
+            $sha = & {
+                $shaF = $release.assets | ? { $_.name -eq "$( $f.name ).sha256" -or $_ -eq "$( $f.name ).sha512" }
+                $r = Invoke-WebRequest $shaF.browser_download_url
+                $c = if ($r.headers['Content-Type'] -eq 'text/plain') { $r.Content } else { [System.Text.Encoding]::UTF8.GetString($r.Content) }
+                $c = $c.Trim() -replace '^([a-fA-F0-9]+) .+', '$1' # The checksum is the first column
+                $c
+            }
+            $files[$f.name] = $sha
+        }
+    }
+    $shellVariable = "$( $o['binary'].ToUpper() -replace '[^A-Za-z0-9_]', '_' )_VERSION"
+@"
+# Install $( $o['binary'] )
+RUN set -eux; \
+    $shellVariable=$( $o['version'] ); \
+    case "`$( uname -m )" in \
+
+"@
+
+    $o['architectures'] = if ($o.Contains('architectures')) { $o['architectures'] } else { 'linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/riscv64,linux/s390x' }
+    foreach ($a in ($o['architectures'] -split ',') ) {
+        $split = $a -split '/'
+        $os = $split[0]  # E.g. 'linux'
+        $arch = $split[1]  # E.g. 'amd64'
+        $archv = if ($split.Count -gt 2) { $split[2] } else { '' } # E.g. 'v6' or ''
+        switch ($a) {
+            "$os/386" {
+                $hardware = 'x86'
+                $regex = "$os[-_](i?$arch|x86(_64)?)[-_]?$archv$( [regex]::Escape($o['archiveformat']) )$|(i?$arch|x86(_64)?)[-_]?$archv.*?[-_]$os.*?$( [regex]::Escape($o['archiveformat']) )$"
+            }
+            "$os/amd64" {
+                $hardware = 'x86_64'
+                $regex = "$os[-_]($arch|x86(_64)?)[-_]?$archv$( [regex]::Escape($o['archiveformat']) )$|($arch|x86(_64)?)[-_]?$archv.*?[-_]$os.*?$( [regex]::Escape($o['archiveformat']) )$"
+            }
+            "$os/arm/v6" {
+                $hardware = 'armhf'
+                $regex = "$os[-_]($arch|arm)[-_]?($archv)?$( [regex]::Escape($o['archiveformat']) )$|($arch|arm)[-_]?($archv)?.*?[-_]$os.*?$( [regex]::Escape($o['archiveformat']) )$"
+            }
+            "$os/arm/v7" {
+                $hardware = 'armv7l'
+                $regex = "$os[-_]($arch|arm)[-_]?($archv)?$( [regex]::Escape($o['archiveformat']) )$|($arch|arm)[-_]?($archv)?.*?[-_]$os.*?$( [regex]::Escape($o['archiveformat']) )$"
+            }
+            "$os/arm64" {
+                $hardware = 'aarch64'
+                $regex = "$os[-_]($arch|aarch64)[-_]?$archv$( [regex]::Escape($o['archiveformat']) )$|($arch|aarch64)[-_]?$archv.*?[-_]$os.*?$( [regex]::Escape($o['archiveformat']) )$"
+            }
+            "$os/ppc64le" {
+                $hardware = 'ppc64le'
+                $regex = "$os[-_]$arch[-_]?$archv$( [regex]::Escape($o['archiveformat']) )$|$arch[-_]?$archv.*?[-_]$os.*?$( [regex]::Escape($o['archiveformat']) )$"
+            }
+            "$os/riscv64" {
+                $hardware = 'riscv64'
+                $regex = "$os[-_]$arch[-_]?$archv$( [regex]::Escape($o['archiveformat']) )$|$arch[-_]?$archv.*?[-_]$os.*?$( [regex]::Escape($o['archiveformat']) )$"
+            }
+            "$os/s390x" {
+                $hardware = 's390x'
+                $regex = "$os[-_]$arch[-_]?$archv$( [regex]::Escape($o['archiveformat']) )$|$arch[-_]?$archv.*?[-_]$os.*?$( [regex]::Escape($o['archiveformat']) )$"
+            }
+            default {
+                throw "Unsupported architecture: $a"
+            }
+        }
+
+        $file = $sha = $url = ''
+        if ($o['checksumsUrl']) {
+            $file = Get-ChecksumsFile $checksumsKey $regex
+            $sha = Get-ChecksumsSha $checksumsKey $regex
+            $url = Split-Path $o['checksumsUrl'] -Parent
+        } else {
+            $file = $files.Keys | ? { $_ -match $regex } | Select-Object -First 1
+            if ($file) {
+                $url = "https://github.com/$( $o['repository'] )/releases/download/$( $o['version'] )"
+                $sha = $files[$file]
+            }else {
+                throw "No file matched regex: $regex"
+            }
+        }
+        if ($file -and $sha) {
+@"
+        '$hardware') \
+            URL="$url/$file"; \
+            SHA256=$sha; \
+            ;; \
+
+"@
+        }
+    }
+
+@"
+        *) \
+            echo "Architecture not supported"; \
+            exit 1; \
+            ;; \
+    esac; \
+
+"@
+
+@"
+    FILE=$( $o['binary'] )$( $o['archiveformat'] ); \
+    wget -q "`$URL" -O "`$FILE"; \
+    echo "`$SHA256  `$FILE" | sha256sum -c -; \
+
+"@
+
+    if ($o['archiveformat'] -match '\.tar\.gz|\.tgz') {
+        if ($o['archivefiles'].Count -gt 0) {
+@"
+    tar -xvf "`$FILE" --no-same-owner --no-same-permissions -- $( $o['archivefiles'] -join ' ' ); \
+    rm -f "`$FILE"; \
+
+"@
+        }else {
+@"
+    tar -xvf "`$FILE" --no-same-owner --no-same-permissions; \
+    rm -f "`$FILE"; \
+
+"@
+        }
+    }elseif ($o['archiveformat'] -match '\.bz2') {
+@"
+    bzip2 -d "`$FILE"; \
+
+"@
+    }elseif ($o['archiveformat'] -match '\.gz') {
+@"
+    gzip -d "`$FILE"; \
+
+"@
+    }elseif ($o['archiveformat'] -match '\.zip') {
+@"
+    unzip "`$FILE" $( $o['binary'] ); \
+
+"@
+    }
+
+    $destination = if ($o.Contains('destination')) { $o['destination'] } else { "/usr/local/bin/$( $o['binary'] )" }
+    $destinationDir = Split-Path $destination -Parent
+@"
+    mkdir -pv $destinationDir; \
+    BIN=`$( find . -type f -name "$( $o['binary'] )" | head -n1 ); \
+    mv -v "`$BIN" $destination; \
+    chmod +x $destination; \
+    $( $o['testCommand'] ); \
+
+"@
+
+    if ($o.Contains('archivefiles')) {
+        if ($license = $o['archivefiles'] | ? { $_ -match 'LICENSE' }) {
+@"
+    mkdir -p /licenses; \
+    mv -v $license /licenses/$license; \
+
+"@
+        }
+    }
+
+@"
+    :
+
+
+"@
+}
diff --git a/generate/templates/Dockerfile.ps1 b/generate/templates/Dockerfile.ps1
index 1955edf..bdb2069 100644
--- a/generate/templates/Dockerfile.ps1
+++ b/generate/templates/Dockerfile.ps1
@@ -44,6 +44,19 @@ RUN apk add --no-cache openssh-client
 "@
 }
 
+if ( $VARIANT['_metadata']['components'] -contains 'step' ) {
+    $STEP_VERSION = "v0.27.5"
+    Generate-DownloadBinary @{
+        binary = 'step'
+        version = $STEP_VERSION
+        archiveformat = '.tar.gz'
+        archivefiles = @()
+        checksumsUrl = "https://github.com/smallstep/cli/releases/download/$STEP_VERSION/checksums.txt"
+        destination = '/usr/local/bin/step'
+        testCommand = 'step version'
+    }
+}
+
 @"
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x docker-entrypoint.sh
diff --git a/variants/10.5.0-sops-ssh-step-alpine-edge/Dockerfile b/variants/10.5.0-sops-ssh-step-alpine-edge/Dockerfile
new file mode 100644
index 0000000..4305046
--- /dev/null
+++ b/variants/10.5.0-sops-ssh-step-alpine-edge/Dockerfile
@@ -0,0 +1,71 @@
+FROM alpine:edge
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
+
+# Install ansible
+RUN set -eux; \
+    apk add --no-cache ansible~=10.5.0; \
+    ansible --version
+
+RUN apk add --no-cache ca-certificates
+
+RUN set -eux; \
+    wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.3/sops-v3.7.3.linux > /usr/local/bin/sops; \
+    chmod +x /usr/local/bin/sops; \
+    sha256sum /usr/local/bin/sops | grep '^53aec65e45f62a769ff24b7e5384f0c82d62668dd96ed56685f649da114b4dbb '; \
+    sops --version
+
+RUN apk add --no-cache gnupg
+
+RUN apk add --no-cache openssh-client
+
+# Install step
+RUN set -eux; \
+    STEP_VERSION=v0.27.5; \
+    case "$( uname -m )" in \
+        'x86') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_386.tar.gz"; \
+            SHA256=a4cb4cb893424780ffb4c8fee4ecf5b92e93c4c9b7ebd242631c272197dff2e0; \
+            ;; \
+        'x86_64') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_amd64.tar.gz"; \
+            SHA256=2099be3d0cc7bc3559d771393378aa6c3e96908a929dccd570c8352e2440ad77; \
+            ;; \
+        'armhf') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_armv6.tar.gz"; \
+            SHA256=97e8827c0ccfbf7779878f9a54b6fa72ba9aca4aead380d7a1cd85bebb04f365; \
+            ;; \
+        'armv7l') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_armv7.tar.gz"; \
+            SHA256=c0adeba5d5c2bcf70edf5f626d48c3201c204fe671591c12005cf5b4d6e90349; \
+            ;; \
+        'aarch64') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_arm64.tar.gz"; \
+            SHA256=f7f52300c3550bfb5a21a5fb2610dced6c3d24a008bec7e968987e7bc67f7ff4; \
+            ;; \
+        'ppc64le') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_ppc64le.tar.gz"; \
+            SHA256=0ac0e38b2f0c3b3a075a00adba43e1a0bca1549d0e13293bd3205416cd993974; \
+            ;; \
+        *) \
+            echo "Architecture not supported"; \
+            exit 1; \
+            ;; \
+    esac; \
+    FILE=step.tar.gz; \
+    wget -q "$URL" -O "$FILE"; \
+    echo "$SHA256  $FILE" | sha256sum -c -; \
+    tar -xvf "$FILE" --no-same-owner --no-same-permissions; \
+    rm -f "$FILE"; \
+    mkdir -pv /usr/local/bin; \
+    BIN=$( find . -type f -name "step" | head -n1 ); \
+    mv -v "$BIN" /usr/local/bin/step; \
+    chmod +x /usr/local/bin/step; \
+    step version; \
+    :
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/10.5.0-sops-ssh-step-alpine-edge/docker-entrypoint.sh b/variants/10.5.0-sops-ssh-step-alpine-edge/docker-entrypoint.sh
new file mode 100644
index 0000000..8229e62
--- /dev/null
+++ b/variants/10.5.0-sops-ssh-step-alpine-edge/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- ansible "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/2.10.7-sops-ssh-step-alpine-3.13/Dockerfile b/variants/2.10.7-sops-ssh-step-alpine-3.13/Dockerfile
new file mode 100644
index 0000000..5473ffe
--- /dev/null
+++ b/variants/2.10.7-sops-ssh-step-alpine-3.13/Dockerfile
@@ -0,0 +1,71 @@
+FROM alpine:3.13
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
+
+# Install ansible
+RUN set -eux; \
+    apk add --no-cache ansible~=2.10.7; \
+    ansible --version
+
+RUN apk add --no-cache ca-certificates
+
+RUN set -eux; \
+    wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.3/sops-v3.7.3.linux > /usr/local/bin/sops; \
+    chmod +x /usr/local/bin/sops; \
+    sha256sum /usr/local/bin/sops | grep '^53aec65e45f62a769ff24b7e5384f0c82d62668dd96ed56685f649da114b4dbb '; \
+    sops --version
+
+RUN apk add --no-cache gnupg
+
+RUN apk add --no-cache openssh-client
+
+# Install step
+RUN set -eux; \
+    STEP_VERSION=v0.27.5; \
+    case "$( uname -m )" in \
+        'x86') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_386.tar.gz"; \
+            SHA256=a4cb4cb893424780ffb4c8fee4ecf5b92e93c4c9b7ebd242631c272197dff2e0; \
+            ;; \
+        'x86_64') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_amd64.tar.gz"; \
+            SHA256=2099be3d0cc7bc3559d771393378aa6c3e96908a929dccd570c8352e2440ad77; \
+            ;; \
+        'armhf') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_armv6.tar.gz"; \
+            SHA256=97e8827c0ccfbf7779878f9a54b6fa72ba9aca4aead380d7a1cd85bebb04f365; \
+            ;; \
+        'armv7l') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_armv7.tar.gz"; \
+            SHA256=c0adeba5d5c2bcf70edf5f626d48c3201c204fe671591c12005cf5b4d6e90349; \
+            ;; \
+        'aarch64') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_arm64.tar.gz"; \
+            SHA256=f7f52300c3550bfb5a21a5fb2610dced6c3d24a008bec7e968987e7bc67f7ff4; \
+            ;; \
+        'ppc64le') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_ppc64le.tar.gz"; \
+            SHA256=0ac0e38b2f0c3b3a075a00adba43e1a0bca1549d0e13293bd3205416cd993974; \
+            ;; \
+        *) \
+            echo "Architecture not supported"; \
+            exit 1; \
+            ;; \
+    esac; \
+    FILE=step.tar.gz; \
+    wget -q "$URL" -O "$FILE"; \
+    echo "$SHA256  $FILE" | sha256sum -c -; \
+    tar -xvf "$FILE" --no-same-owner --no-same-permissions; \
+    rm -f "$FILE"; \
+    mkdir -pv /usr/local/bin; \
+    BIN=$( find . -type f -name "step" | head -n1 ); \
+    mv -v "$BIN" /usr/local/bin/step; \
+    chmod +x /usr/local/bin/step; \
+    step version; \
+    :
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/2.10.7-sops-ssh-step-alpine-3.13/docker-entrypoint.sh b/variants/2.10.7-sops-ssh-step-alpine-3.13/docker-entrypoint.sh
new file mode 100644
index 0000000..8229e62
--- /dev/null
+++ b/variants/2.10.7-sops-ssh-step-alpine-3.13/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- ansible "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/2.3.0.0-sops-ssh-step-alpine-3.6/Dockerfile b/variants/2.3.0.0-sops-ssh-step-alpine-3.6/Dockerfile
new file mode 100644
index 0000000..aff25a3
--- /dev/null
+++ b/variants/2.3.0.0-sops-ssh-step-alpine-3.6/Dockerfile
@@ -0,0 +1,74 @@
+FROM alpine:3.6
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
+
+# Install ansible
+RUN set -eux; \
+    apk add --no-cache ansible>=2.3.0.0; \
+    ansible --version
+
+RUN apk add --no-cache ca-certificates
+
+# Fix wget not working in alpine:3.6. https://github.com/gliderlabs/docker-alpine/issues/423
+RUN apk add --no-cache libressl
+
+RUN set -eux; \
+    wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.3/sops-v3.7.3.linux > /usr/local/bin/sops; \
+    chmod +x /usr/local/bin/sops; \
+    sha256sum /usr/local/bin/sops | grep '^53aec65e45f62a769ff24b7e5384f0c82d62668dd96ed56685f649da114b4dbb '; \
+    sops --version
+
+RUN apk add --no-cache gnupg
+
+RUN apk add --no-cache openssh-client
+
+# Install step
+RUN set -eux; \
+    STEP_VERSION=v0.27.5; \
+    case "$( uname -m )" in \
+        'x86') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_386.tar.gz"; \
+            SHA256=a4cb4cb893424780ffb4c8fee4ecf5b92e93c4c9b7ebd242631c272197dff2e0; \
+            ;; \
+        'x86_64') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_amd64.tar.gz"; \
+            SHA256=2099be3d0cc7bc3559d771393378aa6c3e96908a929dccd570c8352e2440ad77; \
+            ;; \
+        'armhf') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_armv6.tar.gz"; \
+            SHA256=97e8827c0ccfbf7779878f9a54b6fa72ba9aca4aead380d7a1cd85bebb04f365; \
+            ;; \
+        'armv7l') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_armv7.tar.gz"; \
+            SHA256=c0adeba5d5c2bcf70edf5f626d48c3201c204fe671591c12005cf5b4d6e90349; \
+            ;; \
+        'aarch64') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_arm64.tar.gz"; \
+            SHA256=f7f52300c3550bfb5a21a5fb2610dced6c3d24a008bec7e968987e7bc67f7ff4; \
+            ;; \
+        'ppc64le') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_ppc64le.tar.gz"; \
+            SHA256=0ac0e38b2f0c3b3a075a00adba43e1a0bca1549d0e13293bd3205416cd993974; \
+            ;; \
+        *) \
+            echo "Architecture not supported"; \
+            exit 1; \
+            ;; \
+    esac; \
+    FILE=step.tar.gz; \
+    wget -q "$URL" -O "$FILE"; \
+    echo "$SHA256  $FILE" | sha256sum -c -; \
+    tar -xvf "$FILE" --no-same-owner --no-same-permissions; \
+    rm -f "$FILE"; \
+    mkdir -pv /usr/local/bin; \
+    BIN=$( find . -type f -name "step" | head -n1 ); \
+    mv -v "$BIN" /usr/local/bin/step; \
+    chmod +x /usr/local/bin/step; \
+    step version; \
+    :
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/2.3.0.0-sops-ssh-step-alpine-3.6/docker-entrypoint.sh b/variants/2.3.0.0-sops-ssh-step-alpine-3.6/docker-entrypoint.sh
new file mode 100644
index 0000000..8229e62
--- /dev/null
+++ b/variants/2.3.0.0-sops-ssh-step-alpine-3.6/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- ansible "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/2.4.6.0-sops-ssh-step-alpine-3.7/Dockerfile b/variants/2.4.6.0-sops-ssh-step-alpine-3.7/Dockerfile
new file mode 100644
index 0000000..49d6d3d
--- /dev/null
+++ b/variants/2.4.6.0-sops-ssh-step-alpine-3.7/Dockerfile
@@ -0,0 +1,71 @@
+FROM alpine:3.7
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
+
+# Install ansible
+RUN set -eux; \
+    apk add --no-cache ansible~=2.4.6.0; \
+    ansible --version
+
+RUN apk add --no-cache ca-certificates
+
+RUN set -eux; \
+    wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.3/sops-v3.7.3.linux > /usr/local/bin/sops; \
+    chmod +x /usr/local/bin/sops; \
+    sha256sum /usr/local/bin/sops | grep '^53aec65e45f62a769ff24b7e5384f0c82d62668dd96ed56685f649da114b4dbb '; \
+    sops --version
+
+RUN apk add --no-cache gnupg
+
+RUN apk add --no-cache openssh-client
+
+# Install step
+RUN set -eux; \
+    STEP_VERSION=v0.27.5; \
+    case "$( uname -m )" in \
+        'x86') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_386.tar.gz"; \
+            SHA256=a4cb4cb893424780ffb4c8fee4ecf5b92e93c4c9b7ebd242631c272197dff2e0; \
+            ;; \
+        'x86_64') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_amd64.tar.gz"; \
+            SHA256=2099be3d0cc7bc3559d771393378aa6c3e96908a929dccd570c8352e2440ad77; \
+            ;; \
+        'armhf') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_armv6.tar.gz"; \
+            SHA256=97e8827c0ccfbf7779878f9a54b6fa72ba9aca4aead380d7a1cd85bebb04f365; \
+            ;; \
+        'armv7l') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_armv7.tar.gz"; \
+            SHA256=c0adeba5d5c2bcf70edf5f626d48c3201c204fe671591c12005cf5b4d6e90349; \
+            ;; \
+        'aarch64') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_arm64.tar.gz"; \
+            SHA256=f7f52300c3550bfb5a21a5fb2610dced6c3d24a008bec7e968987e7bc67f7ff4; \
+            ;; \
+        'ppc64le') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_ppc64le.tar.gz"; \
+            SHA256=0ac0e38b2f0c3b3a075a00adba43e1a0bca1549d0e13293bd3205416cd993974; \
+            ;; \
+        *) \
+            echo "Architecture not supported"; \
+            exit 1; \
+            ;; \
+    esac; \
+    FILE=step.tar.gz; \
+    wget -q "$URL" -O "$FILE"; \
+    echo "$SHA256  $FILE" | sha256sum -c -; \
+    tar -xvf "$FILE" --no-same-owner --no-same-permissions; \
+    rm -f "$FILE"; \
+    mkdir -pv /usr/local/bin; \
+    BIN=$( find . -type f -name "step" | head -n1 ); \
+    mv -v "$BIN" /usr/local/bin/step; \
+    chmod +x /usr/local/bin/step; \
+    step version; \
+    :
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/2.4.6.0-sops-ssh-step-alpine-3.7/docker-entrypoint.sh b/variants/2.4.6.0-sops-ssh-step-alpine-3.7/docker-entrypoint.sh
new file mode 100644
index 0000000..8229e62
--- /dev/null
+++ b/variants/2.4.6.0-sops-ssh-step-alpine-3.7/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- ansible "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/2.6.20-sops-ssh-step-alpine-3.8/Dockerfile b/variants/2.6.20-sops-ssh-step-alpine-3.8/Dockerfile
new file mode 100644
index 0000000..e6f809c
--- /dev/null
+++ b/variants/2.6.20-sops-ssh-step-alpine-3.8/Dockerfile
@@ -0,0 +1,71 @@
+FROM alpine:3.8
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
+
+# Install ansible
+RUN set -eux; \
+    apk add --no-cache ansible~=2.6.20; \
+    ansible --version
+
+RUN apk add --no-cache ca-certificates
+
+RUN set -eux; \
+    wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.3/sops-v3.7.3.linux > /usr/local/bin/sops; \
+    chmod +x /usr/local/bin/sops; \
+    sha256sum /usr/local/bin/sops | grep '^53aec65e45f62a769ff24b7e5384f0c82d62668dd96ed56685f649da114b4dbb '; \
+    sops --version
+
+RUN apk add --no-cache gnupg
+
+RUN apk add --no-cache openssh-client
+
+# Install step
+RUN set -eux; \
+    STEP_VERSION=v0.27.5; \
+    case "$( uname -m )" in \
+        'x86') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_386.tar.gz"; \
+            SHA256=a4cb4cb893424780ffb4c8fee4ecf5b92e93c4c9b7ebd242631c272197dff2e0; \
+            ;; \
+        'x86_64') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_amd64.tar.gz"; \
+            SHA256=2099be3d0cc7bc3559d771393378aa6c3e96908a929dccd570c8352e2440ad77; \
+            ;; \
+        'armhf') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_armv6.tar.gz"; \
+            SHA256=97e8827c0ccfbf7779878f9a54b6fa72ba9aca4aead380d7a1cd85bebb04f365; \
+            ;; \
+        'armv7l') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_armv7.tar.gz"; \
+            SHA256=c0adeba5d5c2bcf70edf5f626d48c3201c204fe671591c12005cf5b4d6e90349; \
+            ;; \
+        'aarch64') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_arm64.tar.gz"; \
+            SHA256=f7f52300c3550bfb5a21a5fb2610dced6c3d24a008bec7e968987e7bc67f7ff4; \
+            ;; \
+        'ppc64le') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_ppc64le.tar.gz"; \
+            SHA256=0ac0e38b2f0c3b3a075a00adba43e1a0bca1549d0e13293bd3205416cd993974; \
+            ;; \
+        *) \
+            echo "Architecture not supported"; \
+            exit 1; \
+            ;; \
+    esac; \
+    FILE=step.tar.gz; \
+    wget -q "$URL" -O "$FILE"; \
+    echo "$SHA256  $FILE" | sha256sum -c -; \
+    tar -xvf "$FILE" --no-same-owner --no-same-permissions; \
+    rm -f "$FILE"; \
+    mkdir -pv /usr/local/bin; \
+    BIN=$( find . -type f -name "step" | head -n1 ); \
+    mv -v "$BIN" /usr/local/bin/step; \
+    chmod +x /usr/local/bin/step; \
+    step version; \
+    :
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/2.6.20-sops-ssh-step-alpine-3.8/docker-entrypoint.sh b/variants/2.6.20-sops-ssh-step-alpine-3.8/docker-entrypoint.sh
new file mode 100644
index 0000000..8229e62
--- /dev/null
+++ b/variants/2.6.20-sops-ssh-step-alpine-3.8/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- ansible "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/2.7.17-sops-ssh-step-alpine-3.9/Dockerfile b/variants/2.7.17-sops-ssh-step-alpine-3.9/Dockerfile
new file mode 100644
index 0000000..eb129fc
--- /dev/null
+++ b/variants/2.7.17-sops-ssh-step-alpine-3.9/Dockerfile
@@ -0,0 +1,71 @@
+FROM alpine:3.9
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
+
+# Install ansible
+RUN set -eux; \
+    apk add --no-cache ansible~=2.7.17; \
+    ansible --version
+
+RUN apk add --no-cache ca-certificates
+
+RUN set -eux; \
+    wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.3/sops-v3.7.3.linux > /usr/local/bin/sops; \
+    chmod +x /usr/local/bin/sops; \
+    sha256sum /usr/local/bin/sops | grep '^53aec65e45f62a769ff24b7e5384f0c82d62668dd96ed56685f649da114b4dbb '; \
+    sops --version
+
+RUN apk add --no-cache gnupg
+
+RUN apk add --no-cache openssh-client
+
+# Install step
+RUN set -eux; \
+    STEP_VERSION=v0.27.5; \
+    case "$( uname -m )" in \
+        'x86') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_386.tar.gz"; \
+            SHA256=a4cb4cb893424780ffb4c8fee4ecf5b92e93c4c9b7ebd242631c272197dff2e0; \
+            ;; \
+        'x86_64') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_amd64.tar.gz"; \
+            SHA256=2099be3d0cc7bc3559d771393378aa6c3e96908a929dccd570c8352e2440ad77; \
+            ;; \
+        'armhf') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_armv6.tar.gz"; \
+            SHA256=97e8827c0ccfbf7779878f9a54b6fa72ba9aca4aead380d7a1cd85bebb04f365; \
+            ;; \
+        'armv7l') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_armv7.tar.gz"; \
+            SHA256=c0adeba5d5c2bcf70edf5f626d48c3201c204fe671591c12005cf5b4d6e90349; \
+            ;; \
+        'aarch64') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_arm64.tar.gz"; \
+            SHA256=f7f52300c3550bfb5a21a5fb2610dced6c3d24a008bec7e968987e7bc67f7ff4; \
+            ;; \
+        'ppc64le') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_ppc64le.tar.gz"; \
+            SHA256=0ac0e38b2f0c3b3a075a00adba43e1a0bca1549d0e13293bd3205416cd993974; \
+            ;; \
+        *) \
+            echo "Architecture not supported"; \
+            exit 1; \
+            ;; \
+    esac; \
+    FILE=step.tar.gz; \
+    wget -q "$URL" -O "$FILE"; \
+    echo "$SHA256  $FILE" | sha256sum -c -; \
+    tar -xvf "$FILE" --no-same-owner --no-same-permissions; \
+    rm -f "$FILE"; \
+    mkdir -pv /usr/local/bin; \
+    BIN=$( find . -type f -name "step" | head -n1 ); \
+    mv -v "$BIN" /usr/local/bin/step; \
+    chmod +x /usr/local/bin/step; \
+    step version; \
+    :
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/2.7.17-sops-ssh-step-alpine-3.9/docker-entrypoint.sh b/variants/2.7.17-sops-ssh-step-alpine-3.9/docker-entrypoint.sh
new file mode 100644
index 0000000..8229e62
--- /dev/null
+++ b/variants/2.7.17-sops-ssh-step-alpine-3.9/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- ansible "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/2.8.19-sops-ssh-step-alpine-3.10/Dockerfile b/variants/2.8.19-sops-ssh-step-alpine-3.10/Dockerfile
new file mode 100644
index 0000000..280f51c
--- /dev/null
+++ b/variants/2.8.19-sops-ssh-step-alpine-3.10/Dockerfile
@@ -0,0 +1,71 @@
+FROM alpine:3.10
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
+
+# Install ansible
+RUN set -eux; \
+    apk add --no-cache ansible~=2.8.19; \
+    ansible --version
+
+RUN apk add --no-cache ca-certificates
+
+RUN set -eux; \
+    wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.3/sops-v3.7.3.linux > /usr/local/bin/sops; \
+    chmod +x /usr/local/bin/sops; \
+    sha256sum /usr/local/bin/sops | grep '^53aec65e45f62a769ff24b7e5384f0c82d62668dd96ed56685f649da114b4dbb '; \
+    sops --version
+
+RUN apk add --no-cache gnupg
+
+RUN apk add --no-cache openssh-client
+
+# Install step
+RUN set -eux; \
+    STEP_VERSION=v0.27.5; \
+    case "$( uname -m )" in \
+        'x86') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_386.tar.gz"; \
+            SHA256=a4cb4cb893424780ffb4c8fee4ecf5b92e93c4c9b7ebd242631c272197dff2e0; \
+            ;; \
+        'x86_64') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_amd64.tar.gz"; \
+            SHA256=2099be3d0cc7bc3559d771393378aa6c3e96908a929dccd570c8352e2440ad77; \
+            ;; \
+        'armhf') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_armv6.tar.gz"; \
+            SHA256=97e8827c0ccfbf7779878f9a54b6fa72ba9aca4aead380d7a1cd85bebb04f365; \
+            ;; \
+        'armv7l') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_armv7.tar.gz"; \
+            SHA256=c0adeba5d5c2bcf70edf5f626d48c3201c204fe671591c12005cf5b4d6e90349; \
+            ;; \
+        'aarch64') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_arm64.tar.gz"; \
+            SHA256=f7f52300c3550bfb5a21a5fb2610dced6c3d24a008bec7e968987e7bc67f7ff4; \
+            ;; \
+        'ppc64le') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_ppc64le.tar.gz"; \
+            SHA256=0ac0e38b2f0c3b3a075a00adba43e1a0bca1549d0e13293bd3205416cd993974; \
+            ;; \
+        *) \
+            echo "Architecture not supported"; \
+            exit 1; \
+            ;; \
+    esac; \
+    FILE=step.tar.gz; \
+    wget -q "$URL" -O "$FILE"; \
+    echo "$SHA256  $FILE" | sha256sum -c -; \
+    tar -xvf "$FILE" --no-same-owner --no-same-permissions; \
+    rm -f "$FILE"; \
+    mkdir -pv /usr/local/bin; \
+    BIN=$( find . -type f -name "step" | head -n1 ); \
+    mv -v "$BIN" /usr/local/bin/step; \
+    chmod +x /usr/local/bin/step; \
+    step version; \
+    :
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/2.8.19-sops-ssh-step-alpine-3.10/docker-entrypoint.sh b/variants/2.8.19-sops-ssh-step-alpine-3.10/docker-entrypoint.sh
new file mode 100644
index 0000000..8229e62
--- /dev/null
+++ b/variants/2.8.19-sops-ssh-step-alpine-3.10/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- ansible "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/2.9.18-sops-ssh-step-alpine-3.11/Dockerfile b/variants/2.9.18-sops-ssh-step-alpine-3.11/Dockerfile
new file mode 100644
index 0000000..94dc782
--- /dev/null
+++ b/variants/2.9.18-sops-ssh-step-alpine-3.11/Dockerfile
@@ -0,0 +1,71 @@
+FROM alpine:3.11
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
+
+# Install ansible
+RUN set -eux; \
+    apk add --no-cache ansible~=2.9.18; \
+    ansible --version
+
+RUN apk add --no-cache ca-certificates
+
+RUN set -eux; \
+    wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.3/sops-v3.7.3.linux > /usr/local/bin/sops; \
+    chmod +x /usr/local/bin/sops; \
+    sha256sum /usr/local/bin/sops | grep '^53aec65e45f62a769ff24b7e5384f0c82d62668dd96ed56685f649da114b4dbb '; \
+    sops --version
+
+RUN apk add --no-cache gnupg
+
+RUN apk add --no-cache openssh-client
+
+# Install step
+RUN set -eux; \
+    STEP_VERSION=v0.27.5; \
+    case "$( uname -m )" in \
+        'x86') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_386.tar.gz"; \
+            SHA256=a4cb4cb893424780ffb4c8fee4ecf5b92e93c4c9b7ebd242631c272197dff2e0; \
+            ;; \
+        'x86_64') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_amd64.tar.gz"; \
+            SHA256=2099be3d0cc7bc3559d771393378aa6c3e96908a929dccd570c8352e2440ad77; \
+            ;; \
+        'armhf') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_armv6.tar.gz"; \
+            SHA256=97e8827c0ccfbf7779878f9a54b6fa72ba9aca4aead380d7a1cd85bebb04f365; \
+            ;; \
+        'armv7l') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_armv7.tar.gz"; \
+            SHA256=c0adeba5d5c2bcf70edf5f626d48c3201c204fe671591c12005cf5b4d6e90349; \
+            ;; \
+        'aarch64') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_arm64.tar.gz"; \
+            SHA256=f7f52300c3550bfb5a21a5fb2610dced6c3d24a008bec7e968987e7bc67f7ff4; \
+            ;; \
+        'ppc64le') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_ppc64le.tar.gz"; \
+            SHA256=0ac0e38b2f0c3b3a075a00adba43e1a0bca1549d0e13293bd3205416cd993974; \
+            ;; \
+        *) \
+            echo "Architecture not supported"; \
+            exit 1; \
+            ;; \
+    esac; \
+    FILE=step.tar.gz; \
+    wget -q "$URL" -O "$FILE"; \
+    echo "$SHA256  $FILE" | sha256sum -c -; \
+    tar -xvf "$FILE" --no-same-owner --no-same-permissions; \
+    rm -f "$FILE"; \
+    mkdir -pv /usr/local/bin; \
+    BIN=$( find . -type f -name "step" | head -n1 ); \
+    mv -v "$BIN" /usr/local/bin/step; \
+    chmod +x /usr/local/bin/step; \
+    step version; \
+    :
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/2.9.18-sops-ssh-step-alpine-3.11/docker-entrypoint.sh b/variants/2.9.18-sops-ssh-step-alpine-3.11/docker-entrypoint.sh
new file mode 100644
index 0000000..8229e62
--- /dev/null
+++ b/variants/2.9.18-sops-ssh-step-alpine-3.11/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- ansible "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/4.8.0-sops-ssh-step-alpine-3.15/Dockerfile b/variants/4.8.0-sops-ssh-step-alpine-3.15/Dockerfile
new file mode 100644
index 0000000..52d6942
--- /dev/null
+++ b/variants/4.8.0-sops-ssh-step-alpine-3.15/Dockerfile
@@ -0,0 +1,71 @@
+FROM alpine:3.15
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
+
+# Install ansible
+RUN set -eux; \
+    apk add --no-cache ansible~=4.8.0; \
+    ansible --version
+
+RUN apk add --no-cache ca-certificates
+
+RUN set -eux; \
+    wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.3/sops-v3.7.3.linux > /usr/local/bin/sops; \
+    chmod +x /usr/local/bin/sops; \
+    sha256sum /usr/local/bin/sops | grep '^53aec65e45f62a769ff24b7e5384f0c82d62668dd96ed56685f649da114b4dbb '; \
+    sops --version
+
+RUN apk add --no-cache gnupg
+
+RUN apk add --no-cache openssh-client
+
+# Install step
+RUN set -eux; \
+    STEP_VERSION=v0.27.5; \
+    case "$( uname -m )" in \
+        'x86') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_386.tar.gz"; \
+            SHA256=a4cb4cb893424780ffb4c8fee4ecf5b92e93c4c9b7ebd242631c272197dff2e0; \
+            ;; \
+        'x86_64') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_amd64.tar.gz"; \
+            SHA256=2099be3d0cc7bc3559d771393378aa6c3e96908a929dccd570c8352e2440ad77; \
+            ;; \
+        'armhf') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_armv6.tar.gz"; \
+            SHA256=97e8827c0ccfbf7779878f9a54b6fa72ba9aca4aead380d7a1cd85bebb04f365; \
+            ;; \
+        'armv7l') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_armv7.tar.gz"; \
+            SHA256=c0adeba5d5c2bcf70edf5f626d48c3201c204fe671591c12005cf5b4d6e90349; \
+            ;; \
+        'aarch64') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_arm64.tar.gz"; \
+            SHA256=f7f52300c3550bfb5a21a5fb2610dced6c3d24a008bec7e968987e7bc67f7ff4; \
+            ;; \
+        'ppc64le') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_ppc64le.tar.gz"; \
+            SHA256=0ac0e38b2f0c3b3a075a00adba43e1a0bca1549d0e13293bd3205416cd993974; \
+            ;; \
+        *) \
+            echo "Architecture not supported"; \
+            exit 1; \
+            ;; \
+    esac; \
+    FILE=step.tar.gz; \
+    wget -q "$URL" -O "$FILE"; \
+    echo "$SHA256  $FILE" | sha256sum -c -; \
+    tar -xvf "$FILE" --no-same-owner --no-same-permissions; \
+    rm -f "$FILE"; \
+    mkdir -pv /usr/local/bin; \
+    BIN=$( find . -type f -name "step" | head -n1 ); \
+    mv -v "$BIN" /usr/local/bin/step; \
+    chmod +x /usr/local/bin/step; \
+    step version; \
+    :
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/4.8.0-sops-ssh-step-alpine-3.15/docker-entrypoint.sh b/variants/4.8.0-sops-ssh-step-alpine-3.15/docker-entrypoint.sh
new file mode 100644
index 0000000..8229e62
--- /dev/null
+++ b/variants/4.8.0-sops-ssh-step-alpine-3.15/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- ansible "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/5.8.0-sops-ssh-step-alpine-3.16/Dockerfile b/variants/5.8.0-sops-ssh-step-alpine-3.16/Dockerfile
new file mode 100644
index 0000000..eb44f84
--- /dev/null
+++ b/variants/5.8.0-sops-ssh-step-alpine-3.16/Dockerfile
@@ -0,0 +1,71 @@
+FROM alpine:3.16
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
+
+# Install ansible
+RUN set -eux; \
+    apk add --no-cache ansible~=5.8.0; \
+    ansible --version
+
+RUN apk add --no-cache ca-certificates
+
+RUN set -eux; \
+    wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.3/sops-v3.7.3.linux > /usr/local/bin/sops; \
+    chmod +x /usr/local/bin/sops; \
+    sha256sum /usr/local/bin/sops | grep '^53aec65e45f62a769ff24b7e5384f0c82d62668dd96ed56685f649da114b4dbb '; \
+    sops --version
+
+RUN apk add --no-cache gnupg
+
+RUN apk add --no-cache openssh-client
+
+# Install step
+RUN set -eux; \
+    STEP_VERSION=v0.27.5; \
+    case "$( uname -m )" in \
+        'x86') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_386.tar.gz"; \
+            SHA256=a4cb4cb893424780ffb4c8fee4ecf5b92e93c4c9b7ebd242631c272197dff2e0; \
+            ;; \
+        'x86_64') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_amd64.tar.gz"; \
+            SHA256=2099be3d0cc7bc3559d771393378aa6c3e96908a929dccd570c8352e2440ad77; \
+            ;; \
+        'armhf') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_armv6.tar.gz"; \
+            SHA256=97e8827c0ccfbf7779878f9a54b6fa72ba9aca4aead380d7a1cd85bebb04f365; \
+            ;; \
+        'armv7l') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_armv7.tar.gz"; \
+            SHA256=c0adeba5d5c2bcf70edf5f626d48c3201c204fe671591c12005cf5b4d6e90349; \
+            ;; \
+        'aarch64') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_arm64.tar.gz"; \
+            SHA256=f7f52300c3550bfb5a21a5fb2610dced6c3d24a008bec7e968987e7bc67f7ff4; \
+            ;; \
+        'ppc64le') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_ppc64le.tar.gz"; \
+            SHA256=0ac0e38b2f0c3b3a075a00adba43e1a0bca1549d0e13293bd3205416cd993974; \
+            ;; \
+        *) \
+            echo "Architecture not supported"; \
+            exit 1; \
+            ;; \
+    esac; \
+    FILE=step.tar.gz; \
+    wget -q "$URL" -O "$FILE"; \
+    echo "$SHA256  $FILE" | sha256sum -c -; \
+    tar -xvf "$FILE" --no-same-owner --no-same-permissions; \
+    rm -f "$FILE"; \
+    mkdir -pv /usr/local/bin; \
+    BIN=$( find . -type f -name "step" | head -n1 ); \
+    mv -v "$BIN" /usr/local/bin/step; \
+    chmod +x /usr/local/bin/step; \
+    step version; \
+    :
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/5.8.0-sops-ssh-step-alpine-3.16/docker-entrypoint.sh b/variants/5.8.0-sops-ssh-step-alpine-3.16/docker-entrypoint.sh
new file mode 100644
index 0000000..8229e62
--- /dev/null
+++ b/variants/5.8.0-sops-ssh-step-alpine-3.16/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- ansible "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/6.6.0-sops-ssh-step-alpine-3.17/Dockerfile b/variants/6.6.0-sops-ssh-step-alpine-3.17/Dockerfile
new file mode 100644
index 0000000..7a8ee43
--- /dev/null
+++ b/variants/6.6.0-sops-ssh-step-alpine-3.17/Dockerfile
@@ -0,0 +1,71 @@
+FROM alpine:3.17
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
+
+# Install ansible
+RUN set -eux; \
+    apk add --no-cache ansible~=6.6.0; \
+    ansible --version
+
+RUN apk add --no-cache ca-certificates
+
+RUN set -eux; \
+    wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.3/sops-v3.7.3.linux > /usr/local/bin/sops; \
+    chmod +x /usr/local/bin/sops; \
+    sha256sum /usr/local/bin/sops | grep '^53aec65e45f62a769ff24b7e5384f0c82d62668dd96ed56685f649da114b4dbb '; \
+    sops --version
+
+RUN apk add --no-cache gnupg
+
+RUN apk add --no-cache openssh-client
+
+# Install step
+RUN set -eux; \
+    STEP_VERSION=v0.27.5; \
+    case "$( uname -m )" in \
+        'x86') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_386.tar.gz"; \
+            SHA256=a4cb4cb893424780ffb4c8fee4ecf5b92e93c4c9b7ebd242631c272197dff2e0; \
+            ;; \
+        'x86_64') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_amd64.tar.gz"; \
+            SHA256=2099be3d0cc7bc3559d771393378aa6c3e96908a929dccd570c8352e2440ad77; \
+            ;; \
+        'armhf') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_armv6.tar.gz"; \
+            SHA256=97e8827c0ccfbf7779878f9a54b6fa72ba9aca4aead380d7a1cd85bebb04f365; \
+            ;; \
+        'armv7l') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_armv7.tar.gz"; \
+            SHA256=c0adeba5d5c2bcf70edf5f626d48c3201c204fe671591c12005cf5b4d6e90349; \
+            ;; \
+        'aarch64') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_arm64.tar.gz"; \
+            SHA256=f7f52300c3550bfb5a21a5fb2610dced6c3d24a008bec7e968987e7bc67f7ff4; \
+            ;; \
+        'ppc64le') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_ppc64le.tar.gz"; \
+            SHA256=0ac0e38b2f0c3b3a075a00adba43e1a0bca1549d0e13293bd3205416cd993974; \
+            ;; \
+        *) \
+            echo "Architecture not supported"; \
+            exit 1; \
+            ;; \
+    esac; \
+    FILE=step.tar.gz; \
+    wget -q "$URL" -O "$FILE"; \
+    echo "$SHA256  $FILE" | sha256sum -c -; \
+    tar -xvf "$FILE" --no-same-owner --no-same-permissions; \
+    rm -f "$FILE"; \
+    mkdir -pv /usr/local/bin; \
+    BIN=$( find . -type f -name "step" | head -n1 ); \
+    mv -v "$BIN" /usr/local/bin/step; \
+    chmod +x /usr/local/bin/step; \
+    step version; \
+    :
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/6.6.0-sops-ssh-step-alpine-3.17/docker-entrypoint.sh b/variants/6.6.0-sops-ssh-step-alpine-3.17/docker-entrypoint.sh
new file mode 100644
index 0000000..8229e62
--- /dev/null
+++ b/variants/6.6.0-sops-ssh-step-alpine-3.17/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- ansible "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/7.5.0-sops-ssh-step-alpine-3.18/Dockerfile b/variants/7.5.0-sops-ssh-step-alpine-3.18/Dockerfile
new file mode 100644
index 0000000..dc0fe68
--- /dev/null
+++ b/variants/7.5.0-sops-ssh-step-alpine-3.18/Dockerfile
@@ -0,0 +1,71 @@
+FROM alpine:3.18
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
+
+# Install ansible
+RUN set -eux; \
+    apk add --no-cache ansible~=7.5.0; \
+    ansible --version
+
+RUN apk add --no-cache ca-certificates
+
+RUN set -eux; \
+    wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.3/sops-v3.7.3.linux > /usr/local/bin/sops; \
+    chmod +x /usr/local/bin/sops; \
+    sha256sum /usr/local/bin/sops | grep '^53aec65e45f62a769ff24b7e5384f0c82d62668dd96ed56685f649da114b4dbb '; \
+    sops --version
+
+RUN apk add --no-cache gnupg
+
+RUN apk add --no-cache openssh-client
+
+# Install step
+RUN set -eux; \
+    STEP_VERSION=v0.27.5; \
+    case "$( uname -m )" in \
+        'x86') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_386.tar.gz"; \
+            SHA256=a4cb4cb893424780ffb4c8fee4ecf5b92e93c4c9b7ebd242631c272197dff2e0; \
+            ;; \
+        'x86_64') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_amd64.tar.gz"; \
+            SHA256=2099be3d0cc7bc3559d771393378aa6c3e96908a929dccd570c8352e2440ad77; \
+            ;; \
+        'armhf') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_armv6.tar.gz"; \
+            SHA256=97e8827c0ccfbf7779878f9a54b6fa72ba9aca4aead380d7a1cd85bebb04f365; \
+            ;; \
+        'armv7l') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_armv7.tar.gz"; \
+            SHA256=c0adeba5d5c2bcf70edf5f626d48c3201c204fe671591c12005cf5b4d6e90349; \
+            ;; \
+        'aarch64') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_arm64.tar.gz"; \
+            SHA256=f7f52300c3550bfb5a21a5fb2610dced6c3d24a008bec7e968987e7bc67f7ff4; \
+            ;; \
+        'ppc64le') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_ppc64le.tar.gz"; \
+            SHA256=0ac0e38b2f0c3b3a075a00adba43e1a0bca1549d0e13293bd3205416cd993974; \
+            ;; \
+        *) \
+            echo "Architecture not supported"; \
+            exit 1; \
+            ;; \
+    esac; \
+    FILE=step.tar.gz; \
+    wget -q "$URL" -O "$FILE"; \
+    echo "$SHA256  $FILE" | sha256sum -c -; \
+    tar -xvf "$FILE" --no-same-owner --no-same-permissions; \
+    rm -f "$FILE"; \
+    mkdir -pv /usr/local/bin; \
+    BIN=$( find . -type f -name "step" | head -n1 ); \
+    mv -v "$BIN" /usr/local/bin/step; \
+    chmod +x /usr/local/bin/step; \
+    step version; \
+    :
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/7.5.0-sops-ssh-step-alpine-3.18/docker-entrypoint.sh b/variants/7.5.0-sops-ssh-step-alpine-3.18/docker-entrypoint.sh
new file mode 100644
index 0000000..8229e62
--- /dev/null
+++ b/variants/7.5.0-sops-ssh-step-alpine-3.18/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- ansible "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/8.6.1-sops-ssh-step-alpine-3.19/Dockerfile b/variants/8.6.1-sops-ssh-step-alpine-3.19/Dockerfile
new file mode 100644
index 0000000..e1e7491
--- /dev/null
+++ b/variants/8.6.1-sops-ssh-step-alpine-3.19/Dockerfile
@@ -0,0 +1,71 @@
+FROM alpine:3.19
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
+
+# Install ansible
+RUN set -eux; \
+    apk add --no-cache ansible~=8.6.1; \
+    ansible --version
+
+RUN apk add --no-cache ca-certificates
+
+RUN set -eux; \
+    wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.3/sops-v3.7.3.linux > /usr/local/bin/sops; \
+    chmod +x /usr/local/bin/sops; \
+    sha256sum /usr/local/bin/sops | grep '^53aec65e45f62a769ff24b7e5384f0c82d62668dd96ed56685f649da114b4dbb '; \
+    sops --version
+
+RUN apk add --no-cache gnupg
+
+RUN apk add --no-cache openssh-client
+
+# Install step
+RUN set -eux; \
+    STEP_VERSION=v0.27.5; \
+    case "$( uname -m )" in \
+        'x86') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_386.tar.gz"; \
+            SHA256=a4cb4cb893424780ffb4c8fee4ecf5b92e93c4c9b7ebd242631c272197dff2e0; \
+            ;; \
+        'x86_64') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_amd64.tar.gz"; \
+            SHA256=2099be3d0cc7bc3559d771393378aa6c3e96908a929dccd570c8352e2440ad77; \
+            ;; \
+        'armhf') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_armv6.tar.gz"; \
+            SHA256=97e8827c0ccfbf7779878f9a54b6fa72ba9aca4aead380d7a1cd85bebb04f365; \
+            ;; \
+        'armv7l') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_armv7.tar.gz"; \
+            SHA256=c0adeba5d5c2bcf70edf5f626d48c3201c204fe671591c12005cf5b4d6e90349; \
+            ;; \
+        'aarch64') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_arm64.tar.gz"; \
+            SHA256=f7f52300c3550bfb5a21a5fb2610dced6c3d24a008bec7e968987e7bc67f7ff4; \
+            ;; \
+        'ppc64le') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_ppc64le.tar.gz"; \
+            SHA256=0ac0e38b2f0c3b3a075a00adba43e1a0bca1549d0e13293bd3205416cd993974; \
+            ;; \
+        *) \
+            echo "Architecture not supported"; \
+            exit 1; \
+            ;; \
+    esac; \
+    FILE=step.tar.gz; \
+    wget -q "$URL" -O "$FILE"; \
+    echo "$SHA256  $FILE" | sha256sum -c -; \
+    tar -xvf "$FILE" --no-same-owner --no-same-permissions; \
+    rm -f "$FILE"; \
+    mkdir -pv /usr/local/bin; \
+    BIN=$( find . -type f -name "step" | head -n1 ); \
+    mv -v "$BIN" /usr/local/bin/step; \
+    chmod +x /usr/local/bin/step; \
+    step version; \
+    :
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/8.6.1-sops-ssh-step-alpine-3.19/docker-entrypoint.sh b/variants/8.6.1-sops-ssh-step-alpine-3.19/docker-entrypoint.sh
new file mode 100644
index 0000000..8229e62
--- /dev/null
+++ b/variants/8.6.1-sops-ssh-step-alpine-3.19/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- ansible "$@"
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/variants/9.5.1-sops-ssh-step-alpine-3.20/Dockerfile b/variants/9.5.1-sops-ssh-step-alpine-3.20/Dockerfile
new file mode 100644
index 0000000..242d971
--- /dev/null
+++ b/variants/9.5.1-sops-ssh-step-alpine-3.20/Dockerfile
@@ -0,0 +1,71 @@
+FROM alpine:3.20
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
+
+# Install ansible
+RUN set -eux; \
+    apk add --no-cache ansible~=9.5.1; \
+    ansible --version
+
+RUN apk add --no-cache ca-certificates
+
+RUN set -eux; \
+    wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.3/sops-v3.7.3.linux > /usr/local/bin/sops; \
+    chmod +x /usr/local/bin/sops; \
+    sha256sum /usr/local/bin/sops | grep '^53aec65e45f62a769ff24b7e5384f0c82d62668dd96ed56685f649da114b4dbb '; \
+    sops --version
+
+RUN apk add --no-cache gnupg
+
+RUN apk add --no-cache openssh-client
+
+# Install step
+RUN set -eux; \
+    STEP_VERSION=v0.27.5; \
+    case "$( uname -m )" in \
+        'x86') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_386.tar.gz"; \
+            SHA256=a4cb4cb893424780ffb4c8fee4ecf5b92e93c4c9b7ebd242631c272197dff2e0; \
+            ;; \
+        'x86_64') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_amd64.tar.gz"; \
+            SHA256=2099be3d0cc7bc3559d771393378aa6c3e96908a929dccd570c8352e2440ad77; \
+            ;; \
+        'armhf') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_armv6.tar.gz"; \
+            SHA256=97e8827c0ccfbf7779878f9a54b6fa72ba9aca4aead380d7a1cd85bebb04f365; \
+            ;; \
+        'armv7l') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_armv7.tar.gz"; \
+            SHA256=c0adeba5d5c2bcf70edf5f626d48c3201c204fe671591c12005cf5b4d6e90349; \
+            ;; \
+        'aarch64') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_arm64.tar.gz"; \
+            SHA256=f7f52300c3550bfb5a21a5fb2610dced6c3d24a008bec7e968987e7bc67f7ff4; \
+            ;; \
+        'ppc64le') \
+            URL="https://github.com/smallstep/cli/releases/download/v0.27.5/step_linux_ppc64le.tar.gz"; \
+            SHA256=0ac0e38b2f0c3b3a075a00adba43e1a0bca1549d0e13293bd3205416cd993974; \
+            ;; \
+        *) \
+            echo "Architecture not supported"; \
+            exit 1; \
+            ;; \
+    esac; \
+    FILE=step.tar.gz; \
+    wget -q "$URL" -O "$FILE"; \
+    echo "$SHA256  $FILE" | sha256sum -c -; \
+    tar -xvf "$FILE" --no-same-owner --no-same-permissions; \
+    rm -f "$FILE"; \
+    mkdir -pv /usr/local/bin; \
+    BIN=$( find . -type f -name "step" | head -n1 ); \
+    mv -v "$BIN" /usr/local/bin/step; \
+    chmod +x /usr/local/bin/step; \
+    step version; \
+    :
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x docker-entrypoint.sh
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]
diff --git a/variants/9.5.1-sops-ssh-step-alpine-3.20/docker-entrypoint.sh b/variants/9.5.1-sops-ssh-step-alpine-3.20/docker-entrypoint.sh
new file mode 100644
index 0000000..8229e62
--- /dev/null
+++ b/variants/9.5.1-sops-ssh-step-alpine-3.20/docker-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+if [ $# -gt 0 ] && [ "${1#-}" != "$1" ]; then
+    set -- ansible "$@"
+fi
+
+exec "$@"
\ No newline at end of file