diff --git a/.github/workflows/actions/deploy-lambda/action.yml b/.github/workflows/actions/deploy-lambda/action.yml
index a63917aa..39d089a1 100644
--- a/.github/workflows/actions/deploy-lambda/action.yml
+++ b/.github/workflows/actions/deploy-lambda/action.yml
@@ -38,9 +38,10 @@ runs:
       shell: bash
       run: |
         echo "Lambda: ${{ inputs.lambda }}"
-        echo "RESOURCE=${{ matrix.lambda }%%/*}" >> $GITHUB_ENV
-        echo "LAMBDA=${{ matrix.lambda }##*/}" >> $GITHUB_ENV
-        echo "IMAGE_NAME=$RESOURCE.$LAMBDA" >> $GITHUB_ENV
+        RESOURCE="${{ inputs.lambda }}"
+        LAMBDA="${{ inputs.lambda }}"
+        echo "RESOURCE=${RESOURCE%%/*}" >> $GITHUB_ENV
+        echo "LAMBDA=${LAMBDA##*/}" >> $GITHUB_ENV
 
     - name: Set reusable variables
       id: vars
diff --git a/.github/workflows/publish-lambdas.yml b/.github/workflows/publish-lambdas.yml
index e8b36e51..c0e693b1 100644
--- a/.github/workflows/publish-lambdas.yml
+++ b/.github/workflows/publish-lambdas.yml
@@ -80,8 +80,10 @@ jobs:
         id: parse
         run: |
           echo "Lambda: ${{ matrix.lambda }}"
-          echo "RESOURCE=${{ matrix.lambda }%%/*}" >> $GITHUB_ENV
-          echo "LAMBDA=${{ matrix.lambda }##*/}" >> $GITHUB_ENV
+          RESOURCE="${{ matrix.lambda }}"
+          LAMBDA="${{ matrix.lambda }}"
+          echo "RESOURCE=${RESOURCE%%/*}" >> $GITHUB_ENV
+          echo "LAMBDA=${LAMBDA##*/}" >> $GITHUB_ENV
 
       - name: Setup Image Metadata
         id: meta