diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 40a8fee..d8aea71 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -61,7 +61,7 @@ jobs:
     environment:
       name: ${{ inputs.environment_name }}
     env:
-      VAULT_URL: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
+      VAULT_ADDR: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
       VAULT_GITHUB_ACTIONS_ROLE: ${{ inputs.vault_github_actions_role || vars.VAULT_GITHUB_ACTIONS_ROLE }}
       AWS_ACCOUNT_ID: ${{ vars.AWS_ACCOUNT_ID || vars.PULL_REQUEST_AWS_ACCOUNT_ID }}
       AWS_REGION: ${{ vars.AWS_REGION || vars.AWS_DEFAULT_REGION }}
@@ -90,7 +90,7 @@ jobs:
           attempt_limit: 15
           attempt_delay: 500
           with: |
-            url: ${{ env.VAULT_URL }}
+            url: ${{ env.VAULT_ADDR }}
             role: ${{ env.VAULT_GITHUB_ACTIONS_ROLE }}
             method: jwt
             path: "github-actions"
diff --git a/.github/workflows/create-apk-artifact.yml b/.github/workflows/create-apk-artifact.yml
index a017323..9ff3146 100644
--- a/.github/workflows/create-apk-artifact.yml
+++ b/.github/workflows/create-apk-artifact.yml
@@ -81,7 +81,7 @@ jobs:
     env:
       smartway_keystore_name: smartway.keystore
       apk_name: app-${{ inputs.configuration }}.apk
-      VAULT_URL: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
+      VAULT_ADDR: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
       VAULT_GITHUB_ACTIONS_ROLE: ${{ inputs.vault_github_actions_role || vars.VAULT_GITHUB_ACTIONS_ROLE }}
       AWS_ACCOUNT_ID: ${{ inputs.AWS_ACCOUNT_ID || vars.AWS_ACCOUNT_ID || vars.PULL_REQUEST_AWS_ACCOUNT_ID }}
       AWS_REGION: ${{ inputs.AWS_REGION || vars.AWS_REGION || vars.AWS_DEFAULT_REGION }}
@@ -105,7 +105,7 @@ jobs:
           attempt_limit: 15
           attempt_delay: 500
           with: |
-            url: ${{ env.VAULT_URL }}
+            url: ${{ env.VAULT_ADDR }}
             role: ${{ env.VAULT_GITHUB_ACTIONS_ROLE }}
             method: jwt
             path: "github-actions"
diff --git a/.github/workflows/delete-docker-image.yml b/.github/workflows/delete-docker-image.yml
index 79e2ff7..c12c927 100644
--- a/.github/workflows/delete-docker-image.yml
+++ b/.github/workflows/delete-docker-image.yml
@@ -1,4 +1,4 @@
-name: 'Delete-Docker-Image'
+name: "Delete-Docker-Image"
 
 on:
   workflow_call:
@@ -24,13 +24,13 @@ jobs:
   delete:
     runs-on: ubuntu-latest
     permissions:
-        contents: read
-        id-token: write
-        packages: write
+      contents: read
+      id-token: write
+      packages: write
     environment:
       name: ${{ inputs.environment_name }}
     env:
-      VAULT_URL: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
+      VAULT_ADDR: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
       VAULT_GITHUB_ACTIONS_ROLE: ${{ inputs.vault_github_actions_role || vars.VAULT_GITHUB_ACTIONS_ROLE }}
     steps:
       # We keep this action as it is configure in lot of repo
diff --git a/.github/workflows/dotnet-publish.yml b/.github/workflows/dotnet-publish.yml
index 0ac4d0a..63f68aa 100644
--- a/.github/workflows/dotnet-publish.yml
+++ b/.github/workflows/dotnet-publish.yml
@@ -29,7 +29,7 @@ jobs:
       packages: read
     environment: ${{ inputs.environment_name }}
     env:
-      VAULT_URL: ${{ vars.VAULT_URL }}
+      VAULT_ADDR: ${{ vars.VAULT_URL }}
       VAULT_GITHUB_ACTIONS_ROLE: ${{ vars.VAULT_GITHUB_ACTIONS_ROLE }}
       AWS_ACCOUNT_ID: ${{ inputs.AWS_ACCOUNT_ID || vars.AWS_ACCOUNT_ID }}
       AWS_REGION: ${{ inputs.AWS_REGION || vars.AWS_REGION }}
@@ -69,7 +69,7 @@ jobs:
           attempt_limit: 15
           attempt_delay: 500
           with: |
-            url: ${{ env.VAULT_URL }}
+            url: ${{ env.VAULT_ADDR }}
             role: ${{ env.VAULT_GITHUB_ACTIONS_ROLE }}
             method: jwt
             path: "github-actions"
diff --git a/.github/workflows/publish-apk-s3.yml b/.github/workflows/publish-apk-s3.yml
index 2a284b8..039c91c 100644
--- a/.github/workflows/publish-apk-s3.yml
+++ b/.github/workflows/publish-apk-s3.yml
@@ -49,7 +49,7 @@ jobs:
     environment:
       name: ${{ inputs.environment_name }}
     env:
-      VAULT_URL: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
+      VAULT_ADDR: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
       VAULT_GITHUB_ACTIONS_ROLE: ${{ inputs.vault_github_actions_role || vars.VAULT_GITHUB_ACTIONS_ROLE }}
       AWS_ACCOUNT_ID: ${{ inputs.AWS_ACCOUNT_ID || vars.AWS_ACCOUNT_ID || vars.PULL_REQUEST_AWS_ACCOUNT_ID }}
       AWS_REGION: ${{ inputs.AWS_REGION || vars.AWS_REGION || vars.AWS_DEFAULT_REGION }}
@@ -70,7 +70,7 @@ jobs:
           attempt_limit: 15
           attempt_delay: 500
           with: |
-            url: ${{ env.VAULT_URL }}
+            url: ${{ env.VAULT_ADDR }}
             role: ${{ env.VAULT_GITHUB_ACTIONS_ROLE }}
             method: jwt
             path: "github-actions"
diff --git a/.github/workflows/publish-bundle-codepush.yml b/.github/workflows/publish-bundle-codepush.yml
index 8cc51d3..2dcbb41 100644
--- a/.github/workflows/publish-bundle-codepush.yml
+++ b/.github/workflows/publish-bundle-codepush.yml
@@ -47,7 +47,7 @@ jobs:
       run:
         working-directory: ${{ inputs.working-directory }}
     env:
-      VAULT_URL: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
+      VAULT_ADDR: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
       VAULT_GITHUB_ACTIONS_ROLE: ${{ inputs.vault_github_actions_role || vars.VAULT_GITHUB_ACTIONS_ROLE }}
     steps:
       - name: Checkout
@@ -69,7 +69,7 @@ jobs:
           attempt_limit: 15
           attempt_delay: 500
           with: |
-            url: ${{ env.VAULT_URL }}
+            url: ${{ env.VAULT_ADDR }}
             role: ${{ env.VAULT_GITHUB_ACTIONS_ROLE }}
             method: jwt
             path: "github-actions"
diff --git a/.github/workflows/run-aws.yml b/.github/workflows/run-aws.yml
index 705f92d..3108a87 100644
--- a/.github/workflows/run-aws.yml
+++ b/.github/workflows/run-aws.yml
@@ -48,7 +48,7 @@ jobs:
     environment:
       name: ${{ inputs.environment_name }}
     env:
-      VAULT_URL: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
+      VAULT_ADDR: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
       VAULT_GITHUB_ACTIONS_ROLE: ${{ inputs.vault_github_actions_role || vars.VAULT_GITHUB_ACTIONS_ROLE }}
       AWS_ACCOUNT_ID: ${{ inputs.AWS_ACCOUNT_ID || vars.AWS_ACCOUNT_ID || vars.PULL_REQUEST_AWS_ACCOUNT_ID }}
       AWS_REGION: ${{ inputs.AWS_REGION || vars.AWS_REGION || vars.AWS_DEFAULT_REGION }}
@@ -74,7 +74,7 @@ jobs:
           attempt_limit: 15
           attempt_delay: 500
           with: |
-            url: ${{ env.VAULT_URL }}
+            url: ${{ env.VAULT_ADDR }}
             role: ${{ env.VAULT_GITHUB_ACTIONS_ROLE }}
             method: jwt
             path: "github-actions"
diff --git a/.github/workflows/run-docker-upload-artifact.yml b/.github/workflows/run-docker-upload-artifact.yml
index bd3a661..51e23e9 100644
--- a/.github/workflows/run-docker-upload-artifact.yml
+++ b/.github/workflows/run-docker-upload-artifact.yml
@@ -78,7 +78,7 @@ jobs:
         password: ${{ secrets.github_token }}
       env:
         DJANGO_SETTINGS_MODULE: ${{ inputs.env_django_settings_module }}
-        VAULT_URL: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
+        VAULT_ADDR: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
         VAULT_GITHUB_ACTIONS_ROLE: ${{ inputs.vault_github_actions_role || vars.VAULT_GITHUB_ACTIONS_ROLE }}
         AWS_ACCOUNT_ID: ${{ inputs.AWS_ACCOUNT_ID || vars.AWS_ACCOUNT_ID || vars.PULL_REQUEST_AWS_ACCOUNT_ID }}
         AWS_REGION: ${{ inputs.AWS_REGION || vars.AWS_REGION || vars.AWS_DEFAULT_REGION }}
@@ -101,7 +101,7 @@ jobs:
           attempt_limit: 15
           attempt_delay: 500
           with: |
-            url: ${{ env.VAULT_URL }}
+            url: ${{ env.VAULT_ADDR }}
             role: ${{ env.VAULT_GITHUB_ACTIONS_ROLE }}
             method: jwt
             path: "github-actions"
diff --git a/.github/workflows/run-docker-with-db.yml b/.github/workflows/run-docker-with-db.yml
index 605021f..b97e567 100644
--- a/.github/workflows/run-docker-with-db.yml
+++ b/.github/workflows/run-docker-with-db.yml
@@ -83,7 +83,7 @@ jobs:
       env:
         DJANGO_SETTINGS_MODULE: ${{ inputs.env_django_settings_module }}
         GIT_DISCOVERY_ACROSS_FILESYSTEM: 1
-        VAULT_URL: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
+        VAULT_ADDR: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
         VAULT_GITHUB_ACTIONS_ROLE: ${{ inputs.vault_github_actions_role || vars.VAULT_GITHUB_ACTIONS_ROLE }}
         AWS_ACCOUNT_ID: ${{ inputs.AWS_ACCOUNT_ID || vars.AWS_ACCOUNT_ID || vars.PULL_REQUEST_AWS_ACCOUNT_ID }}
         AWS_REGION: ${{ inputs.AWS_REGION || vars.AWS_REGION || vars.AWS_DEFAULT_REGION }}
@@ -114,7 +114,7 @@ jobs:
           attempt_limit: 15
           attempt_delay: 500
           with: |
-            url: ${{ env.VAULT_URL }}
+            url: ${{ env.VAULT_ADDR }}
             role: ${{ env.VAULT_GITHUB_ACTIONS_ROLE }}
             method: jwt
             path: "github-actions"
diff --git a/.github/workflows/run-docker.yml b/.github/workflows/run-docker.yml
index c531155..f886cfb 100644
--- a/.github/workflows/run-docker.yml
+++ b/.github/workflows/run-docker.yml
@@ -83,7 +83,7 @@ jobs:
       env:
         DJANGO_SETTINGS_MODULE: ${{ inputs.env_django_settings_module }}
         GIT_DISCOVERY_ACROSS_FILESYSTEM: 1
-        VAULT_URL: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
+        VAULT_ADDR: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
         VAULT_GITHUB_ACTIONS_ROLE: ${{ inputs.vault_github_actions_role || vars.VAULT_GITHUB_ACTIONS_ROLE }}
         AWS_ACCOUNT_ID: ${{ inputs.AWS_ACCOUNT_ID || vars.AWS_ACCOUNT_ID || vars.PULL_REQUEST_AWS_ACCOUNT_ID }}
         AWS_REGION: ${{ inputs.AWS_REGION || vars.AWS_REGION || vars.AWS_DEFAULT_REGION }}
@@ -106,7 +106,7 @@ jobs:
           attempt_limit: 15
           attempt_delay: 500
           with: |
-            url: ${{ env.VAULT_URL }}
+            url: ${{ env.VAULT_ADDR }}
             role: ${{ env.VAULT_GITHUB_ACTIONS_ROLE }}
             method: jwt
             path: "github-actions"
diff --git a/.github/workflows/run-python.yml b/.github/workflows/run-python.yml
index 881711b..2291a0d 100644
--- a/.github/workflows/run-python.yml
+++ b/.github/workflows/run-python.yml
@@ -70,7 +70,7 @@ jobs:
     environment:
       name: ${{ inputs.environment_name }}
     env:
-      VAULT_URL: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
+      VAULT_ADDR: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
       VAULT_GITHUB_ACTIONS_ROLE: ${{ inputs.vault_github_actions_role || vars.VAULT_GITHUB_ACTIONS_ROLE }}
       AWS_ACCOUNT_ID: ${{ inputs.AWS_ACCOUNT_ID || vars.AWS_ACCOUNT_ID || vars.PULL_REQUEST_AWS_ACCOUNT_ID }}
       AWS_REGION: ${{ inputs.AWS_REGION || vars.AWS_REGION || vars.AWS_DEFAULT_REGION }}
@@ -94,7 +94,7 @@ jobs:
           attempt_limit: 15
           attempt_delay: 500
           with: |
-            url: ${{ env.VAULT_URL }}
+            url: ${{ env.VAULT_ADDR }}
             role: ${{ env.VAULT_GITHUB_ACTIONS_ROLE }}
             method: jwt
             path: "github-actions"
diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
index 11bb401..9eb9b36 100644
--- a/.github/workflows/terraform.yml
+++ b/.github/workflows/terraform.yml
@@ -79,7 +79,7 @@ jobs:
     environment:
       name: ${{ inputs.environment_name }}
     env:
-      VAULT_URL: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
+      VAULT_ADDR: ${{ inputs.VAULT_URL || vars.VAULT_URL || vars.PULLREQUEST_VAULT_URL }}
       VAULT_GITHUB_ACTIONS_ROLE: ${{ inputs.vault_github_actions_role || vars.VAULT_GITHUB_ACTIONS_ROLE }}
       AWS_ACCOUNT_ID: ${{ inputs.AWS_ACCOUNT_ID || vars.AWS_ACCOUNT_ID || vars.PULL_REQUEST_AWS_ACCOUNT_ID }}
       AWS_REGION: ${{ inputs.AWS_REGION || vars.AWS_REGION || vars.AWS_DEFAULT_REGION }}
@@ -107,7 +107,7 @@ jobs:
           attempt_limit: 15
           attempt_delay: 500
           with: |
-            url: ${{ env.VAULT_URL }}
+            url: ${{ env.VAULT_ADDR }}
             role: ${{ env.VAULT_GITHUB_ACTIONS_ROLE }}
             method: jwt
             path: "github-actions"