diff --git a/.github/Makefile b/.github/Makefile
index 8281d58135..13b8c66b35 100644
--- a/.github/Makefile
+++ b/.github/Makefile
@@ -31,7 +31,7 @@ workflows/%.yml: .ALWAYS
 	@set -e; enabled=$$(make -sC ../vendor/$* info/package-enabled); \
 	if [[ $$enabled != "false" ]]; then \
   		echo updating $@; \
-		sed 's/%PACKAGE_NAME%/$*/g' package-template.yml > $@; \
+		sed 's/%PACKAGE_NAME%/$*/g' package-template.yml | sed 's/%PACKAGE_JSON_NAME%/$(subst .,_,$*)/g' > $@; \
 	else \
 		echo DELETING workflow $@ because package is disabled; \
 		rm -f $@; \
diff --git a/.github/package-template.yml b/.github/package-template.yml
index 49ef5fc680..cfac8c9333 100644
--- a/.github/package-template.yml
+++ b/.github/package-template.yml
@@ -49,7 +49,7 @@ jobs:
   # so each job must have a unique name for the rules to work properly.
   # See https://github.com/Mergifyio/mergify/discussions/5082
   # and https://github.com/Mergifyio/mergify/issues/5083
-  matrix-%PACKAGE_NAME%:
+  matrix-%PACKAGE_JSON_NAME%:
     if: github.event_name != 'schedule'
     runs-on: ubuntu-latest
     outputs:
@@ -74,9 +74,9 @@ jobs:
 
   # Build for alpine linux
   # Kept separate because it is old and slightly different than the other package builds
-  alpine-%PACKAGE_NAME%:
-    needs: matrix-%PACKAGE_NAME%
-    if: github.event_name != 'schedule' && needs.matrix-%PACKAGE_NAME%.outputs.apk-enabled != 'false'
+  alpine-%PACKAGE_JSON_NAME%:
+    needs: matrix-%PACKAGE_JSON_NAME%
+    if: github.event_name != 'schedule' && needs.matrix-%PACKAGE_JSON_NAME%.outputs.apk-enabled != 'false'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -156,18 +156,18 @@ jobs:
           no-wait-for-sync: 'true'                          # Skip the waiting for package synchronisation (i.e. upload only)
 
   # Build packages with fpm package manager
-  package-%PACKAGE_NAME%:
-    needs: matrix-%PACKAGE_NAME%
+  package-%PACKAGE_JSON_NAME%:
+    needs: matrix-%PACKAGE_JSON_NAME%
     # Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
     # and would run with package-type empty if matrix is ["apk"]
     if: >
-      github.event_name != 'schedule' && needs.matrix-%PACKAGE_NAME%.outputs.package-enabled != 'false'
-      && needs.matrix-%PACKAGE_NAME%.outputs.package-matrix != '[]' && needs.matrix-%PACKAGE_NAME%.outputs.package-matrix != '["apk"]'
+      github.event_name != 'schedule' && needs.matrix-%PACKAGE_JSON_NAME%.outputs.package-enabled != 'false'
+      && needs.matrix-%PACKAGE_JSON_NAME%.outputs.package-matrix != '[]' && needs.matrix-%PACKAGE_JSON_NAME%.outputs.package-matrix != '["apk"]'
 
     strategy:
       matrix:
-        package-type: ${{ fromJSON(needs.matrix-%PACKAGE_NAME%.outputs.package-matrix) }}
-        arch: ${{ fromJSON(needs.matrix-%PACKAGE_NAME%.outputs.arch-matrix) }}
+        package-type: ${{ fromJSON(needs.matrix-%PACKAGE_JSON_NAME%.outputs.package-matrix) }}
+        arch: ${{ fromJSON(needs.matrix-%PACKAGE_JSON_NAME%.outputs.arch-matrix) }}
         exclude:
         - package-type: 'apk'
         include:
diff --git a/.github/workflows/auto-update-packages.yml b/.github/workflows/auto-update-packages.yml
index b2c6e6826b..a95f96152f 100644
--- a/.github/workflows/auto-update-packages.yml
+++ b/.github/workflows/auto-update-packages.yml
@@ -124,18 +124,12 @@ jobs:
         - sudosh
         - teleport
         - terraform
-        - terraform-0.11
-        - terraform-0.12
-        - terraform-0.13
         - terraform-0.14
         - terraform-0.15
         - terraform-1
         - terraform-config-inspect
         - terraform-docs
         - terraform-module-versions
-        - terraform_0.11
-        - terraform_0.12
-        - terraform_0.13
         - terragrunt
         - terrahelp
         - tflint
diff --git a/.github/workflows/kubectl-1.13.yml b/.github/workflows/kubectl-1.13.yml
index e637a59c25..dcc40d7b84 100644
--- a/.github/workflows/kubectl-1.13.yml
+++ b/.github/workflows/kubectl-1.13.yml
@@ -49,7 +49,7 @@ jobs:
   # so each job must have a unique name for the rules to work properly.
   # See https://github.com/Mergifyio/mergify/discussions/5082
   # and https://github.com/Mergifyio/mergify/issues/5083
-  matrix-kubectl-1.13:
+  matrix-kubectl-1_13:
     if: github.event_name != 'schedule'
     runs-on: ubuntu-latest
     outputs:
@@ -74,9 +74,9 @@ jobs:
 
   # Build for alpine linux
   # Kept separate because it is old and slightly different than the other package builds
-  alpine-kubectl-1.13:
-    needs: matrix-kubectl-1.13
-    if: github.event_name != 'schedule' && needs.matrix-kubectl-1.13.outputs.apk-enabled != 'false'
+  alpine-kubectl-1_13:
+    needs: matrix-kubectl-1_13
+    if: github.event_name != 'schedule' && needs.matrix-kubectl-1_13.outputs.apk-enabled != 'false'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -156,18 +156,18 @@ jobs:
           no-wait-for-sync: 'true'                          # Skip the waiting for package synchronisation (i.e. upload only)
 
   # Build packages with fpm package manager
-  package-kubectl-1.13:
-    needs: matrix-kubectl-1.13
+  package-kubectl-1_13:
+    needs: matrix-kubectl-1_13
     # Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
     # and would run with package-type empty if matrix is ["apk"]
     if: >
-      github.event_name != 'schedule' && needs.matrix-kubectl-1.13.outputs.package-enabled != 'false'
-      && needs.matrix-kubectl-1.13.outputs.package-matrix != '[]' && needs.matrix-kubectl-1.13.outputs.package-matrix != '["apk"]'
+      github.event_name != 'schedule' && needs.matrix-kubectl-1_13.outputs.package-enabled != 'false'
+      && needs.matrix-kubectl-1_13.outputs.package-matrix != '[]' && needs.matrix-kubectl-1_13.outputs.package-matrix != '["apk"]'
 
     strategy:
       matrix:
-        package-type: ${{ fromJSON(needs.matrix-kubectl-1.13.outputs.package-matrix) }}
-        arch: ${{ fromJSON(needs.matrix-kubectl-1.13.outputs.arch-matrix) }}
+        package-type: ${{ fromJSON(needs.matrix-kubectl-1_13.outputs.package-matrix) }}
+        arch: ${{ fromJSON(needs.matrix-kubectl-1_13.outputs.arch-matrix) }}
         exclude:
         - package-type: 'apk'
         include:
diff --git a/.github/workflows/kubectl-1.14.yml b/.github/workflows/kubectl-1.14.yml
index 6783b8e91d..43fcef434d 100644
--- a/.github/workflows/kubectl-1.14.yml
+++ b/.github/workflows/kubectl-1.14.yml
@@ -49,7 +49,7 @@ jobs:
   # so each job must have a unique name for the rules to work properly.
   # See https://github.com/Mergifyio/mergify/discussions/5082
   # and https://github.com/Mergifyio/mergify/issues/5083
-  matrix-kubectl-1.14:
+  matrix-kubectl-1_14:
     if: github.event_name != 'schedule'
     runs-on: ubuntu-latest
     outputs:
@@ -74,9 +74,9 @@ jobs:
 
   # Build for alpine linux
   # Kept separate because it is old and slightly different than the other package builds
-  alpine-kubectl-1.14:
-    needs: matrix-kubectl-1.14
-    if: github.event_name != 'schedule' && needs.matrix-kubectl-1.14.outputs.apk-enabled != 'false'
+  alpine-kubectl-1_14:
+    needs: matrix-kubectl-1_14
+    if: github.event_name != 'schedule' && needs.matrix-kubectl-1_14.outputs.apk-enabled != 'false'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -156,18 +156,18 @@ jobs:
           no-wait-for-sync: 'true'                          # Skip the waiting for package synchronisation (i.e. upload only)
 
   # Build packages with fpm package manager
-  package-kubectl-1.14:
-    needs: matrix-kubectl-1.14
+  package-kubectl-1_14:
+    needs: matrix-kubectl-1_14
     # Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
     # and would run with package-type empty if matrix is ["apk"]
     if: >
-      github.event_name != 'schedule' && needs.matrix-kubectl-1.14.outputs.package-enabled != 'false'
-      && needs.matrix-kubectl-1.14.outputs.package-matrix != '[]' && needs.matrix-kubectl-1.14.outputs.package-matrix != '["apk"]'
+      github.event_name != 'schedule' && needs.matrix-kubectl-1_14.outputs.package-enabled != 'false'
+      && needs.matrix-kubectl-1_14.outputs.package-matrix != '[]' && needs.matrix-kubectl-1_14.outputs.package-matrix != '["apk"]'
 
     strategy:
       matrix:
-        package-type: ${{ fromJSON(needs.matrix-kubectl-1.14.outputs.package-matrix) }}
-        arch: ${{ fromJSON(needs.matrix-kubectl-1.14.outputs.arch-matrix) }}
+        package-type: ${{ fromJSON(needs.matrix-kubectl-1_14.outputs.package-matrix) }}
+        arch: ${{ fromJSON(needs.matrix-kubectl-1_14.outputs.arch-matrix) }}
         exclude:
         - package-type: 'apk'
         include:
diff --git a/.github/workflows/kubectl-1.15.yml b/.github/workflows/kubectl-1.15.yml
index fdefcee558..5e429eb59b 100644
--- a/.github/workflows/kubectl-1.15.yml
+++ b/.github/workflows/kubectl-1.15.yml
@@ -49,7 +49,7 @@ jobs:
   # so each job must have a unique name for the rules to work properly.
   # See https://github.com/Mergifyio/mergify/discussions/5082
   # and https://github.com/Mergifyio/mergify/issues/5083
-  matrix-kubectl-1.15:
+  matrix-kubectl-1_15:
     if: github.event_name != 'schedule'
     runs-on: ubuntu-latest
     outputs:
@@ -74,9 +74,9 @@ jobs:
 
   # Build for alpine linux
   # Kept separate because it is old and slightly different than the other package builds
-  alpine-kubectl-1.15:
-    needs: matrix-kubectl-1.15
-    if: github.event_name != 'schedule' && needs.matrix-kubectl-1.15.outputs.apk-enabled != 'false'
+  alpine-kubectl-1_15:
+    needs: matrix-kubectl-1_15
+    if: github.event_name != 'schedule' && needs.matrix-kubectl-1_15.outputs.apk-enabled != 'false'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -156,18 +156,18 @@ jobs:
           no-wait-for-sync: 'true'                          # Skip the waiting for package synchronisation (i.e. upload only)
 
   # Build packages with fpm package manager
