diff --git a/.github/actions/fabric-tests/action.yml b/.github/actions/fabric-tests/action.yml
index 05f93fcf7..8fcd78906 100644
--- a/.github/actions/fabric-tests/action.yml
+++ b/.github/actions/fabric-tests/action.yml
@@ -52,11 +52,11 @@ runs:
     - name: Configure provider cache
       shell: bash
       run: |
-        echo 'plugin_cache_dir = "${{ env.TF_PLUGIN_CACHE_DIR }}"' \
+        echo 'plugin_cache_dir = "${TF_PLUGIN_CACHE_DIR}"' \
           | tee -a /home/runner/.terraformrc
         echo 'disable_checkpoint = true' \
           | tee -a /home/runner/.terraformrc
-        mkdir -p ${{ env.TF_PLUGIN_CACHE_DIR }}
+        mkdir -p ${TF_PLUGIN_CACHE_DIR}
     - name: Download lockfile
       uses: actions/download-artifact@v4
       with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c900e5c39..1b21866f3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -39,11 +39,16 @@ jobs:
       - name: "Validate input"
         # yamllint disable rule:line-length
         run: |
-          [[ "${{ github.event.inputs.changelog }}" != "true" ]] && { echo 'You didn''t update the changelog.' ; exit 1; }
-          [[ -n "${{ github.event.inputs.version }}" ]] || { echo 'Version not specified!'; exit 1; }
-          [[ "${{ github.event.inputs.version }}" != v* ]] && { echo 'Version does not start with v!' ; exit 1; }
+          [[ "${GITHUB_EVENT_INPUTS_CHANGELOG}" != "true" ]] && { echo 'You didn''t update the changelog.' ; exit 1; }
+          [[ -n "${GITHUB_EVENT_INPUTS_VERSION}" ]] || { echo 'Version not specified!'; exit 1; }
+          [[ "${GITHUB_EVENT_INPUTS_VERSION}" != v* ]] && { echo 'Version does not start with v!' ; exit 1; }
+        env:
+          GITHUB_EVENT_INPUTS_CHANGELOG: ${{ github.event.inputs.changelog }}
+          GITHUB_EVENT_INPUTS_VERSION: ${{ github.event.inputs.version }}
 
       - name: "Tag and release"
         run: |
-          git tag ${{ github.event.inputs.version }}
-          git push origin ${{ github.event.inputs.version }}
+          git tag ${GITHUB_EVENT_INPUTS_VERSION}
+          git push origin ${GITHUB_EVENT_INPUTS_VERSION}
+        env:
+          GITHUB_EVENT_INPUTS_VERSION: ${{ github.event.inputs.version }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e57996199..7b90a7704 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -57,7 +57,7 @@ jobs:
         run: |
           set -e -o xtrace
           if [[ ${{ matrix.flavour }} == 'terraform' ]] ; then
-            echo TERRAFORM_VERSION=${{ env.DEFAULT_TERRAFORM_VERSION }} | tee -a ${GITHUB_ENV}
+            echo TERRAFORM_VERSION=${DEFAULT_TERRAFORM_VERSION} | tee -a ${GITHUB_ENV}
           elif [[ ${{ matrix.flavour }} == 'tofu' ]] ; then
             echo TERRAFORM_VERSION=${{ env.DEFAULT_TOFU_VERSION  }} | tee -a ${GITHUB_ENV}
           else
@@ -85,7 +85,7 @@ jobs:
           sed -i -e 's/>=\(.*# tftest\)/=\1/g' tools/lockfile/versions.tf tools/lockfile/versions.tofu
 
           # change terraform version to the one that is running
-          sed -i 's/required_version = .*$/required_version = ">= ${{ env.TERRAFORM_VERSION  }}"/g' \
+          sed -i 's/required_version = .*$/required_version = ">= ${TERRAFORM_VERSION}"/g' \
             tools/lockfile/versions.tf
 
           cd tools/lockfile
@@ -145,7 +145,7 @@ jobs:
         run: |
           set -e -o xtrace
           if [[ ${{ matrix.flavour }} == 'terraform' ]] ; then
-            echo TERRAFORM_VERSION=${{ env.DEFAULT_TERRAFORM_VERSION }} | tee -a ${GITHUB_ENV}
+            echo TERRAFORM_VERSION=${DEFAULT_TERRAFORM_VERSION} | tee -a ${GITHUB_ENV}
           elif [[ ${{ matrix.flavour }} == 'tofu' ]] ; then
             echo TERRAFORM_VERSION=${{ env.DEFAULT_TOFU_VERSION  }} | tee -a ${GITHUB_ENV}
           else
@@ -189,7 +189,7 @@ jobs:
         run: |
           set -e -o xtrace
           if [[ ${{ matrix.flavour }} == 'terraform' ]] ; then
-            echo TERRAFORM_VERSION=${{ env.DEFAULT_TERRAFORM_VERSION }} | tee -a ${GITHUB_ENV}
+            echo TERRAFORM_VERSION=${DEFAULT_TERRAFORM_VERSION} | tee -a ${GITHUB_ENV}
           elif [[ ${{ matrix.flavour }} == 'tofu' ]] ; then
             echo TERRAFORM_VERSION=${{ env.DEFAULT_TOFU_VERSION  }} | tee -a ${GITHUB_ENV}
           else
@@ -233,7 +233,7 @@ jobs:
         run: |
           set -e -o xtrace
           if [[ ${{ matrix.flavour }} == 'terraform' ]] ; then
-            echo TERRAFORM_VERSION=${{ env.DEFAULT_TERRAFORM_VERSION }} | tee -a ${GITHUB_ENV}
+            echo TERRAFORM_VERSION=${DEFAULT_TERRAFORM_VERSION} | tee -a ${GITHUB_ENV}
           elif [[ ${{ matrix.flavour }} == 'tofu' ]] ; then
             echo TERRAFORM_VERSION=${{ env.DEFAULT_TOFU_VERSION  }} | tee -a ${GITHUB_ENV}
           else