diff --git a/.github/workflows/functional.yml b/.github/workflows/functional.yml
index e5c61f5570..a8afebb6fd 100644
--- a/.github/workflows/functional.yml
+++ b/.github/workflows/functional.yml
@@ -131,8 +131,8 @@ jobs:
           annotations: ${{ steps.ngf-meta.outputs.annotations }}
           push: false
           platforms: ${{ inputs.platforms }}
-          cache-from: type=gha,scope=${{ inputs.image }}
-          cache-to: type=gha,scope=${{ inputs.image }},mode=max
+          cache-from: type=gha,scope=ngf
+          cache-to: type=gha,scope=ngf,mode=max
           pull: false
           no-cache: ${{ github.event_name != 'pull_request' }}
           sbom: true
@@ -157,7 +157,7 @@ jobs:
           ngf_prefix=ghcr.io/nginxinc/nginx-gateway-fabric
           ngf_tag=${{ steps.ngf-meta.outputs.version }}
           if [ ${{ startsWith(matrix.k8s-version, '1.23') ||  startsWith(matrix.k8s-version, '1.24') }} == "true" ]; then export INSTALL_WEBHOOK=true; fi
-          make build-images${{ matrix.nginx-image == 'nginx-plus' && '-with-plus' || ''}} load-images${{ matrix.nginx-image == 'nginx-plus' && '-with-plus' || ''}} PREFIX=${ngf_prefix} TAG=${ngf_tag}
+          make load-images${{ matrix.nginx-image == 'nginx-plus' && '-with-plus' || ''}} PREFIX=${ngf_prefix} TAG=${ngf_tag}
         working-directory: ./tests
 
       - name: Run NGINX functional tests