-  package-kubectl-1.15:
-    needs: matrix-kubectl-1.15
+  package-kubectl-1_15:
+    needs: matrix-kubectl-1_15
     # Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
     # and would run with package-type empty if matrix is ["apk"]
     if: >
-      github.event_name != 'schedule' && needs.matrix-kubectl-1.15.outputs.package-enabled != 'false'
-      && needs.matrix-kubectl-1.15.outputs.package-matrix != '[]' && needs.matrix-kubectl-1.15.outputs.package-matrix != '["apk"]'
+      github.event_name != 'schedule' && needs.matrix-kubectl-1_15.outputs.package-enabled != 'false'
+      && needs.matrix-kubectl-1_15.outputs.package-matrix != '[]' && needs.matrix-kubectl-1_15.outputs.package-matrix != '["apk"]'
 
     strategy:
       matrix:
-        package-type: ${{ fromJSON(needs.matrix-kubectl-1.15.outputs.package-matrix) }}
-        arch: ${{ fromJSON(needs.matrix-kubectl-1.15.outputs.arch-matrix) }}
+        package-type: ${{ fromJSON(needs.matrix-kubectl-1_15.outputs.package-matrix) }}
+        arch: ${{ fromJSON(needs.matrix-kubectl-1_15.outputs.arch-matrix) }}
         exclude:
         - package-type: 'apk'
         include:
diff --git a/.github/workflows/kubectl-1.16.yml b/.github/workflows/kubectl-1.16.yml
index 0b4b1d859d..047087e4a8 100644
--- a/.github/workflows/kubectl-1.16.yml
+++ b/.github/workflows/kubectl-1.16.yml
@@ -49,7 +49,7 @@ jobs:
   # so each job must have a unique name for the rules to work properly.
   # See https://github.com/Mergifyio/mergify/discussions/5082
   # and https://github.com/Mergifyio/mergify/issues/5083
-  matrix-kubectl-1.16:
+  matrix-kubectl-1_16:
     if: github.event_name != 'schedule'
     runs-on: ubuntu-latest
     outputs:
@@ -74,9 +74,9 @@ jobs:
 
   # Build for alpine linux
   # Kept separate because it is old and slightly different than the other package builds
-  alpine-kubectl-1.16:
-    needs: matrix-kubectl-1.16
-    if: github.event_name != 'schedule' && needs.matrix-kubectl-1.16.outputs.apk-enabled != 'false'
+  alpine-kubectl-1_16:
+    needs: matrix-kubectl-1_16
+    if: github.event_name != 'schedule' && needs.matrix-kubectl-1_16.outputs.apk-enabled != 'false'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -156,18 +156,18 @@ jobs:
           no-wait-for-sync: 'true'                          # Skip the waiting for package synchronisation (i.e. upload only)
 
   # Build packages with fpm package manager
-  package-kubectl-1.16:
-    needs: matrix-kubectl-1.16
+  package-kubectl-1_16:
+    needs: matrix-kubectl-1_16
     # Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
     # and would run with package-type empty if matrix is ["apk"]
     if: >
-      github.event_name != 'schedule' && needs.matrix-kubectl-1.16.outputs.package-enabled != 'false'
-      && needs.matrix-kubectl-1.16.outputs.package-matrix != '[]' && needs.matrix-kubectl-1.16.outputs.package-matrix != '["apk"]'
+      github.event_name != 'schedule' && needs.matrix-kubectl-1_16.outputs.package-enabled != 'false'
+      && needs.matrix-kubectl-1_16.outputs.package-matrix != '[]' && needs.matrix-kubectl-1_16.outputs.package-matrix != '["apk"]'
 
     strategy:
       matrix:
-        package-type: ${{ fromJSON(needs.matrix-kubectl-1.16.outputs.package-matrix) }}
-        arch: ${{ fromJSON(needs.matrix-kubectl-1.16.outputs.arch-matrix) }}
+        package-type: ${{ fromJSON(needs.matrix-kubectl-1_16.outputs.package-matrix) }}
+        arch: ${{ fromJSON(needs.matrix-kubectl-1_16.outputs.arch-matrix) }}
         exclude:
         - package-type: 'apk'
         include:
diff --git a/.github/workflows/kubectl-1.17.yml b/.github/workflows/kubectl-1.17.yml
index 7729bc077e..ccb41c33ed 100644
--- a/.github/workflows/kubectl-1.17.yml
+++ b/.github/workflows/kubectl-1.17.yml
@@ -49,7 +49,7 @@ jobs:
   # so each job must have a unique name for the rules to work properly.
   # See https://github.com/Mergifyio/mergify/discussions/5082
   # and https://github.com/Mergifyio/mergify/issues/5083
-  matrix-kubectl-1.17:
+  matrix-kubectl-1_17:
     if: github.event_name != 'schedule'
     runs-on: ubuntu-latest
     outputs:
@@ -74,9 +74,9 @@ jobs:
 
   # Build for alpine linux
   # Kept separate because it is old and slightly different than the other package builds
-  alpine-kubectl-1.17:
-    needs: matrix-kubectl-1.17
-    if: github.event_name != 'schedule' && needs.matrix-kubectl-1.17.outputs.apk-enabled != 'false'
+  alpine-kubectl-1_17:
+    needs: matrix-kubectl-1_17
+    if: github.event_name != 'schedule' && needs.matrix-kubectl-1_17.outputs.apk-enabled != 'false'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -156,18 +156,18 @@ jobs:
           no-wait-for-sync: 'true'                          # Skip the waiting for package synchronisation (i.e. upload only)
 
   # Build packages with fpm package manager
-  package-kubectl-1.17:
-    needs: matrix-kubectl-1.17
+  package-kubectl-1_17:
+    needs: matrix-kubectl-1_17
     # Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
     # and would run with package-type empty if matrix is ["apk"]
     if: >
-      github.event_name != 'schedule' && needs.matrix-kubectl-1.17.outputs.package-enabled != 'false'
-      && needs.matrix-kubectl-1.17.outputs.package-matrix != '[]' && needs.matrix-kubectl-1.17.outputs.package-matrix != '["apk"]'
+      github.event_name != 'schedule' && needs.matrix-kubectl-1_17.outputs.package-enabled != 'false'
+      && needs.matrix-kubectl-1_17.outputs.package-matrix != '[]' && needs.matrix-kubectl-1_17.outputs.package-matrix != '["apk"]'
 
     strategy:
       matrix:
-        package-type: ${{ fromJSON(needs.matrix-kubectl-1.17.outputs.package-matrix) }}
-        arch: ${{ fromJSON(needs.matrix-kubectl-1.17.outputs.arch-matrix) }}
+        package-type: ${{ fromJSON(needs.matrix-kubectl-1_17.outputs.package-matrix) }}
+        arch: ${{ fromJSON(needs.matrix-kubectl-1_17.outputs.arch-matrix) }}
         exclude:
         - package-type: 'apk'
         include:
diff --git a/.github/workflows/kubectl-1.18.yml b/.github/workflows/kubectl-1.18.yml
index 30d2e27431..8de70460d0 100644
--- a/.github/workflows/kubectl-1.18.yml
+++ b/.github/workflows/kubectl-1.18.yml
@@ -49,7 +49,7 @@ jobs:
   # so each job must have a unique name for the rules to work properly.
   # See https://github.com/Mergifyio/mergify/discussions/5082
   # and https://github.com/Mergifyio/mergify/issues/5083
-  matrix-kubectl-1.18:
+  matrix-kubectl-1_18:
     if: github.event_name != 'schedule'
     runs-on: ubuntu-latest
     outputs:
@@ -74,9 +74,9 @@ jobs:
 
   # Build for alpine linux
   # Kept separate because it is old and slightly different than the other package builds
-  alpine-kubectl-1.18:
-    needs: matrix-kubectl-1.18
-    if: github.event_name != 'schedule' && needs.matrix-kubectl-1.18.outputs.apk-enabled != 'false'
+  alpine-kubectl-1_18:
+    needs: matrix-kubectl-1_18
+    if: github.event_name != 'schedule' && needs.matrix-kubectl-1_18.outputs.apk-enabled != 'false'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -156,18 +156,18 @@ jobs:
           no-wait-for-sync: 'true'                          # Skip the waiting for package synchronisation (i.e. upload only)
 
   # Build packages with fpm package manager
-  package-kubectl-1.18:
-    needs: matrix-kubectl-1.18
+  package-kubectl-1_18:
+    needs: matrix-kubectl-1_18
     # Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
     # and would run with package-type empty if matrix is ["apk"]
     if: >
-      github.event_name != 'schedule' && needs.matrix-kubectl-1.18.outputs.package-enabled != 'false'
-      && needs.matrix-kubectl-1.18.outputs.package-matrix != '[]' && needs.matrix-kubectl-1.18.outputs.package-matrix != '["apk"]'
+      github.event_name != 'schedule' && needs.matrix-kubectl-1_18.outputs.package-enabled != 'false'
+      && needs.matrix-kubectl-1_18.outputs.package-matrix != '[]' && needs.matrix-kubectl-1_18.outputs.package-matrix != '["apk"]'
 
     strategy:
       matrix:
-        package-type: ${{ fromJSON(needs.matrix-kubectl-1.18.outputs.package-matrix) }}
-        arch: ${{ fromJSON(needs.matrix-kubectl-1.18.outputs.arch-matrix) }}
+        package-type: ${{ fromJSON(needs.matrix-kubectl-1_18.outputs.package-matrix) }}
+        arch: ${{ fromJSON(needs.matrix-kubectl-1_18.outputs.arch-matrix) }}
         exclude:
         - package-type: 'apk'
         include:
diff --git a/.github/workflows/kubectl-1.19.yml b/.github/workflows/kubectl-1.19.yml
index d99d03eb37..31545f85e0 100644
--- a/.github/workflows/kubectl-1.19.yml
+++ b/.github/workflows/kubectl-1.19.yml
@@ -49,7 +49,7 @@ jobs:
   # so each job must have a unique name for the rules to work properly.
   # See https://github.com/Mergifyio/mergify/discussions/5082
   # and https://github.com/Mergifyio/mergify/issues/5083
-  matrix-kubectl-1.19:
+  matrix-kubectl-1_19:
     if: github.event_name != 'schedule'
     runs-on: ubuntu-latest
     outputs:
@@ -74,9 +74,9 @@ jobs:
 
   # Build for alpine linux
   # Kept separate because it is old and slightly different than the other package builds
-  alpine-kubectl-1.19:
-    needs: matrix-kubectl-1.19
-    if: github.event_name != 'schedule' && needs.matrix-kubectl-1.19.outputs.apk-enabled != 'false'
+  alpine-kubectl-1_19:
+    needs: matrix-kubectl-1_19
+    if: github.event_name != 'schedule' && needs.matrix-kubectl-1_19.outputs.apk-enabled != 'false'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -156,18 +156,18 @@ jobs:
           no-wait-for-sync: 'true'                          # Skip the waiting for package synchronisation (i.e. upload only)
 
   # Build packages with fpm package manager
