diff --git a/.github/workflows/base_image_workflow.yaml b/.github/workflows/base_image_workflow.yaml
index 16e0e29..4a1b3e8 100644
--- a/.github/workflows/base_image_workflow.yaml
+++ b/.github/workflows/base_image_workflow.yaml
@@ -13,13 +13,18 @@ on:
 jobs:
   set-vars:
     runs-on: ubuntu-latest
-    outputs:
-      CONTEXT: ${{ github.event.inputs.CONTEXT }}
-      IMAGE_NAME: ${{ github.event.inputs.IMAGE_NAME }}
-      PLATFORMS: 'linux/amd64,linux/arm64'
     steps:
       - name: Set vars
-        run: echo "Setting vars..."
+        id: vars
+        run: |
+          echo "CONTEXT=${{ github.event.inputs.CONTEXT }}" >> $GITHUB_ENV
+          echo "IMAGE_NAME=${{ github.event.inputs.IMAGE_NAME }}" >> $GITHUB_ENV
+          echo "::set-output name=CONTEXT::${{ github.event.inputs.CONTEXT }}"
+          echo "::set-output name=IMAGE_NAME::${{ github.event.inputs.IMAGE_NAME }}"
+    outputs:
+      CONTEXT: ${{ steps.vars.outputs.CONTEXT }}
+      IMAGE_NAME: ${{ steps.vars.outputs.IMAGE_NAME }}
+      PLATFORMS: 'linux/amd64,linux/arm64'
 
   build-and-push-images:
     needs: set-vars