diff --git a/.github/workflows/build_tag.yaml b/.github/workflows/build_tag.yaml
index 165b54cdc72..1310cc48c0c 100644
--- a/.github/workflows/build_tag.yaml
+++ b/.github/workflows/build_tag.yaml
@@ -71,7 +71,7 @@ jobs:
           GENERATE_GATEWAY_CONFORMANCE_REPORT: "true"
         run: |
           export CONTOUR_E2E_IMAGE="ghcr.io/projectcontour/contour:$(git describe --tags)"
-          make gateway-conformance
+          make setup-kind-cluster run-gateway-conformance cleanup-kind
       - name: Upload gateway conformance report
         uses: actions/upload-artifact@v3
         with:
diff --git a/test/conformance/gatewayapi/gateway_conformance_test.go b/test/conformance/gatewayapi/gateway_conformance_test.go
index 3afc8c97fe1..62fad61095d 100644
--- a/test/conformance/gatewayapi/gateway_conformance_test.go
+++ b/test/conformance/gatewayapi/gateway_conformance_test.go
@@ -116,6 +116,11 @@ func TestGatewayConformance(t *testing.T) {
 
 		report, err := cSuite.Report()
 		require.NoError(t, err, "failed generating conformance report")
+
+		if gwAPIVersion := os.Getenv("GATEWAY_API_VERSION"); gwAPIVersion != "" {
+			report.GatewayAPIVersion = gwAPIVersion
+		}
+
 		rawReport, err := yaml.Marshal(report)
 		require.NoError(t, err)
 		t.Logf("Conformance report:\n%s", string(rawReport))