-  package-kubectl-1.19:
-    needs: matrix-kubectl-1.19
+  package-kubectl-1_19:
+    needs: matrix-kubectl-1_19
     # Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
     # and would run with package-type empty if matrix is ["apk"]
     if: >
-      github.event_name != 'schedule' && needs.matrix-kubectl-1.19.outputs.package-enabled != 'false'
-      && needs.matrix-kubectl-1.19.outputs.package-matrix != '[]' && needs.matrix-kubectl-1.19.outputs.package-matrix != '["apk"]'
+      github.event_name != 'schedule' && needs.matrix-kubectl-1_19.outputs.package-enabled != 'false'
+      && needs.matrix-kubectl-1_19.outputs.package-matrix != '[]' && needs.matrix-kubectl-1_19.outputs.package-matrix != '["apk"]'
 
     strategy:
       matrix:
-        package-type: ${{ fromJSON(needs.matrix-kubectl-1.19.outputs.package-matrix) }}
-        arch: ${{ fromJSON(needs.matrix-kubectl-1.19.outputs.arch-matrix) }}
+        package-type: ${{ fromJSON(needs.matrix-kubectl-1_19.outputs.package-matrix) }}
+        arch: ${{ fromJSON(needs.matrix-kubectl-1_19.outputs.arch-matrix) }}
         exclude:
         - package-type: 'apk'
         include:
diff --git a/.github/workflows/kubectl-1.20.yml b/.github/workflows/kubectl-1.20.yml
index dd34fde62c..75b64e5d38 100644
--- a/.github/workflows/kubectl-1.20.yml
+++ b/.github/workflows/kubectl-1.20.yml
@@ -49,7 +49,7 @@ jobs:
   # so each job must have a unique name for the rules to work properly.
   # See https://github.com/Mergifyio/mergify/discussions/5082
   # and https://github.com/Mergifyio/mergify/issues/5083
-  matrix-kubectl-1.20:
+  matrix-kubectl-1_20:
     if: github.event_name != 'schedule'
     runs-on: ubuntu-latest
     outputs:
@@ -74,9 +74,9 @@ jobs:
 
   # Build for alpine linux
   # Kept separate because it is old and slightly different than the other package builds
-  alpine-kubectl-1.20:
-    needs: matrix-kubectl-1.20
-    if: github.event_name != 'schedule' && needs.matrix-kubectl-1.20.outputs.apk-enabled != 'false'
+  alpine-kubectl-1_20:
+    needs: matrix-kubectl-1_20
+    if: github.event_name != 'schedule' && needs.matrix-kubectl-1_20.outputs.apk-enabled != 'false'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -156,18 +156,18 @@ jobs:
           no-wait-for-sync: 'true'                          # Skip the waiting for package synchronisation (i.e. upload only)
 
   # Build packages with fpm package manager
-  package-kubectl-1.20:
-    needs: matrix-kubectl-1.20
+  package-kubectl-1_20:
+    needs: matrix-kubectl-1_20
     # Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
     # and would run with package-type empty if matrix is ["apk"]
     if: >
-      github.event_name != 'schedule' && needs.matrix-kubectl-1.20.outputs.package-enabled != 'false'
-      && needs.matrix-kubectl-1.20.outputs.package-matrix != '[]' && needs.matrix-kubectl-1.20.outputs.package-matrix != '["apk"]'
+      github.event_name != 'schedule' && needs.matrix-kubectl-1_20.outputs.package-enabled != 'false'
+      && needs.matrix-kubectl-1_20.outputs.package-matrix != '[]' && needs.matrix-kubectl-1_20.outputs.package-matrix != '["apk"]'
 
     strategy:
       matrix:
-        package-type: ${{ fromJSON(needs.matrix-kubectl-1.20.outputs.package-matrix) }}
-        arch: ${{ fromJSON(needs.matrix-kubectl-1.20.outputs.arch-matrix) }}
+        package-type: ${{ fromJSON(needs.matrix-kubectl-1_20.outputs.package-matrix) }}
+        arch: ${{ fromJSON(needs.matrix-kubectl-1_20.outputs.arch-matrix) }}
         exclude:
         - package-type: 'apk'
         include:
diff --git a/.github/workflows/kubectl-1.21.yml b/.github/workflows/kubectl-1.21.yml
index 09e51d3ddf..6bb3dbba16 100644
--- a/.github/workflows/kubectl-1.21.yml
+++ b/.github/workflows/kubectl-1.21.yml
@@ -49,7 +49,7 @@ jobs:
   # so each job must have a unique name for the rules to work properly.
   # See https://github.com/Mergifyio/mergify/discussions/5082
   # and https://github.com/Mergifyio/mergify/issues/5083
-  matrix-kubectl-1.21:
+  matrix-kubectl-1_21:
     if: github.event_name != 'schedule'
     runs-on: ubuntu-latest
     outputs:
@@ -74,9 +74,9 @@ jobs:
 
   # Build for alpine linux
   # Kept separate because it is old and slightly different than the other package builds
-  alpine-kubectl-1.21:
-    needs: matrix-kubectl-1.21
-    if: github.event_name != 'schedule' && needs.matrix-kubectl-1.21.outputs.apk-enabled != 'false'
+  alpine-kubectl-1_21:
+    needs: matrix-kubectl-1_21
+    if: github.event_name != 'schedule' && needs.matrix-kubectl-1_21.outputs.apk-enabled != 'false'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -156,18 +156,18 @@ jobs:
           no-wait-for-sync: 'true'                          # Skip the waiting for package synchronisation (i.e. upload only)
 
   # Build packages with fpm package manager
-  package-kubectl-1.21:
-    needs: matrix-kubectl-1.21
+  package-kubectl-1_21:
+    needs: matrix-kubectl-1_21
     # Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
     # and would run with package-type empty if matrix is ["apk"]
     if: >
-      github.event_name != 'schedule' && needs.matrix-kubectl-1.21.outputs.package-enabled != 'false'
-      && needs.matrix-kubectl-1.21.outputs.package-matrix != '[]' && needs.matrix-kubectl-1.21.outputs.package-matrix != '["apk"]'
+      github.event_name != 'schedule' && needs.matrix-kubectl-1_21.outputs.package-enabled != 'false'
+      && needs.matrix-kubectl-1_21.outputs.package-matrix != '[]' && needs.matrix-kubectl-1_21.outputs.package-matrix != '["apk"]'
 
     strategy:
       matrix:
-        package-type: ${{ fromJSON(needs.matrix-kubectl-1.21.outputs.package-matrix) }}
-        arch: ${{ fromJSON(needs.matrix-kubectl-1.21.outputs.arch-matrix) }}
+        package-type: ${{ fromJSON(needs.matrix-kubectl-1_21.outputs.package-matrix) }}
+        arch: ${{ fromJSON(needs.matrix-kubectl-1_21.outputs.arch-matrix) }}
         exclude:
         - package-type: 'apk'
         include:
diff --git a/.github/workflows/kubectl-1.22.yml b/.github/workflows/kubectl-1.22.yml
index 8ba979716b..32d389ecab 100644
--- a/.github/workflows/kubectl-1.22.yml
+++ b/.github/workflows/kubectl-1.22.yml
@@ -49,7 +49,7 @@ jobs:
   # so each job must have a unique name for the rules to work properly.
   # See https://github.com/Mergifyio/mergify/discussions/5082
   # and https://github.com/Mergifyio/mergify/issues/5083
-  matrix-kubectl-1.22:
+  matrix-kubectl-1_22:
     if: github.event_name != 'schedule'
     runs-on: ubuntu-latest
     outputs:
@@ -74,9 +74,9 @@ jobs:
 
   # Build for alpine linux
   # Kept separate because it is old and slightly different than the other package builds
-  alpine-kubectl-1.22:
-    needs: matrix-kubectl-1.22
-    if: github.event_name != 'schedule' && needs.matrix-kubectl-1.22.outputs.apk-enabled != 'false'
+  alpine-kubectl-1_22:
+    needs: matrix-kubectl-1_22
+    if: github.event_name != 'schedule' && needs.matrix-kubectl-1_22.outputs.apk-enabled != 'false'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -156,18 +156,18 @@ jobs:
           no-wait-for-sync: 'true'                          # Skip the waiting for package synchronisation (i.e. upload only)
 
   # Build packages with fpm package manager
-  package-kubectl-1.22:
-    needs: matrix-kubectl-1.22
+  package-kubectl-1_22:
+    needs: matrix-kubectl-1_22
     # Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
     # and would run with package-type empty if matrix is ["apk"]
     if: >
-      github.event_name != 'schedule' && needs.matrix-kubectl-1.22.outputs.package-enabled != 'false'
-      && needs.matrix-kubectl-1.22.outputs.package-matrix != '[]' && needs.matrix-kubectl-1.22.outputs.package-matrix != '["apk"]'
+      github.event_name != 'schedule' && needs.matrix-kubectl-1_22.outputs.package-enabled != 'false'
+      && needs.matrix-kubectl-1_22.outputs.package-matrix != '[]' && needs.matrix-kubectl-1_22.outputs.package-matrix != '["apk"]'
 
     strategy:
       matrix:
-        package-type: ${{ fromJSON(needs.matrix-kubectl-1.22.outputs.package-matrix) }}
-        arch: ${{ fromJSON(needs.matrix-kubectl-1.22.outputs.arch-matrix) }}
+        package-type: ${{ fromJSON(needs.matrix-kubectl-1_22.outputs.package-matrix) }}
+        arch: ${{ fromJSON(needs.matrix-kubectl-1_22.outputs.arch-matrix) }}
         exclude:
         - package-type: 'apk'
         include:
diff --git a/.github/workflows/kubectl-1.23.yml b/.github/workflows/kubectl-1.23.yml
index 43dceca604..e3bbff7334 100644
--- a/.github/workflows/kubectl-1.23.yml
+++ b/.github/workflows/kubectl-1.23.yml
@@ -49,7 +49,7 @@ jobs:
   # so each job must have a unique name for the rules to work properly.
   # See https://github.com/Mergifyio/mergify/discussions/5082
   # and https://github.com/Mergifyio/mergify/issues/5083
-  matrix-kubectl-1.23:
+  matrix-kubectl-1_23:
     if: github.event_name != 'schedule'
     runs-on: ubuntu-latest
     outputs:
@@ -74,9 +74,9 @@ jobs:
 
   # Build for alpine linux
   # Kept separate because it is old and slightly different than the other package builds
-  alpine-kubectl-1.23:
-    needs: matrix-kubectl-1.23
-    if: github.event_name != 'schedule' && needs.matrix-kubectl-1.23.outputs.apk-enabled != 'false'
+  alpine-kubectl-1_23:
+    needs: matrix-kubectl-1_23
+    if: github.event_name != 'schedule' && needs.matrix-kubectl-1_23.outputs.apk-enabled != 'false'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -156,18 +156,18 @@ jobs:
           no-wait-for-sync: 'true'                          # Skip the waiting for package synchronisation (i.e. upload only)
 
   # Build packages with fpm package manager
