diff --git a/.github/actions/make/action.yml b/.github/actions/make/action.yml
index 99d190209..f0f929a03 100644
--- a/.github/actions/make/action.yml
+++ b/.github/actions/make/action.yml
@@ -29,7 +29,7 @@ runs:
       if: inputs.requires-aws
       uses: aws-actions/configure-aws-credentials@v4
       with:
-        role-to-assume: ${{ secrets.CI_ROLE_NAME }}
+        role-to-assume: ${{ env.CI_ROLE_NAME }}
         role-session-name: github-actions-ci-${{ env.GITHUB_SHA_SHORT }}
         aws-region: eu-west-2
         output-credentials: true
diff --git a/.github/workflows/deploy-parameters-nonprod.yml b/.github/workflows/deploy-parameters-nonprod.yml
index ea68cd7f7..ac33b0441 100644
--- a/.github/workflows/deploy-parameters-nonprod.yml
+++ b/.github/workflows/deploy-parameters-nonprod.yml
@@ -14,8 +14,17 @@ on:
           - int
 
 jobs:
+  parse-secrets:
+    runs-on: [self-hosted, ci]
+    steps:
+      - id: parse-secrets
+        run: |
+          echo "::add-mask::${{ secrets.CI_ROLE_NAME }}"
+          echo "CI_ROLE_NAME=${{ secrets.CI_ROLE_NAME }}" >> $GITHUB_ENV
+
   deploy:
     uses: ./.github/workflows/_deploy.yml
+    needs: [parse-secrets]
     with:
       workspace: ${{ inputs.workspace }}
       parameter-deploy: "parameter_deploy"
diff --git a/.github/workflows/deploy-parameters-prod.yml b/.github/workflows/deploy-parameters-prod.yml
index 90e2eed5b..e73b9f773 100644
--- a/.github/workflows/deploy-parameters-prod.yml
+++ b/.github/workflows/deploy-parameters-prod.yml
@@ -4,8 +4,17 @@ on:
   workflow_dispatch:
 
 jobs:
+  parse-secrets:
+    runs-on: [self-hosted, ci]
+    steps:
+      - id: parse-secrets
+        run: |
+          echo "::add-mask::${{ secrets.CI_ROLE_NAME }}"
+          echo "CI_ROLE_NAME=${{ secrets.CI_ROLE_NAME }}" >> $GITHUB_ENV
+
   deploy:
     uses: ./.github/workflows/_deploy.yml
+    needs: [parse-secrets]
     with:
       workspace: prod
       parameter-deploy: "parameter_deploy"
diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml
index d9c5fe583..fa934f4bd 100644
--- a/.github/workflows/pull-requests.yml
+++ b/.github/workflows/pull-requests.yml
@@ -14,6 +14,14 @@ env:
   RUNNING_IN_CI: 1
 
 jobs:
+  parse-secrets:
+    runs-on: [self-hosted, ci]
+    steps:
+      - id: parse-secrets
+        run: |
+          echo "::add-mask::${{ secrets.CI_ROLE_NAME }}"
+          echo "CI_ROLE_NAME=${{ secrets.CI_ROLE_NAME }}" >> $GITHUB_ENV
+
   create-workspace-name:
     runs-on: [self-hosted, ci]
     outputs:
diff --git a/infrastructure/terraform/per_account/dev/main.tf b/infrastructure/terraform/per_account/main.tf
similarity index 100%
rename from infrastructure/terraform/per_account/dev/main.tf
rename to infrastructure/terraform/per_account/main.tf
diff --git a/infrastructure/terraform/per_account/dev/modules/placeholder.txt b/infrastructure/terraform/per_account/modules/placeholder.txt
similarity index 100%
rename from infrastructure/terraform/per_account/dev/modules/placeholder.txt
rename to infrastructure/terraform/per_account/modules/placeholder.txt
diff --git a/infrastructure/terraform/per_account/dev/parameters/locals.tf b/infrastructure/terraform/per_account/parameters/locals.tf
similarity index 100%
rename from infrastructure/terraform/per_account/dev/parameters/locals.tf
rename to infrastructure/terraform/per_account/parameters/locals.tf
diff --git a/infrastructure/terraform/per_account/dev/parameters/main.tf b/infrastructure/terraform/per_account/parameters/main.tf
similarity index 100%
rename from infrastructure/terraform/per_account/dev/parameters/main.tf
rename to infrastructure/terraform/per_account/parameters/main.tf
diff --git a/infrastructure/terraform/per_account/dev/parameters/provider.tf b/infrastructure/terraform/per_account/parameters/provider.tf
similarity index 100%
rename from infrastructure/terraform/per_account/dev/parameters/provider.tf
rename to infrastructure/terraform/per_account/parameters/provider.tf
diff --git a/infrastructure/terraform/per_account/dev/parameters/terraform.tf b/infrastructure/terraform/per_account/parameters/terraform.tf
similarity index 100%
rename from infrastructure/terraform/per_account/dev/parameters/terraform.tf
rename to infrastructure/terraform/per_account/parameters/terraform.tf
diff --git a/infrastructure/terraform/per_account/dev/parameters/vars.tf b/infrastructure/terraform/per_account/parameters/vars.tf
similarity index 100%
rename from infrastructure/terraform/per_account/dev/parameters/vars.tf
rename to infrastructure/terraform/per_account/parameters/vars.tf
diff --git a/infrastructure/terraform/per_account/dev/placeholder.txt b/infrastructure/terraform/per_account/placeholder.txt
similarity index 100%
rename from infrastructure/terraform/per_account/dev/placeholder.txt
rename to infrastructure/terraform/per_account/placeholder.txt