diff --git a/.github/workflows/uffizzi-preview.yaml b/.github/workflows/uffizzi-preview.yaml
index 79f735c352..cd1f6f939c 100644
--- a/.github/workflows/uffizzi-preview.yaml
+++ b/.github/workflows/uffizzi-preview.yaml
@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     outputs:
-      manifests-cache-key: ${{ env.MANIFESTS_FILE_HASH }}
-      git-ref: ${{ env.GIT_REF }}
-      pr-number: ${{ env.PR_NUMBER }}
-      action: ${{ env.ACTION }}
+      manifests-cache-key: ${{ steps.hash.outputs.MANIFESTS_FILE_HASH }}
+      git-ref: ${{ steps.event.outputs.GIT_REF }}
+      pr-number: ${{ steps.event.outputs.PR_NUMBER }}
+      action: ${{ steps.event.outputs.ACTION }}
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
@@ -52,34 +52,35 @@ jobs:
         run: unzip preview-spec.zip event.json
 
       - name: Read Event into ENV
+        id: event
         run: |
-          echo PR_NUMBER=$(jq '.number | tonumber' < event.json) >> $GITHUB_ENV
-          echo ACTION=$(jq --raw-output '.action | tostring | [scan("\\w+")][0]' < event.json) >> $GITHUB_ENV
-          echo GIT_REF=$(jq --raw-output '.pull_request.head.sha | tostring | [scan("\\w+")][0]' < event.json) >> $GITHUB_ENV
+          echo PR_NUMBER=$(jq '.number | tonumber' < event.json) >> $GITHUB_OUTPUT
+          echo ACTION=$(jq --raw-output '.action | tostring | [scan("\\w+")][0]' < event.json) >> $GITHUB_OUTPUT
+          echo GIT_REF=$(jq --raw-output '.pull_request.head.sha | tostring | [scan("\\w+")][0]' < event.json) >> $GITHUB_OUTPUT
 
       - name: Hash Rendered Manifests File
         id: hash
         # If the previous workflow was triggered by a PR close event, we will not have a manifests file artifact.
-        if: ${{ env.ACTION != 'closed' }}
+        if: ${{ steps.event.outputs.ACTION != 'closed' }}
         run: |
           unzip preview-spec.zip manifests.rendered.yml
           ls
-          echo "MANIFESTS_FILE_HASH=$(md5sum manifests.rendered.yml | awk '{ print $1 }')" >> $GITHUB_ENV
+          echo "MANIFESTS_FILE_HASH=$(md5sum manifests.rendered.yml | awk '{ print $1 }')" >> $GITHUB_OUTPUT
 
       - name: Cache Manifests File
-        if: ${{ env.ACTION != 'closed' }}
+        if: ${{ steps.event.outputs.ACTION != 'closed' }}
         uses: actions/cache@v3.3.2
         with:
           path: manifests.rendered.yml
-          key: ${{ env.MANIFESTS_FILE_HASH }}
+          key: ${{ steps.hash.outputs.MANIFESTS_FILE_HASH }}
 
       - name: DEBUG - Print Job Outputs
         if: ${{ runner.debug }}
         run: |
-          echo "PR number: ${{ env.PR_NUMBER }}"
-          echo "Git Ref: ${{ env.GIT_REF }}"
-          echo "Action: ${{ env.ACTION }}"
-          echo "Manifests file hash: ${{ env.MANIFESTS_FILE_HASH }}"
+          echo "PR number: ${{ steps.event.outputs.PR_NUMBER }}"
+          echo "Git Ref: ${{ steps.event.outputs.GIT_REF }}"
+          echo "Action: ${{ steps.event.outputs.ACTION }}"
+          echo "Manifests file hash: ${{ steps.hash.outputs.MANIFESTS_FILE_HASH }}"
           cat event.json
 
   deploy-uffizzi-preview:
@@ -132,7 +133,6 @@ jobs:
 
       - name: Fetch cached Manifests File
         id: cache
-        # if: ${{ contains(fromJSON('["create", "update"]'), env.UFFIZZI_ACTION) }}
         uses: actions/cache@v3
         with:
           path: manifests.rendered.yml