-  package-kubectl-1.23:
-    needs: matrix-kubectl-1.23
+  package-kubectl-1_23:
+    needs: matrix-kubectl-1_23
     # Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
     # and would run with package-type empty if matrix is ["apk"]
     if: >
-      github.event_name != 'schedule' && needs.matrix-kubectl-1.23.outputs.package-enabled != 'false'
-      && needs.matrix-kubectl-1.23.outputs.package-matrix != '[]' && needs.matrix-kubectl-1.23.outputs.package-matrix != '["apk"]'
+      github.event_name != 'schedule' && needs.matrix-kubectl-1_23.outputs.package-enabled != 'false'
+      && needs.matrix-kubectl-1_23.outputs.package-matrix != '[]' && needs.matrix-kubectl-1_23.outputs.package-matrix != '["apk"]'
 
     strategy:
       matrix:
-        package-type: ${{ fromJSON(needs.matrix-kubectl-1.23.outputs.package-matrix) }}
-        arch: ${{ fromJSON(needs.matrix-kubectl-1.23.outputs.arch-matrix) }}
+        package-type: ${{ fromJSON(needs.matrix-kubectl-1_23.outputs.package-matrix) }}
+        arch: ${{ fromJSON(needs.matrix-kubectl-1_23.outputs.arch-matrix) }}
         exclude:
         - package-type: 'apk'
         include:
diff --git a/.github/workflows/kubectl-1.24.yml b/.github/workflows/kubectl-1.24.yml
index f159d35cc5..8a480ddb52 100644
--- a/.github/workflows/kubectl-1.24.yml
+++ b/.github/workflows/kubectl-1.24.yml
@@ -49,7 +49,7 @@ jobs:
   # so each job must have a unique name for the rules to work properly.
   # See https://github.com/Mergifyio/mergify/discussions/5082
   # and https://github.com/Mergifyio/mergify/issues/5083
-  matrix-kubectl-1.24:
+  matrix-kubectl-1_24:
     if: github.event_name != 'schedule'
     runs-on: ubuntu-latest
     outputs:
@@ -74,9 +74,9 @@ jobs:
 
   # Build for alpine linux
   # Kept separate because it is old and slightly different than the other package builds
-  alpine-kubectl-1.24:
-    needs: matrix-kubectl-1.24
-    if: github.event_name != 'schedule' && needs.matrix-kubectl-1.24.outputs.apk-enabled != 'false'
+  alpine-kubectl-1_24:
+    needs: matrix-kubectl-1_24
+    if: github.event_name != 'schedule' && needs.matrix-kubectl-1_24.outputs.apk-enabled != 'false'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -156,18 +156,18 @@ jobs:
           no-wait-for-sync: 'true'                          # Skip the waiting for package synchronisation (i.e. upload only)
 
   # Build packages with fpm package manager
-  package-kubectl-1.24:
-    needs: matrix-kubectl-1.24
+  package-kubectl-1_24:
+    needs: matrix-kubectl-1_24
     # Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
     # and would run with package-type empty if matrix is ["apk"]
     if: >
-      github.event_name != 'schedule' && needs.matrix-kubectl-1.24.outputs.package-enabled != 'false'
-      && needs.matrix-kubectl-1.24.outputs.package-matrix != '[]' && needs.matrix-kubectl-1.24.outputs.package-matrix != '["apk"]'
+      github.event_name != 'schedule' && needs.matrix-kubectl-1_24.outputs.package-enabled != 'false'
+      && needs.matrix-kubectl-1_24.outputs.package-matrix != '[]' && needs.matrix-kubectl-1_24.outputs.package-matrix != '["apk"]'
 
     strategy:
       matrix:
-        package-type: ${{ fromJSON(needs.matrix-kubectl-1.24.outputs.package-matrix) }}
-        arch: ${{ fromJSON(needs.matrix-kubectl-1.24.outputs.arch-matrix) }}
+        package-type: ${{ fromJSON(needs.matrix-kubectl-1_24.outputs.package-matrix) }}
+        arch: ${{ fromJSON(needs.matrix-kubectl-1_24.outputs.arch-matrix) }}
         exclude:
         - package-type: 'apk'
         include:
diff --git a/.github/workflows/kubectl-1.25.yml b/.github/workflows/kubectl-1.25.yml
index d9ddc1ba04..36a9f504fd 100644
--- a/.github/workflows/kubectl-1.25.yml
+++ b/.github/workflows/kubectl-1.25.yml
@@ -49,7 +49,7 @@ jobs:
   # so each job must have a unique name for the rules to work properly.
   # See https://github.com/Mergifyio/mergify/discussions/5082
   # and https://github.com/Mergifyio/mergify/issues/5083
-  matrix-kubectl-1.25:
+  matrix-kubectl-1_25:
     if: github.event_name != 'schedule'
     runs-on: ubuntu-latest
     outputs:
@@ -74,9 +74,9 @@ jobs:
 
   # Build for alpine linux
   # Kept separate because it is old and slightly different than the other package builds
-  alpine-kubectl-1.25:
-    needs: matrix-kubectl-1.25
-    if: github.event_name != 'schedule' && needs.matrix-kubectl-1.25.outputs.apk-enabled != 'false'
+  alpine-kubectl-1_25:
+    needs: matrix-kubectl-1_25
+    if: github.event_name != 'schedule' && needs.matrix-kubectl-1_25.outputs.apk-enabled != 'false'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -156,18 +156,18 @@ jobs:
           no-wait-for-sync: 'true'                          # Skip the waiting for package synchronisation (i.e. upload only)
 
   # Build packages with fpm package manager
-  package-kubectl-1.25:
-    needs: matrix-kubectl-1.25
+  package-kubectl-1_25:
+    needs: matrix-kubectl-1_25
     # Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
     # and would run with package-type empty if matrix is ["apk"]
     if: >
-      github.event_name != 'schedule' && needs.matrix-kubectl-1.25.outputs.package-enabled != 'false'
-      && needs.matrix-kubectl-1.25.outputs.package-matrix != '[]' && needs.matrix-kubectl-1.25.outputs.package-matrix != '["apk"]'
+      github.event_name != 'schedule' && needs.matrix-kubectl-1_25.outputs.package-enabled != 'false'
+      && needs.matrix-kubectl-1_25.outputs.package-matrix != '[]' && needs.matrix-kubectl-1_25.outputs.package-matrix != '["apk"]'
 
     strategy:
       matrix:
-        package-type: ${{ fromJSON(needs.matrix-kubectl-1.25.outputs.package-matrix) }}
-        arch: ${{ fromJSON(needs.matrix-kubectl-1.25.outputs.arch-matrix) }}
+        package-type: ${{ fromJSON(needs.matrix-kubectl-1_25.outputs.package-matrix) }}
+        arch: ${{ fromJSON(needs.matrix-kubectl-1_25.outputs.arch-matrix) }}
         exclude:
         - package-type: 'apk'
         include:
diff --git a/.github/workflows/kubectl-1.26.yml b/.github/workflows/kubectl-1.26.yml
index 3123d505a2..126c4645df 100644
--- a/.github/workflows/kubectl-1.26.yml
+++ b/.github/workflows/kubectl-1.26.yml
@@ -49,7 +49,7 @@ jobs:
   # so each job must have a unique name for the rules to work properly.
   # See https://github.com/Mergifyio/mergify/discussions/5082
   # and https://github.com/Mergifyio/mergify/issues/5083
-  matrix-kubectl-1.26:
+  matrix-kubectl-1_26:
     if: github.event_name != 'schedule'
     runs-on: ubuntu-latest
     outputs:
@@ -74,9 +74,9 @@ jobs:
 
   # Build for alpine linux
   # Kept separate because it is old and slightly different than the other package builds
-  alpine-kubectl-1.26:
-    needs: matrix-kubectl-1.26
-    if: github.event_name != 'schedule' && needs.matrix-kubectl-1.26.outputs.apk-enabled != 'false'
+  alpine-kubectl-1_26:
+    needs: matrix-kubectl-1_26
+    if: github.event_name != 'schedule' && needs.matrix-kubectl-1_26.outputs.apk-enabled != 'false'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -156,18 +156,18 @@ jobs:
           no-wait-for-sync: 'true'                          # Skip the waiting for package synchronisation (i.e. upload only)
 
   # Build packages with fpm package manager
-  package-kubectl-1.26:
-    needs: matrix-kubectl-1.26
+  package-kubectl-1_26:
+    needs: matrix-kubectl-1_26
     # Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
     # and would run with package-type empty if matrix is ["apk"]
     if: >
-      github.event_name != 'schedule' && needs.matrix-kubectl-1.26.outputs.package-enabled != 'false'
-      && needs.matrix-kubectl-1.26.outputs.package-matrix != '[]' && needs.matrix-kubectl-1.26.outputs.package-matrix != '["apk"]'
+      github.event_name != 'schedule' && needs.matrix-kubectl-1_26.outputs.package-enabled != 'false'
+      && needs.matrix-kubectl-1_26.outputs.package-matrix != '[]' && needs.matrix-kubectl-1_26.outputs.package-matrix != '["apk"]'
 
     strategy:
       matrix:
-        package-type: ${{ fromJSON(needs.matrix-kubectl-1.26.outputs.package-matrix) }}
-        arch: ${{ fromJSON(needs.matrix-kubectl-1.26.outputs.arch-matrix) }}
+        package-type: ${{ fromJSON(needs.matrix-kubectl-1_26.outputs.package-matrix) }}
+        arch: ${{ fromJSON(needs.matrix-kubectl-1_26.outputs.arch-matrix) }}
         exclude:
         - package-type: 'apk'
         include:
diff --git a/.github/workflows/kubectl-1.27.yml b/.github/workflows/kubectl-1.27.yml
index e0cc3cfe09..521e08b2b2 100644
--- a/.github/workflows/kubectl-1.27.yml
+++ b/.github/workflows/kubectl-1.27.yml
@@ -49,7 +49,7 @@ jobs:
   # so each job must have a unique name for the rules to work properly.
   # See https://github.com/Mergifyio/mergify/discussions/5082
   # and https://github.com/Mergifyio/mergify/issues/5083
-  matrix-kubectl-1.27:
+  matrix-kubectl-1_27:
     if: github.event_name != 'schedule'
     runs-on: ubuntu-latest
     outputs:
@@ -74,9 +74,9 @@ jobs:
 
   # Build for alpine linux
   # Kept separate because it is old and slightly different than the other package builds
-  alpine-kubectl-1.27:
-    needs: matrix-kubectl-1.27
-    if: github.event_name != 'schedule' && needs.matrix-kubectl-1.27.outputs.apk-enabled != 'false'
+  alpine-kubectl-1_27:
+    needs: matrix-kubectl-1_27
+    if: github.event_name != 'schedule' && needs.matrix-kubectl-1_27.outputs.apk-enabled != 'false'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -156,18 +156,18 @@ jobs:
           no-wait-for-sync: 'true'                          # Skip the waiting for package synchronisation (i.e. upload only)
 
   # Build packages with fpm package manager
-  package-kubectl-1.27:
-    needs: matrix-kubectl-1.27
+  package-kubectl-1_27:
+    needs: matrix-kubectl-1_27
     # Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
     # and would run with package-type empty if matrix is ["apk"]
     if: >
-      github.event_name != 'schedule' && needs.matrix-kubectl-1.27.outputs.package-enabled != 'false'
-      && needs.matrix-kubectl-1.27.outputs.package-matrix != '[]' && needs.matrix-kubectl-1.27.outputs.package-matrix != '["apk"]'
+      github.event_name != 'schedule' && needs.matrix-kubectl-1_27.outputs.package-enabled != 'false'
+      && needs.matrix-kubectl-1_27.outputs.package-matrix != '[]' && needs.matrix-kubectl-1_27.outputs.package-matrix != '["apk"]'
 
     strategy:
       matrix:
-        package-type: ${{ fromJSON(needs.matrix-kubectl-1.27.outputs.package-matrix) }}
-        arch: ${{ fromJSON(needs.matrix-kubectl-1.27.outputs.arch-matrix) }}
+        package-type: ${{ fromJSON(needs.matrix-kubectl-1_27.outputs.package-matrix) }}
+        arch: ${{ fromJSON(needs.matrix-kubectl-1_27.outputs.arch-matrix) }}
         exclude:
         - package-type: 'apk'
         include:
diff --git a/.github/workflows/kubectl-1.28.yml b/.github/workflows/kubectl-1.28.yml
index f57cde6c9e..08343f3ed4 100644
--- a/.github/workflows/kubectl-1.28.yml
+++ b/.github/workflows/kubectl-1.28.yml
@@ -49,7 +49,7 @@ jobs:
   # so each job must have a unique name for the rules to work properly.
   # See https://github.com/Mergifyio/mergify/discussions/5082
   # and https://github.com/Mergifyio/mergify/issues/5083
-  matrix-kubectl-1.28:
+  matrix-kubectl-1_28:
     if: github.event_name != 'schedule'
     runs-on: ubuntu-latest
     outputs:
@@ -74,9 +74,9 @@ jobs:
 
   # Build for alpine linux
   # Kept separate because it is old and slightly different than the other package builds
-  alpine-kubectl-1.28:
-    needs: matrix-kubectl-1.28
-    if: github.event_name != 'schedule' && needs.matrix-kubectl-1.28.outputs.apk-enabled != 'false'
+  alpine-kubectl-1_28:
+    needs: matrix-kubectl-1_28
+    if: github.event_name != 'schedule' && needs.matrix-kubectl-1_28.outputs.apk-enabled != 'false'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -156,18 +156,18 @@ jobs:
           no-wait-for-sync: 'true'                          # Skip the waiting for package synchronisation (i.e. upload only)
 
   # Build packages with fpm package manager
-  package-kubectl-1.28:
-    needs: matrix-kubectl-1.28
+  package-kubectl-1_28:
+    needs: matrix-kubectl-1_28
     # Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
     # and would run with package-type empty if matrix is ["apk"]
     if: >
-      github.event_name != 'schedule' && needs.matrix-kubectl-1.28.outputs.package-enabled != 'false'
-      && needs.matrix-kubectl-1.28.outputs.package-matrix != '[]' && needs.matrix-kubectl-1.28.outputs.package-matrix != '["apk"]'
+      github.event_name != 'schedule' && needs.matrix-kubectl-1_28.outputs.package-enabled != 'false'
+      && needs.matrix-kubectl-1_28.outputs.package-matrix != '[]' && needs.matrix-kubectl-1_28.outputs.package-matrix != '["apk"]'
 
     strategy:
       matrix:
-        package-type: ${{ fromJSON(needs.matrix-kubectl-1.28.outputs.package-matrix) }}
-        arch: ${{ fromJSON(needs.matrix-kubectl-1.28.outputs.arch-matrix) }}
+        package-type: ${{ fromJSON(needs.matrix-kubectl-1_28.outputs.package-matrix) }}
+        arch: ${{ fromJSON(needs.matrix-kubectl-1_28.outputs.arch-matrix) }}
         exclude:
         - package-type: 'apk'
         include:
diff --git a/.github/workflows/teleport-4.3.yml b/.github/workflows/teleport-4.3.yml
index 8f4a6ec4e5..73dd4e8be9 100644
--- a/.github/workflows/teleport-4.3.yml
+++ b/.github/workflows/teleport-4.3.yml
@@ -49,7 +49,7 @@ jobs:
   # so each job must have a unique name for the rules to work properly.
   # See https://github.com/Mergifyio/mergify/discussions/5082
   # and https://github.com/Mergifyio/mergify/issues/5083
-  matrix-teleport-4.3:
+  matrix-teleport-4_3:
     if: github.event_name != 'schedule'
     runs-on: ubuntu-latest
     outputs:
@@ -74,9 +74,9 @@ jobs:
 
   # Build for alpine linux
   # Kept separate because it is old and slightly different than the other package builds
-  alpine-teleport-4.3:
-    needs: matrix-teleport-4.3
-    if: github.event_name != 'schedule' && needs.matrix-teleport-4.3.outputs.apk-enabled != 'false'
+  alpine-teleport-4_3:
+    needs: matrix-teleport-4_3
+    if: github.event_name != 'schedule' && needs.matrix-teleport-4_3.outputs.apk-enabled != 'false'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -156,18 +156,18 @@ jobs:
           no-wait-for-sync: 'true'                          # Skip the waiting for package synchronisation (i.e. upload only)
 
   # Build packages with fpm package manager
-  package-teleport-4.3:
-    needs: matrix-teleport-4.3
+  package-teleport-4_3:
+    needs: matrix-teleport-4_3
     # Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
     # and would run with package-type empty if matrix is ["apk"]
     if: >
-      github.event_name != 'schedule' && needs.matrix-teleport-4.3.outputs.package-enabled != 'false'
-      && needs.matrix-teleport-4.3.outputs.package-matrix != '[]' && needs.matrix-teleport-4.3.outputs.package-matrix != '["apk"]'
+      github.event_name != 'schedule' && needs.matrix-teleport-4_3.outputs.package-enabled != 'false'
+      && needs.matrix-teleport-4_3.outputs.package-matrix != '[]' && needs.matrix-teleport-4_3.outputs.package-matrix != '["apk"]'
 
     strategy:
       matrix:
-        package-type: ${{ fromJSON(needs.matrix-teleport-4.3.outputs.package-matrix) }}
-        arch: ${{ fromJSON(needs.matrix-teleport-4.3.outputs.arch-matrix) }}
+        package-type: ${{ fromJSON(needs.matrix-teleport-4_3.outputs.package-matrix) }}
+        arch: ${{ fromJSON(needs.matrix-teleport-4_3.outputs.arch-matrix) }}
         exclude:
         - package-type: 'apk'
         include:
diff --git a/.github/workflows/teleport-4.4.yml b/.github/workflows/teleport-4.4.yml
index 8918b4ed49..640fcb8374 100644
--- a/.github/workflows/teleport-4.4.yml
+++ b/.github/workflows/teleport-4.4.yml
@@ -49,7 +49,7 @@ jobs:
   # so each job must have a unique name for the rules to work properly.
   # See https://github.com/Mergifyio/mergify/discussions/5082
   # and https://github.com/Mergifyio/mergify/issues/5083
-  matrix-teleport-4.4:
+  matrix-teleport-4_4:
     if: github.event_name != 'schedule'
     runs-on: ubuntu-latest
     outputs:
@@ -74,9 +74,9 @@ jobs:
 
   # Build for alpine linux
   # Kept separate because it is old and slightly different than the other package builds
-  alpine-teleport-4.4:
-    needs: matrix-teleport-4.4
-    if: github.event_name != 'schedule' && needs.matrix-teleport-4.4.outputs.apk-enabled != 'false'
+  alpine-teleport-4_4:
+    needs: matrix-teleport-4_4
+    if: github.event_name != 'schedule' && needs.matrix-teleport-4_4.outputs.apk-enabled != 'false'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -156,18 +156,18 @@ jobs:
           no-wait-for-sync: 'true'                          # Skip the waiting for package synchronisation (i.e. upload only)
 
   # Build packages with fpm package manager
-  package-teleport-4.4:
-    needs: matrix-teleport-4.4
+  package-teleport-4_4:
+    needs: matrix-teleport-4_4
     # Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
     # and would run with package-type empty if matrix is ["apk"]
     if: >
-      github.event_name != 'schedule' && needs.matrix-teleport-4.4.outputs.package-enabled != 'false'
-      && needs.matrix-teleport-4.4.outputs.package-matrix != '[]' && needs.matrix-teleport-4.4.outputs.package-matrix != '["apk"]'
+      github.event_name != 'schedule' && needs.matrix-teleport-4_4.outputs.package-enabled != 'false'
+      && needs.matrix-teleport-4_4.outputs.package-matrix != '[]' && needs.matrix-teleport-4_4.outputs.package-matrix != '["apk"]'
 
     strategy:
       matrix:
-        package-type: ${{ fromJSON(needs.matrix-teleport-4.4.outputs.package-matrix) }}
-        arch: ${{ fromJSON(needs.matrix-teleport-4.4.outputs.arch-matrix) }}
+        package-type: ${{ fromJSON(needs.matrix-teleport-4_4.outputs.package-matrix) }}
+        arch: ${{ fromJSON(needs.matrix-teleport-4_4.outputs.arch-matrix) }}
         exclude:
         - package-type: 'apk'
         include:
diff --git a/.github/workflows/teleport-5.0.yml b/.github/workflows/teleport-5.0.yml
index 151f0f77de..af0315b2e1 100644
--- a/.github/workflows/teleport-5.0.yml
+++ b/.github/workflows/teleport-5.0.yml
@@ -49,7 +49,7 @@ jobs:
   # so each job must have a unique name for the rules to work properly.
   # See https://github.com/Mergifyio/mergify/discussions/5082
   # and https://github.com/Mergifyio/mergify/issues/5083
-  matrix-teleport-5.0:
+  matrix-teleport-5_0:
     if: github.event_name != 'schedule'
     runs-on: ubuntu-latest
     outputs:
@@ -74,9 +74,9 @@ jobs:
 
   # Build for alpine linux
   # Kept separate because it is old and slightly different than the other package builds
-  alpine-teleport-5.0:
-    needs: matrix-teleport-5.0
-    if: github.event_name != 'schedule' && needs.matrix-teleport-5.0.outputs.apk-enabled != 'false'
+  alpine-teleport-5_0:
+    needs: matrix-teleport-5_0
+    if: github.event_name != 'schedule' && needs.matrix-teleport-5_0.outputs.apk-enabled != 'false'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -156,18 +156,18 @@ jobs:
           no-wait-for-sync: 'true'                          # Skip the waiting for package synchronisation (i.e. upload only)
 
   # Build packages with fpm package manager
-  package-teleport-5.0:
-    needs: matrix-teleport-5.0
+  package-teleport-5_0:
+    needs: matrix-teleport-5_0
     # Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
     # and would run with package-type empty if matrix is ["apk"]
     if: >
