diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index c50b29a1..34738e72 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -29,7 +29,6 @@ jobs:
       environment-url: ${{ steps.set-outputs.outputs.environment-url }}
       function-architectures: ${{ steps.set-outputs.outputs.function-architectures }}
       function-description: ${{ steps.set-outputs.outputs.function-description }}
-      function-environment-variables: ${{ steps.set-outputs.outputs.function-environment-variables }}
       function-handler: ${{ steps.set-outputs.outputs.function-handler }}
       function-memory: ${{ steps.set-outputs.outputs.function-memory }}
       function-name: ${{ steps.set-outputs.outputs.function-name }}
@@ -134,11 +133,6 @@ jobs:
         LAMBDA_ARTIFACT_RUN_ID: ${{ steps.get-run.outputs.run-id }}
         LAMBDA_ARTIFACT_RUN_NUMBER: ${{ steps.get-run.outputs.run-number }}
         LAMBDA_ENVIRONMENT: ${{ steps.get-environment-name.outputs.result }}
-        SKILL_API_URL: ${{ vars.SKILL_API_URL }}
-        SKILL_ID: ${{ secrets.SKILL_ID }}
-        TFL_APPLICATION_ID: ${{ secrets.TFL_APPLICATION_ID }}
-        TFL_APPLICATION_KEY: ${{ secrets.TFL_APPLICATION_KEY }}
-        VERIFY_SKILL_ID: "true"
       shell: bash
       run: |
         environment_name="${LAMBDA_ENVIRONMENT}"
@@ -160,22 +154,11 @@ jobs:
         function_timeout="$(echo "${lambda_config}" | jq -r '."function-timeout"')"
         workflow_url="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
 
-        function_environment_variables="{\
-          \"Variables\": {\
-            \"Skill__SkillApiUrl\": \"${SKILL_API_URL}\",\
-            \"Skill__SkillId\": \"${SKILL_ID}\",\
-            \"Skill__TflApplicationId\": \"${TFL_APPLICATION_ID}\",\
-            \"Skill__TflApplicationKey\": \"${TFL_APPLICATION_KEY}\",\
-            \"Skill__VerifySkillId\": \"${VERIFY_SKILL_ID}\"\
-          }\
-        }"
-
         {
           echo "environment-name=${environment_name}"
           echo "environment-url=${environment_url}"
           echo "function-architectures=${function_architectures}"
           echo "function-description=${function_description}"
-          echo "function-environment-variables=${function_environment_variables}"
           echo "function-handler=${function_handler}"
           echo "function-memory=${function_memory}"
           echo "function-name=${function_name}"
@@ -222,7 +205,6 @@ jobs:
       FUNCTION_NAME: ${{ needs.setup.outputs.function-name }}
       LAMBDA_ARCHITECTURES: ${{ needs.setup.outputs.function-architectures }}
       LAMBDA_DESCRIPTION: ${{ needs.setup.outputs.function-description }}
-      LAMBDA_ENVIRONMENT_VARIABLES: ${{ needs.setup.outputs.function-environment-variables }}
       LAMBDA_HANDLER: ${{ needs.setup.outputs.function-handler }}
       LAMBDA_MEMORY: ${{ needs.setup.outputs.function-memory }}
       LAMBDA_ROLE: ${{ vars.AWS_LAMBDA_ROLE }}
@@ -245,6 +227,26 @@ jobs:
         name: ${{ env.ARTIFACT_NAME }}
         run-id: ${{ needs.setup.outputs.run-id }}
 
+    - name: Get Lambda environment variables
+      env:
+        SKILL_API_URL: ${{ vars.SKILL_API_URL }}
+        SKILL_ID: ${{ secrets.SKILL_ID }}
+        TFL_APPLICATION_ID: ${{ secrets.TFL_APPLICATION_ID }}
+        TFL_APPLICATION_KEY: ${{ secrets.TFL_APPLICATION_KEY }}
+        VERIFY_SKILL_ID: "true"
+      shell: bash
+      run: |
+        lambda_vars="{\
+          \"Variables\": {\
+            \"Skill__SkillApiUrl\": \"${SKILL_API_URL}\",\
+            \"Skill__SkillId\": \"${SKILL_ID}\",\
+            \"Skill__TflApplicationId\": \"${TFL_APPLICATION_ID}\",\
+            \"Skill__TflApplicationKey\": \"${TFL_APPLICATION_KEY}\",\
+            \"Skill__VerifySkillId\": \"${VERIFY_SKILL_ID}\"\
+          }\
+        }"
+        echo "LAMBDA_ENVIRONMENT_VARIABLES=${lambda_vars}" >> "$GITHUB_ENV"
+
     - name: Configure AWS credentials
       uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a # v4.0.1
       with: