diff --git a/.tekton/pipeline/acceptance-tests.yaml b/.tekton/pipeline/acceptance-tests.yaml
index e339a39dc..8adf200d3 100644
--- a/.tekton/pipeline/acceptance-tests.yaml
+++ b/.tekton/pipeline/acceptance-tests.yaml
@@ -16,7 +16,6 @@ spec:
   workspaces:
     - name: source
     - name: tekton-results-source
-    - name: kubeconfig-dir
     - name: shared-workspace
   tasks:
     - name: generate-cluster-name
diff --git a/.tekton/tasks/tekton-results-upstream-e2e.yaml b/.tekton/tasks/tekton-results-upstream-e2e.yaml
index 33eb49020..15a2508fb 100644
--- a/.tekton/tasks/tekton-results-upstream-e2e.yaml
+++ b/.tekton/tasks/tekton-results-upstream-e2e.yaml
@@ -36,20 +36,8 @@ spec:
         for service_account in "${service_accounts[@]}"; do
         kubectl create token "$service_account" > "${SA_TOKEN_PATH}"/"$service_account"
         done
-        RESULT_ROUTE=$(kubectl get route tekton-results -n tekton-results --template='{{.spec.host}}')
-        cat <<EOF > patch-test-config.patch
-        diff --git a/test/e2e/grpc_client.go b/test/e2e/grpc_client.go
-        --- a/test/e2e/grpc_client.go
-        +++ b/test/e2e/grpc_client.go
-        @@ -36,4 +36,4 @@ const (
-         	certFile         = "tekton-results-cert.pem"
-        -	apiServerName    = "tekton-results-api-service.tekton-pipelines.svc.cluster.local"
-        -	apiServerAddress = "localhost:50051"
-        +	apiServerName    = "tekton-results-api-service.tekton-results.svc.cluster.local"
-        +	apiServerAddress = "$RESULT_ROUTE"
-         	defCertFolder    = "/tmp/tekton-results/ssl"
-        
-        EOF
-        git apply patch-test-config.patch
+        export API_SERVER_NAME="tekton-results-api-service.tekton-results.svc.cluster.local"
+        export API_SERVER_ADDR="https://$(kubectl get route tekton-results -n tekton-results --template='{{.spec.host}}'):443"
+        echo $API_SERVER_ADDR
         export CGO_ENABLED=0
-        go test -v -count=1 --tags=e2e ./test/e2e/...
+        go test -v -count=1 --tags=e2e $(go list --tags=e2e ./test/e2e/... | grep -v /client)
diff --git a/ci/images/ci-runner/hack/bin/deploy-cluster.sh b/ci/images/ci-runner/hack/bin/deploy-cluster.sh
index 5146b16eb..b97260bbc 100755
--- a/ci/images/ci-runner/hack/bin/deploy-cluster.sh
+++ b/ci/images/ci-runner/hack/bin/deploy-cluster.sh
@@ -100,6 +100,7 @@ deploy_cluster() {
         exit 1
     fi
     check_clusteroperators
+    oc annotate ingresses.config/cluster ingress.operator.openshift.io/default-enable-http2=true
 }
 
 fetch_bitwarden_secrets