-      github.event_name != 'schedule' && needs.matrix-teleport-5.0.outputs.package-enabled != 'false'
-      && needs.matrix-teleport-5.0.outputs.package-matrix != '[]' && needs.matrix-teleport-5.0.outputs.package-matrix != '["apk"]'
+      github.event_name != 'schedule' && needs.matrix-teleport-5_0.outputs.package-enabled != 'false'
+      && needs.matrix-teleport-5_0.outputs.package-matrix != '[]' && needs.matrix-teleport-5_0.outputs.package-matrix != '["apk"]'
 
     strategy:
       matrix:
-        package-type: ${{ fromJSON(needs.matrix-teleport-5.0.outputs.package-matrix) }}
-        arch: ${{ fromJSON(needs.matrix-teleport-5.0.outputs.arch-matrix) }}
+        package-type: ${{ fromJSON(needs.matrix-teleport-5_0.outputs.package-matrix) }}
+        arch: ${{ fromJSON(needs.matrix-teleport-5_0.outputs.arch-matrix) }}
         exclude:
         - package-type: 'apk'
         include:
diff --git a/.github/workflows/terraform-0.11.yml b/.github/workflows/terraform-0.11.yml
index 85bd2af755..f5ddf3ab6b 100644
--- a/.github/workflows/terraform-0.11.yml
+++ b/.github/workflows/terraform-0.11.yml
@@ -49,7 +49,7 @@ jobs:
   # so each job must have a unique name for the rules to work properly.
   # See https://github.com/Mergifyio/mergify/discussions/5082
   # and https://github.com/Mergifyio/mergify/issues/5083
-  matrix-terraform-0.11:
+  matrix-terraform-0_11:
     if: github.event_name != 'schedule'
     runs-on: ubuntu-latest
     outputs:
@@ -74,9 +74,9 @@ jobs:
 
   # Build for alpine linux
   # Kept separate because it is old and slightly different than the other package builds
-  alpine-terraform-0.11:
-    needs: matrix-terraform-0.11
-    if: github.event_name != 'schedule' && needs.matrix-terraform-0.11.outputs.apk-enabled != 'false'
+  alpine-terraform-0_11:
+    needs: matrix-terraform-0_11
+    if: github.event_name != 'schedule' && needs.matrix-terraform-0_11.outputs.apk-enabled != 'false'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -156,18 +156,18 @@ jobs:
           no-wait-for-sync: 'true'                          # Skip the waiting for package synchronisation (i.e. upload only)
 
   # Build packages with fpm package manager
-  package-terraform-0.11:
-    needs: matrix-terraform-0.11
+  package-terraform-0_11:
+    needs: matrix-terraform-0_11
     # Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
     # and would run with package-type empty if matrix is ["apk"]
     if: >
-      github.event_name != 'schedule' && needs.matrix-terraform-0.11.outputs.package-enabled != 'false'
-      && needs.matrix-terraform-0.11.outputs.package-matrix != '[]' && needs.matrix-terraform-0.11.outputs.package-matrix != '["apk"]'
+      github.event_name != 'schedule' && needs.matrix-terraform-0_11.outputs.package-enabled != 'false'
+      && needs.matrix-terraform-0_11.outputs.package-matrix != '[]' && needs.matrix-terraform-0_11.outputs.package-matrix != '["apk"]'
 
     strategy:
       matrix:
-        package-type: ${{ fromJSON(needs.matrix-terraform-0.11.outputs.package-matrix) }}
-        arch: ${{ fromJSON(needs.matrix-terraform-0.11.outputs.arch-matrix) }}
+        package-type: ${{ fromJSON(needs.matrix-terraform-0_11.outputs.package-matrix) }}
+        arch: ${{ fromJSON(needs.matrix-terraform-0_11.outputs.arch-matrix) }}
         exclude:
         - package-type: 'apk'
         include:
diff --git a/.github/workflows/terraform-0.12.yml b/.github/workflows/terraform-0.12.yml
index d53993ebeb..a4a7c2f8a9 100644
--- a/.github/workflows/terraform-0.12.yml
+++ b/.github/workflows/terraform-0.12.yml
@@ -49,7 +49,7 @@ jobs:
   # so each job must have a unique name for the rules to work properly.
   # See https://github.com/Mergifyio/mergify/discussions/5082
   # and https://github.com/Mergifyio/mergify/issues/5083
-  matrix-terraform-0.12:
+  matrix-terraform-0_12:
     if: github.event_name != 'schedule'
     runs-on: ubuntu-latest
     outputs:
@@ -74,9 +74,9 @@ jobs:
 
   # Build for alpine linux
   # Kept separate because it is old and slightly different than the other package builds
-  alpine-terraform-0.12:
-    needs: matrix-terraform-0.12
-    if: github.event_name != 'schedule' && needs.matrix-terraform-0.12.outputs.apk-enabled != 'false'
+  alpine-terraform-0_12:
+    needs: matrix-terraform-0_12
+    if: github.event_name != 'schedule' && needs.matrix-terraform-0_12.outputs.apk-enabled != 'false'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -156,18 +156,18 @@ jobs:
           no-wait-for-sync: 'true'                          # Skip the waiting for package synchronisation (i.e. upload only)
 
   # Build packages with fpm package manager
-  package-terraform-0.12:
-    needs: matrix-terraform-0.12
+  package-terraform-0_12:
+    needs: matrix-terraform-0_12
     # Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
     # and would run with package-type empty if matrix is ["apk"]
     if: >
-      github.event_name != 'schedule' && needs.matrix-terraform-0.12.outputs.package-enabled != 'false'
-      && needs.matrix-terraform-0.12.outputs.package-matrix != '[]' && needs.matrix-terraform-0.12.outputs.package-matrix != '["apk"]'
+      github.event_name != 'schedule' && needs.matrix-terraform-0_12.outputs.package-enabled != 'false'
+      && needs.matrix-terraform-0_12.outputs.package-matrix != '[]' && needs.matrix-terraform-0_12.outputs.package-matrix != '["apk"]'
 
     strategy:
       matrix:
-        package-type: ${{ fromJSON(needs.matrix-terraform-0.12.outputs.package-matrix) }}
-        arch: ${{ fromJSON(needs.matrix-terraform-0.12.outputs.arch-matrix) }}
+        package-type: ${{ fromJSON(needs.matrix-terraform-0_12.outputs.package-matrix) }}
+        arch: ${{ fromJSON(needs.matrix-terraform-0_12.outputs.arch-matrix) }}
         exclude:
         - package-type: 'apk'
         include:
diff --git a/.github/workflows/terraform-0.13.yml b/.github/workflows/terraform-0.13.yml
index 505bdc776d..edbcfd4d31 100644
--- a/.github/workflows/terraform-0.13.yml
+++ b/.github/workflows/terraform-0.13.yml
@@ -49,7 +49,7 @@ jobs:
   # so each job must have a unique name for the rules to work properly.
   # See https://github.com/Mergifyio/mergify/discussions/5082
   # and https://github.com/Mergifyio/mergify/issues/5083
-  matrix-terraform-0.13:
+  matrix-terraform-0_13:
     if: github.event_name != 'schedule'
     runs-on: ubuntu-latest
     outputs:
@@ -74,9 +74,9 @@ jobs:
 
   # Build for alpine linux
   # Kept separate because it is old and slightly different than the other package builds
-  alpine-terraform-0.13:
-    needs: matrix-terraform-0.13
-    if: github.event_name != 'schedule' && needs.matrix-terraform-0.13.outputs.apk-enabled != 'false'
+  alpine-terraform-0_13:
+    needs: matrix-terraform-0_13
+    if: github.event_name != 'schedule' && needs.matrix-terraform-0_13.outputs.apk-enabled != 'false'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -156,18 +156,18 @@ jobs:
           no-wait-for-sync: 'true'                          # Skip the waiting for package synchronisation (i.e. upload only)
 
   # Build packages with fpm package manager
-  package-terraform-0.13:
-    needs: matrix-terraform-0.13
+  package-terraform-0_13:
+    needs: matrix-terraform-0_13
     # Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
     # and would run with package-type empty if matrix is ["apk"]
     if: >
-      github.event_name != 'schedule' && needs.matrix-terraform-0.13.outputs.package-enabled != 'false'
-      && needs.matrix-terraform-0.13.outputs.package-matrix != '[]' && needs.matrix-terraform-0.13.outputs.package-matrix != '["apk"]'
+      github.event_name != 'schedule' && needs.matrix-terraform-0_13.outputs.package-enabled != 'false'
+      && needs.matrix-terraform-0_13.outputs.package-matrix != '[]' && needs.matrix-terraform-0_13.outputs.package-matrix != '["apk"]'
 
     strategy:
       matrix:
-        package-type: ${{ fromJSON(needs.matrix-terraform-0.13.outputs.package-matrix) }}
-        arch: ${{ fromJSON(needs.matrix-terraform-0.13.outputs.arch-matrix) }}
+        package-type: ${{ fromJSON(needs.matrix-terraform-0_13.outputs.package-matrix) }}
+        arch: ${{ fromJSON(needs.matrix-terraform-0_13.outputs.arch-matrix) }}
         exclude:
         - package-type: 'apk'
         include:
diff --git a/.github/workflows/terraform-0.14.yml b/.github/workflows/terraform-0.14.yml
index 867151c412..ab53749685 100644
--- a/.github/workflows/terraform-0.14.yml
+++ b/.github/workflows/terraform-0.14.yml
@@ -49,7 +49,7 @@ jobs:
   # so each job must have a unique name for the rules to work properly.
   # See https://github.com/Mergifyio/mergify/discussions/5082
   # and https://github.com/Mergifyio/mergify/issues/5083
-  matrix-terraform-0.14:
+  matrix-terraform-0_14:
     if: github.event_name != 'schedule'
     runs-on: ubuntu-latest
     outputs:
@@ -74,9 +74,9 @@ jobs:
 
   # Build for alpine linux
   # Kept separate because it is old and slightly different than the other package builds
-  alpine-terraform-0.14:
-    needs: matrix-terraform-0.14
-    if: github.event_name != 'schedule' && needs.matrix-terraform-0.14.outputs.apk-enabled != 'false'
+  alpine-terraform-0_14:
+    needs: matrix-terraform-0_14
+    if: github.event_name != 'schedule' && needs.matrix-terraform-0_14.outputs.apk-enabled != 'false'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -156,18 +156,18 @@ jobs:
           no-wait-for-sync: 'true'                          # Skip the waiting for package synchronisation (i.e. upload only)
 
   # Build packages with fpm package manager
-  package-terraform-0.14:
-    needs: matrix-terraform-0.14
+  package-terraform-0_14:
+    needs: matrix-terraform-0_14
     # Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
     # and would run with package-type empty if matrix is ["apk"]
     if: >
-      github.event_name != 'schedule' && needs.matrix-terraform-0.14.outputs.package-enabled != 'false'
-      && needs.matrix-terraform-0.14.outputs.package-matrix != '[]' && needs.matrix-terraform-0.14.outputs.package-matrix != '["apk"]'
+      github.event_name != 'schedule' && needs.matrix-terraform-0_14.outputs.package-enabled != 'false'
+      && needs.matrix-terraform-0_14.outputs.package-matrix != '[]' && needs.matrix-terraform-0_14.outputs.package-matrix != '["apk"]'
 
     strategy:
       matrix:
-        package-type: ${{ fromJSON(needs.matrix-terraform-0.14.outputs.package-matrix) }}
-        arch: ${{ fromJSON(needs.matrix-terraform-0.14.outputs.arch-matrix) }}
+        package-type: ${{ fromJSON(needs.matrix-terraform-0_14.outputs.package-matrix) }}
+        arch: ${{ fromJSON(needs.matrix-terraform-0_14.outputs.arch-matrix) }}
         exclude:
         - package-type: 'apk'
         include:
diff --git a/.github/workflows/terraform-0.15.yml b/.github/workflows/terraform-0.15.yml
index 15e1ff426f..9bc70218b8 100644
--- a/.github/workflows/terraform-0.15.yml
+++ b/.github/workflows/terraform-0.15.yml
@@ -49,7 +49,7 @@ jobs:
   # so each job must have a unique name for the rules to work properly.
   # See https://github.com/Mergifyio/mergify/discussions/5082
   # and https://github.com/Mergifyio/mergify/issues/5083
-  matrix-terraform-0.15:
+  matrix-terraform-0_15:
     if: github.event_name != 'schedule'
     runs-on: ubuntu-latest
     outputs:
@@ -74,9 +74,9 @@ jobs:
 
   # Build for alpine linux
   # Kept separate because it is old and slightly different than the other package builds
-  alpine-terraform-0.15:
-    needs: matrix-terraform-0.15
-    if: github.event_name != 'schedule' && needs.matrix-terraform-0.15.outputs.apk-enabled != 'false'
+  alpine-terraform-0_15:
+    needs: matrix-terraform-0_15
+    if: github.event_name != 'schedule' && needs.matrix-terraform-0_15.outputs.apk-enabled != 'false'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -156,18 +156,18 @@ jobs:
           no-wait-for-sync: 'true'                          # Skip the waiting for package synchronisation (i.e. upload only)
 
   # Build packages with fpm package manager
-  package-terraform-0.15:
-    needs: matrix-terraform-0.15
+  package-terraform-0_15:
+    needs: matrix-terraform-0_15
     # Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
     # and would run with package-type empty if matrix is ["apk"]
     if: >
-      github.event_name != 'schedule' && needs.matrix-terraform-0.15.outputs.package-enabled != 'false'
-      && needs.matrix-terraform-0.15.outputs.package-matrix != '[]' && needs.matrix-terraform-0.15.outputs.package-matrix != '["apk"]'
+      github.event_name != 'schedule' && needs.matrix-terraform-0_15.outputs.package-enabled != 'false'
+      && needs.matrix-terraform-0_15.outputs.package-matrix != '[]' && needs.matrix-terraform-0_15.outputs.package-matrix != '["apk"]'
 
     strategy:
       matrix:
-        package-type: ${{ fromJSON(needs.matrix-terraform-0.15.outputs.package-matrix) }}
-        arch: ${{ fromJSON(needs.matrix-terraform-0.15.outputs.arch-matrix) }}
+        package-type: ${{ fromJSON(needs.matrix-terraform-0_15.outputs.package-matrix) }}
+        arch: ${{ fromJSON(needs.matrix-terraform-0_15.outputs.arch-matrix) }}
         exclude:
         - package-type: 'apk'
         include:
diff --git a/.github/workflows/terraform_0.11.yml b/.github/workflows/terraform_0.11.yml
index d4934725a0..8983c2e665 100644
--- a/.github/workflows/terraform_0.11.yml
+++ b/.github/workflows/terraform_0.11.yml
@@ -49,7 +49,7 @@ jobs:
   # so each job must have a unique name for the rules to work properly.
   # See https://github.com/Mergifyio/mergify/discussions/5082
   # and https://github.com/Mergifyio/mergify/issues/5083
-  matrix-terraform_0.11:
+  matrix-terraform_0_11:
     if: github.event_name != 'schedule'
     runs-on: ubuntu-latest
     outputs:
@@ -74,9 +74,9 @@ jobs:
 
   # Build for alpine linux
   # Kept separate because it is old and slightly different than the other package builds
-  alpine-terraform_0.11:
-    needs: matrix-terraform_0.11
-    if: github.event_name != 'schedule' && needs.matrix-terraform_0.11.outputs.apk-enabled != 'false'
+  alpine-terraform_0_11:
+    needs: matrix-terraform_0_11
+    if: github.event_name != 'schedule' && needs.matrix-terraform_0_11.outputs.apk-enabled != 'false'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -156,18 +156,18 @@ jobs:
           no-wait-for-sync: 'true'                          # Skip the waiting for package synchronisation (i.e. upload only)
 
   # Build packages with fpm package manager
-  package-terraform_0.11:
-    needs: matrix-terraform_0.11
+  package-terraform_0_11:
+    needs: matrix-terraform_0_11
     # Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
     # and would run with package-type empty if matrix is ["apk"]
     if: >
-      github.event_name != 'schedule' && needs.matrix-terraform_0.11.outputs.package-enabled != 'false'
-      && needs.matrix-terraform_0.11.outputs.package-matrix != '[]' && needs.matrix-terraform_0.11.outputs.package-matrix != '["apk"]'
+      github.event_name != 'schedule' && needs.matrix-terraform_0_11.outputs.package-enabled != 'false'
+      && needs.matrix-terraform_0_11.outputs.package-matrix != '[]' && needs.matrix-terraform_0_11.outputs.package-matrix != '["apk"]'
 
     strategy:
       matrix:
-        package-type: ${{ fromJSON(needs.matrix-terraform_0.11.outputs.package-matrix) }}
-        arch: ${{ fromJSON(needs.matrix-terraform_0.11.outputs.arch-matrix) }}
+        package-type: ${{ fromJSON(needs.matrix-terraform_0_11.outputs.package-matrix) }}
+        arch: ${{ fromJSON(needs.matrix-terraform_0_11.outputs.arch-matrix) }}
         exclude:
         - package-type: 'apk'
         include:
diff --git a/.github/workflows/terraform_0.12.yml b/.github/workflows/terraform_0.12.yml
index a857da5fc4..e8d398c948 100644
--- a/.github/workflows/terraform_0.12.yml
+++ b/.github/workflows/terraform_0.12.yml
@@ -49,7 +49,7 @@ jobs:
   # so each job must have a unique name for the rules to work properly.
   # See https://github.com/Mergifyio/mergify/discussions/5082
   # and https://github.com/Mergifyio/mergify/issues/5083
-  matrix-terraform_0.12:
+  matrix-terraform_0_12:
     if: github.event_name != 'schedule'
     runs-on: ubuntu-latest
     outputs:
@@ -74,9 +74,9 @@ jobs:
 
   # Build for alpine linux
   # Kept separate because it is old and slightly different than the other package builds
-  alpine-terraform_0.12:
-    needs: matrix-terraform_0.12
-    if: github.event_name != 'schedule' && needs.matrix-terraform_0.12.outputs.apk-enabled != 'false'
+  alpine-terraform_0_12:
+    needs: matrix-terraform_0_12
+    if: github.event_name != 'schedule' && needs.matrix-terraform_0_12.outputs.apk-enabled != 'false'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -156,18 +156,18 @@ jobs:
           no-wait-for-sync: 'true'                          # Skip the waiting for package synchronisation (i.e. upload only)
 
   # Build packages with fpm package manager
-  package-terraform_0.12:
-    needs: matrix-terraform_0.12
+  package-terraform_0_12:
+    needs: matrix-terraform_0_12
     # Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
     # and would run with package-type empty if matrix is ["apk"]
     if: >
-      github.event_name != 'schedule' && needs.matrix-terraform_0.12.outputs.package-enabled != 'false'
-      && needs.matrix-terraform_0.12.outputs.package-matrix != '[]' && needs.matrix-terraform_0.12.outputs.package-matrix != '["apk"]'
+      github.event_name != 'schedule' && needs.matrix-terraform_0_12.outputs.package-enabled != 'false'
+      && needs.matrix-terraform_0_12.outputs.package-matrix != '[]' && needs.matrix-terraform_0_12.outputs.package-matrix != '["apk"]'
 
     strategy:
       matrix:
-        package-type: ${{ fromJSON(needs.matrix-terraform_0.12.outputs.package-matrix) }}
-        arch: ${{ fromJSON(needs.matrix-terraform_0.12.outputs.arch-matrix) }}
+        package-type: ${{ fromJSON(needs.matrix-terraform_0_12.outputs.package-matrix) }}
+        arch: ${{ fromJSON(needs.matrix-terraform_0_12.outputs.arch-matrix) }}
         exclude:
         - package-type: 'apk'
         include:
diff --git a/.github/workflows/terraform_0.13.yml b/.github/workflows/terraform_0.13.yml
index d13af2352d..ea62e56e74 100644
--- a/.github/workflows/terraform_0.13.yml
+++ b/.github/workflows/terraform_0.13.yml
@@ -49,7 +49,7 @@ jobs:
   # so each job must have a unique name for the rules to work properly.
   # See https://github.com/Mergifyio/mergify/discussions/5082
   # and https://github.com/Mergifyio/mergify/issues/5083
-  matrix-terraform_0.13:
+  matrix-terraform_0_13:
     if: github.event_name != 'schedule'
     runs-on: ubuntu-latest
     outputs:
@@ -74,9 +74,9 @@ jobs:
 
   # Build for alpine linux
   # Kept separate because it is old and slightly different than the other package builds
-  alpine-terraform_0.13:
-    needs: matrix-terraform_0.13
-    if: github.event_name != 'schedule' && needs.matrix-terraform_0.13.outputs.apk-enabled != 'false'
+  alpine-terraform_0_13:
+    needs: matrix-terraform_0_13
+    if: github.event_name != 'schedule' && needs.matrix-terraform_0_13.outputs.apk-enabled != 'false'
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -156,18 +156,18 @@ jobs:
           no-wait-for-sync: 'true'                          # Skip the waiting for package synchronisation (i.e. upload only)
 
   # Build packages with fpm package manager
-  package-terraform_0.13:
-    needs: matrix-terraform_0.13
+  package-terraform_0_13:
+    needs: matrix-terraform_0_13
     # Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
     # and would run with package-type empty if matrix is ["apk"]
     if: >
-      github.event_name != 'schedule' && needs.matrix-terraform_0.13.outputs.package-enabled != 'false'
-      && needs.matrix-terraform_0.13.outputs.package-matrix != '[]' && needs.matrix-terraform_0.13.outputs.package-matrix != '["apk"]'
+      github.event_name != 'schedule' && needs.matrix-terraform_0_13.outputs.package-enabled != 'false'
+      && needs.matrix-terraform_0_13.outputs.package-matrix != '[]' && needs.matrix-terraform_0_13.outputs.package-matrix != '["apk"]'
 
     strategy:
       matrix:
-        package-type: ${{ fromJSON(needs.matrix-terraform_0.13.outputs.package-matrix) }}
-        arch: ${{ fromJSON(needs.matrix-terraform_0.13.outputs.arch-matrix) }}
+        package-type: ${{ fromJSON(needs.matrix-terraform_0_13.outputs.package-matrix) }}
+        arch: ${{ fromJSON(needs.matrix-terraform_0_13.outputs.arch-matrix) }}
         exclude:
         - package-type: 'apk'
         include:
diff --git a/Makefile b/Makefile
index d41c4139cd..78af4d6e9b 100644
--- a/Makefile
+++ b/Makefile
@@ -137,3 +137,8 @@ update/%:
 	rm -f vendor/$*/VERSION
 	make -C vendor/$* update
 	make readme
+
+nuru/%.yaml:
+	@echo "* is $*"
+	@echo "subst is $(subst .,_,$*)"
+
diff --git a/README.md b/README.md
index 01fccb13ad..6fefb3da75 100644
--- a/README.md
+++ b/README.md
@@ -379,7 +379,7 @@ Here are some solutions to several common problems that may occur when adding a
 [![direnv](https://github.com/cloudposse/packages/workflows/direnv/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Adirenv) | 2.32.3     | Unclutter your .profile
 [![doctl](https://github.com/cloudposse/packages/workflows/doctl/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Adoctl) | 1.97.1     | A command line tool for DigitalOcean services
 [![ec2-instance-selector](https://github.com/cloudposse/packages/workflows/ec2-instance-selector/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Aec2-instance-selector) | 2.4.1      | A CLI tool and go library which recommends instance types based on resource criteria like vcpus and memory
-[![ecspresso](https://github.com/cloudposse/packages/workflows/ecspresso/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Aecspresso) | 2.2.3      | Ecspresso is a deployment tool for Amazon ECS
+[![ecspresso](https://github.com/cloudposse/packages/workflows/ecspresso/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Aecspresso) | 2.2.2      | Ecspresso is a deployment tool for Amazon ECS
 [![emailcli](https://github.com/cloudposse/packages/workflows/emailcli/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Aemailcli) | 1.0.3      | Command line email sending client written in Go.
 [![envcli](https://github.com/cloudposse/packages/workflows/envcli/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Aenvcli) | 0.7.1      | A simple wrapper that allows you to run commands within ethereal docker containers
 [![fetch](https://github.com/cloudposse/packages/workflows/fetch/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Afetch) | 0.4.6      | fetch makes it easy to download files, folders, and release assets from a specific public git commit, branch, or tag
diff --git a/docs/badges.md b/docs/badges.md
index 6a890785d6..34636a7b92 100644
--- a/docs/badges.md
+++ b/docs/badges.md
@@ -25,7 +25,7 @@
 [![direnv](https://github.com/cloudposse/packages/workflows/direnv/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Adirenv) | 2.32.3     | Unclutter your .profile
 [![doctl](https://github.com/cloudposse/packages/workflows/doctl/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Adoctl) | 1.97.1     | A command line tool for DigitalOcean services
 [![ec2-instance-selector](https://github.com/cloudposse/packages/workflows/ec2-instance-selector/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Aec2-instance-selector) | 2.4.1      | A CLI tool and go library which recommends instance types based on resource criteria like vcpus and memory
-[![ecspresso](https://github.com/cloudposse/packages/workflows/ecspresso/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Aecspresso) | 2.2.3      | Ecspresso is a deployment tool for Amazon ECS
+[![ecspresso](https://github.com/cloudposse/packages/workflows/ecspresso/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Aecspresso) | 2.2.2      | Ecspresso is a deployment tool for Amazon ECS
 [![emailcli](https://github.com/cloudposse/packages/workflows/emailcli/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Aemailcli) | 1.0.3      | Command line email sending client written in Go.
 [![envcli](https://github.com/cloudposse/packages/workflows/envcli/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Aenvcli) | 0.7.1      | A simple wrapper that allows you to run commands within ethereal docker containers
 [![fetch](https://github.com/cloudposse/packages/workflows/fetch/badge.svg?branch=master)](https://github.com/cloudposse/packages/actions?query=workflow%3Afetch) | 0.4.6      | fetch makes it easy to download files, folders, and release assets from a specific public git commit, branch, or tag
diff --git a/docs/targets.md b/docs/targets.md
index 411d764ff1..bcb5f200a6 100644
--- a/docs/targets.md
+++ b/docs/targets.md
@@ -28,7 +28,7 @@ direnv                    2.32.3     Unclutter your .profile
 doctl                     1.97.1     A command line tool for DigitalOcean services
 duffle                    OBSOLETE   CNAB installer
 ec2-instance-selector     2.4.1      A CLI tool and go library which recommends instance types based on resource criteria like vcpus and memory
-ecspresso                 2.2.3      Ecspresso is a deployment tool for Amazon ECS
+ecspresso                 2.2.2      Ecspresso is a deployment tool for Amazon ECS
 emailcli*                 1.0.3      Command line email sending client written in Go.
 envcli*                   0.7.1      A simple wrapper that allows you to run commands within ethereal docker containers
 fargate                   OBSOLETE   (OBSOLETE, use aws/copilot-cli instead) CLI for AWS Fargate
diff --git a/vendor/ecspresso/VERSION b/vendor/ecspresso/VERSION
index 585940699b..b1b25a5ffa 100644
--- a/vendor/ecspresso/VERSION
+++ b/vendor/ecspresso/VERSION
@@ -1 +1 @@
-2.2.3
+2.2.2
diff --git a/vendor/terraform-0.11/Makefile b/vendor/terraform-0.11/Makefile
index 080883e8b5..a55a6d0467 100644
--- a/vendor/terraform-0.11/Makefile
+++ b/vendor/terraform-0.11/Makefile
@@ -15,6 +15,9 @@ export APKBUILD_DEPENDS += dpkg
 export APKBUILD_INSTALL_SCRIPTS = $(PACKAGE_NAME).post-install $(PACKAGE_NAME).post-deinstall
 export INSTALL_DIR = /usr/share/${MASTER_PACKAGE_NAME}/${MAJOR_VERSION}/bin
 
+# terraform 0.11 is past end-of-life and no updates should be attempted.
+export AUTO_UPDATE_ENABLED = false
+
 install:
 	mkdir -p $(TMP)/$(PACKAGE_NAME)
 	$(CURL) -o $(TMP)/$(PACKAGE_NAME)/$(PACKAGE_NAME).zip $(DOWNLOAD_URL)
diff --git a/vendor/terraform-0.12/Makefile b/vendor/terraform-0.12/Makefile
index 7889dded1a..b17be51069 100644
--- a/vendor/terraform-0.12/Makefile
+++ b/vendor/terraform-0.12/Makefile
@@ -15,6 +15,9 @@ export APKBUILD_DEPENDS += dpkg
 export APKBUILD_INSTALL_SCRIPTS = $(PACKAGE_NAME).post-install $(PACKAGE_NAME).post-deinstall
 export INSTALL_DIR = /usr/share/${MASTER_PACKAGE_NAME}/${MAJOR_VERSION}/bin
 
+# terraform 0.12 is past end-of-life and no updates should be attempted.
+export AUTO_UPDATE_ENABLED = false
+
 install:
 	mkdir -p $(TMP)/$(PACKAGE_NAME)
 	$(CURL) -o $(TMP)/$(PACKAGE_NAME)/$(PACKAGE_NAME).zip $(DOWNLOAD_URL)
diff --git a/vendor/terraform-0.13/Makefile b/vendor/terraform-0.13/Makefile
index 74e8fae9a4..f6d4a6641f 100644
--- a/vendor/terraform-0.13/Makefile
+++ b/vendor/terraform-0.13/Makefile
@@ -15,6 +15,9 @@ export APKBUILD_DEPENDS += dpkg
 export APKBUILD_INSTALL_SCRIPTS = $(PACKAGE_NAME).post-install $(PACKAGE_NAME).post-deinstall
 export INSTALL_DIR = /usr/share/${MASTER_PACKAGE_NAME}/${MAJOR_VERSION}/bin
 
+# terraform 0.13 is past end-of-life and no updates should be attempted.
+export AUTO_UPDATE_ENABLED = false
+
 install:
 	mkdir -p $(TMP)/$(PACKAGE_NAME)
 	$(CURL) -o $(TMP)/$(PACKAGE_NAME)/$(PACKAGE_NAME).zip $(DOWNLOAD_URL)
diff --git a/vendor/terraform_0.11/Makefile b/vendor/terraform_0.11/Makefile
index 3c30bdd660..b11cc5de0b 100644
--- a/vendor/terraform_0.11/Makefile
+++ b/vendor/terraform_0.11/Makefile
@@ -11,6 +11,9 @@ include ../../tasks/Makefile.vendor_includes
 export APK_BUILD_TEMPLATE ?= APKBUILD.github-binary
 export DOWNLOAD_URL ?= https://releases.hashicorp.com/terraform/$(PACKAGE_VERSION)/terraform_$(PACKAGE_VERSION)_$(OS)_$(ARCH).zip
 
+# terraform 0.11 is past end-of-life and no updates should be attempted.
+export AUTO_UPDATE_ENABLED = false
+
 install:
 	mkdir -p $(TMP)/$(PACKAGE_NAME)
 	$(CURL) -o $(TMP)/$(PACKAGE_NAME)/$(PACKAGE_NAME).zip $(DOWNLOAD_URL)
diff --git a/vendor/terraform_0.12/Makefile b/vendor/terraform_0.12/Makefile
index 801cbd61eb..22d3fcde01 100644
--- a/vendor/terraform_0.12/Makefile
+++ b/vendor/terraform_0.12/Makefile
@@ -11,6 +11,9 @@ include ../../tasks/Makefile.vendor_includes
 export APK_BUILD_TEMPLATE ?= APKBUILD.github-binary
 export DOWNLOAD_URL ?= https://releases.hashicorp.com/terraform/$(PACKAGE_VERSION)/terraform_$(PACKAGE_VERSION)_$(OS)_$(ARCH).zip
 
+# terraform 0.12 is past end-of-life and no updates should be attempted.
+export AUTO_UPDATE_ENABLED = false
+
 install:
 	mkdir -p $(TMP)/$(PACKAGE_NAME)
 	$(CURL) -o $(TMP)/$(PACKAGE_NAME)/$(PACKAGE_NAME).zip $(DOWNLOAD_URL)
diff --git a/vendor/terraform_0.13/Makefile b/vendor/terraform_0.13/Makefile
index 1ce184c298..d3dae40e3f 100644
--- a/vendor/terraform_0.13/Makefile
+++ b/vendor/terraform_0.13/Makefile
@@ -11,6 +11,9 @@ include ../../tasks/Makefile.vendor_includes
 export APK_BUILD_TEMPLATE ?= APKBUILD.github-binary
 export DOWNLOAD_URL ?= https://releases.hashicorp.com/terraform/$(PACKAGE_VERSION)/terraform_$(PACKAGE_VERSION)_$(OS)_$(ARCH).zip
 
+# terraform 0.13 is past end-of-life and no updates should be attempted.
+export AUTO_UPDATE_ENABLED = false
+
 install:
 	mkdir -p $(TMP)/$(PACKAGE_NAME)
 	$(CURL) -o $(TMP)/$(PACKAGE_NAME)/$(PACKAGE_NAME).zip $(DOWNLOAD_URL)