diff --git a/konflux-configs/base/project/base/ocp/pco/v4.16/patch.yaml b/konflux-configs/base/project/base/ocp/pco/v4.16/patch.yaml
index c0814acf..faf92be8 100644
--- a/konflux-configs/base/project/base/ocp/pco/v4.16/patch.yaml
+++ b/konflux-configs/base/project/base/ocp/pco/v4.16/patch.yaml
@@ -40,10 +40,6 @@
       params:
         - name: OCP_VERSION
           value: "4.16"
-        - name: POLICY_CONTROLLER_OPERATOR_GIT_REVISION
-          value: "{{.policyControllerOperatorGitRevision}}"
-        - name: POLICY_CONTROLLER_OPERATOR_INSTALL_CHANNEL
-          value: "{{.installChannel}}"
         - name: POLICY_CONTROLLER_OPERATOR_DEPLOYMENT_NAME
           value: "{{.policyControllerOperatorDeploymentName}}"
       resolverRef:
@@ -75,12 +71,6 @@
       params:
         - name: OCP_VERSION
           value: "4.16"
-        - name: POLICY_CONTROLLER_OPERATOR_GIT_REVISION
-          value: "{{.policyControllerOperatorGitRevision}}"
-        - name: UPGRADE_FROM_CHANNEL
-          value: "stable"
-        - name: UPGRADE_TO_CHANNEL
-          value: "{{.installChannel}}"
       resolverRef:
         params:
           - name: url
diff --git a/konflux-configs/base/project/base/ocp/pco/v4.17/patch.yaml b/konflux-configs/base/project/base/ocp/pco/v4.17/patch.yaml
index d4bda34f..4d7ea617 100644
--- a/konflux-configs/base/project/base/ocp/pco/v4.17/patch.yaml
+++ b/konflux-configs/base/project/base/ocp/pco/v4.17/patch.yaml
@@ -40,10 +40,6 @@
       params:
         - name: OCP_VERSION
           value: "4.17"
-        - name: POLICY_CONTROLLER_OPERATOR_GIT_REVISION
-          value: "{{.policyControllerOperatorGitRevision}}"
-        - name: POLICY_CONTROLLER_OPERATOR_INSTALL_CHANNEL
-          value: "{{.installChannel}}"
         - name: POLICY_CONTROLLER_OPERATOR_DEPLOYMENT_NAME
           value: "{{.policyControllerOperatorDeploymentName}}"
       resolverRef:
@@ -75,12 +71,6 @@
       params:
         - name: OCP_VERSION
           value: "4.17"
-        - name: POLICY_CONTROLLER_OPERATOR_GIT_REVISION
-          value: "{{.policyControllerOperatorGitRevision}}"
-        - name: UPGRADE_FROM_CHANNEL
-          value: "stable"
-        - name: UPGRADE_TO_CHANNEL
-          value: "{{.installChannel}}"
       resolverRef:
         params:
           - name: url
diff --git a/konflux-configs/base/project/base/ocp/pco/v4.18/patch.yaml b/konflux-configs/base/project/base/ocp/pco/v4.18/patch.yaml
index cd7251aa..96c2bf55 100644
--- a/konflux-configs/base/project/base/ocp/pco/v4.18/patch.yaml
+++ b/konflux-configs/base/project/base/ocp/pco/v4.18/patch.yaml
@@ -40,10 +40,6 @@
       params:
         - name: OCP_VERSION
           value: "4.18"
-        - name: POLICY_CONTROLLER_OPERATOR_GIT_REVISION
-          value: "{{.policyControllerOperatorGitRevision}}"
-        - name: POLICY_CONTROLLER_OPERATOR_INSTALL_CHANNEL
-          value: "{{.installChannel}}"
         - name: POLICY_CONTROLLER_OPERATOR_DEPLOYMENT_NAME
           value: "{{.policyControllerOperatorDeploymentName}}"
       resolverRef:
@@ -75,12 +71,6 @@
       params:
         - name: OCP_VERSION
           value: "4.18"
-        - name: POLICY_CONTROLLER_OPERATOR_GIT_REVISION
-          value: "{{.policyControllerOperatorGitRevision}}"
-        - name: UPGRADE_FROM_CHANNEL
-          value: "stable"
-        - name: UPGRADE_TO_CHANNEL
-          value: "{{.installChannel}}"
       resolverRef:
         params:
           - name: url
diff --git a/konflux-configs/base/project/base/ocp/pco/v4.19/patch.yaml b/konflux-configs/base/project/base/ocp/pco/v4.19/patch.yaml
index 843d4831..f878daae 100644
--- a/konflux-configs/base/project/base/ocp/pco/v4.19/patch.yaml
+++ b/konflux-configs/base/project/base/ocp/pco/v4.19/patch.yaml
@@ -40,10 +40,6 @@
       params:
         - name: OCP_VERSION
           value: "4.19"
-        - name: POLICY_CONTROLLER_OPERATOR_GIT_REVISION
-          value: "{{.policyControllerOperatorGitRevision}}"
-        - name: POLICY_CONTROLLER_OPERATOR_INSTALL_CHANNEL
-          value: "{{.installChannel}}"
         - name: POLICY_CONTROLLER_OPERATOR_DEPLOYMENT_NAME
           value: "{{.policyControllerOperatorDeploymentName}}"
       resolverRef:
@@ -75,12 +71,6 @@
       params:
         - name: OCP_VERSION
           value: "4.19"
-        - name: POLICY_CONTROLLER_OPERATOR_GIT_REVISION
-          value: "{{.policyControllerOperatorGitRevision}}"
-        - name: UPGRADE_FROM_CHANNEL
-          value: "stable"
-        - name: UPGRADE_TO_CHANNEL
-          value: "{{.installChannel}}"
       resolverRef:
         params:
           - name: url
diff --git a/konflux-configs/base/project/base/ocp/pco/v4.20/patch.yaml b/konflux-configs/base/project/base/ocp/pco/v4.20/patch.yaml
index 907b1c29..caaf370d 100644
--- a/konflux-configs/base/project/base/ocp/pco/v4.20/patch.yaml
+++ b/konflux-configs/base/project/base/ocp/pco/v4.20/patch.yaml
@@ -40,10 +40,6 @@
       params:
         - name: OCP_VERSION
           value: "4.20"
-        - name: POLICY_CONTROLLER_OPERATOR_GIT_REVISION
-          value: "{{.policyControllerOperatorGitRevision}}"
-        - name: POLICY_CONTROLLER_OPERATOR_INSTALL_CHANNEL
-          value: "{{.installChannel}}"
         - name: POLICY_CONTROLLER_OPERATOR_DEPLOYMENT_NAME
           value: "{{.policyControllerOperatorDeploymentName}}"
       resolverRef:
@@ -75,12 +71,6 @@
       params:
         - name: OCP_VERSION
           value: "4.20"
-        - name: POLICY_CONTROLLER_OPERATOR_GIT_REVISION
-          value: "{{.policyControllerOperatorGitRevision}}"
-        - name: UPGRADE_FROM_CHANNEL
-          value: "stable"
-        - name: UPGRADE_TO_CHANNEL
-          value: "{{.installChannel}}"
       resolverRef:
         params:
           - name: url
diff --git a/konflux-configs/base/project/base/ocp/pco/v4.21/patch.yaml b/konflux-configs/base/project/base/ocp/pco/v4.21/patch.yaml
index 83472718..984f5299 100644
--- a/konflux-configs/base/project/base/ocp/pco/v4.21/patch.yaml
+++ b/konflux-configs/base/project/base/ocp/pco/v4.21/patch.yaml
@@ -40,10 +40,6 @@
       params:
         - name: OCP_VERSION
           value: "4.21"
-        - name: POLICY_CONTROLLER_OPERATOR_GIT_REVISION
-          value: "{{.policyControllerOperatorGitRevision}}"
-        - name: POLICY_CONTROLLER_OPERATOR_INSTALL_CHANNEL
-          value: "{{.installChannel}}"
         - name: POLICY_CONTROLLER_OPERATOR_DEPLOYMENT_NAME
           value: "{{.policyControllerOperatorDeploymentName}}"
       resolverRef:
@@ -75,12 +71,6 @@
       params:
         - name: OCP_VERSION
           value: "4.21"
-        - name: POLICY_CONTROLLER_OPERATOR_GIT_REVISION
-          value: "{{.policyControllerOperatorGitRevision}}"
-        - name: UPGRADE_FROM_CHANNEL
-          value: "stable"
-        - name: UPGRADE_TO_CHANNEL
-          value: "{{.installChannel}}"
       resolverRef:
         params:
           - name: url
diff --git a/konflux-configs/base/project/base/ocp/pco/v4.22/patch.yaml b/konflux-configs/base/project/base/ocp/pco/v4.22/patch.yaml
index 716887fb..f798bfa9 100644
--- a/konflux-configs/base/project/base/ocp/pco/v4.22/patch.yaml
+++ b/konflux-configs/base/project/base/ocp/pco/v4.22/patch.yaml
@@ -40,10 +40,6 @@
       params:
         - name: OCP_VERSION
           value: "4.22"
-        - name: POLICY_CONTROLLER_OPERATOR_GIT_REVISION
-          value: "{{.policyControllerOperatorGitRevision}}"
-        - name: POLICY_CONTROLLER_OPERATOR_INSTALL_CHANNEL
-          value: "{{.installChannel}}"
         - name: POLICY_CONTROLLER_OPERATOR_DEPLOYMENT_NAME
           value: "{{.policyControllerOperatorDeploymentName}}"
       resolverRef:
@@ -75,12 +71,6 @@
       params:
         - name: OCP_VERSION
           value: "4.22"
-        - name: POLICY_CONTROLLER_OPERATOR_GIT_REVISION
-          value: "{{.policyControllerOperatorGitRevision}}"
-        - name: UPGRADE_FROM_CHANNEL
-          value: "stable"
-        - name: UPGRADE_TO_CHANNEL
-          value: "{{.installChannel}}"
       resolverRef:
         params:
           - name: url
diff --git a/konflux-configs/base/project/overlay/pco-fbc/template.yaml b/konflux-configs/base/project/overlay/pco-fbc/template.yaml
index 800c0fb8..b05d78de 100644
--- a/konflux-configs/base/project/overlay/pco-fbc/template.yaml
+++ b/konflux-configs/base/project/overlay/pco-fbc/template.yaml
@@ -25,12 +25,6 @@ spec:
     - name: operator
       description: The operator name
       defaultValue: "policy-controller-operator"
-    - name: policyControllerOperatorGitRevision
-      description: Git revision of policy-controller-operator repo used by PCO FBC e2e
-      defaultValue: "main"
-    - name: installChannel
-      description: The operator install channel used for e2e
-      defaultValue: "stable"
     - name: policyControllerOperatorDeploymentName
       description: The operator deployment name to wait for in e2e install
       defaultValue: "policy-controller-manager"
diff --git a/pipelines/integration-test/pco-operator-upgrade.yaml b/pipelines/integration-test/pco-operator-upgrade.yaml
index 5ef27b4d..b0daf1d3 100644
--- a/pipelines/integration-test/pco-operator-upgrade.yaml
+++ b/pipelines/integration-test/pco-operator-upgrade.yaml
@@ -26,12 +26,8 @@ spec:
         default: tas
       - name: POLICY_CONTROLLER_OPERATOR_GIT_URL
         default: https://github.com/securesign/policy-controller-operator
-      - name: POLICY_CONTROLLER_OPERATOR_GIT_REVISION
-        default: main
       - name: UPGRADE_FROM_CHANNEL
         default: stable
-      - name: UPGRADE_TO_CHANNEL
-        default: stable
       - name: RHTAS_GIT_URL
         default: https://github.com/securesign/secure-sign-operator
       - name: RHTAS_GIT_REVISION
@@ -52,6 +48,25 @@ spec:
         params:
           - name: SNAPSHOT
             value: $(params.SNAPSHOT)
+      - name: release-info
+        runAfter:
+          - parse-metadata
+        taskRef:
+          resolver: git
+          params:
+            - name: url
+              value: https://github.com/securesign/pipelines.git
+            - name: revision
+              value: main
+            - name: pathInRepo
+              value: tasks/integration-test/derive-release-info.yaml
+        params:
+          - name: package-name
+            value: "policy-controller-operator"
+          - name: fbc-image
+            value: "$(tasks.parse-metadata.results.container-image)"
+          - name: ocp-version
+            value: $(params.OCP_VERSION)
       - name: clone-tas-operator-source-code
         runAfter:
           - parse-metadata
@@ -76,7 +91,7 @@ spec:
             workspace: work
       - name: clone-operator-source-code
         runAfter:
-          - parse-metadata
+          - release-info
         taskRef:
           params:
             - name: name
@@ -90,7 +105,7 @@ spec:
           - name: url
             value: $(params.POLICY_CONTROLLER_OPERATOR_GIT_URL)
           - name: revision
-            value: $(params.POLICY_CONTROLLER_OPERATOR_GIT_REVISION)
+            value: "$(tasks.release-info.results.release-branch)"
           - name: subdirectory
             value: "operator"
         workspaces:
@@ -356,7 +371,7 @@ spec:
                 - name: UPGRADE_FROM_CHANNEL
                   value: "$(params.UPGRADE_FROM_CHANNEL)"
                 - name: UPGRADE_TO_CHANNEL
-                  value: "$(params.UPGRADE_TO_CHANNEL)"
+                  value: "$(tasks.release-info.results.channel)"
                 - name: DOCKER_CONFIG
                   value: /quay-auth
               computeResources:
diff --git a/pipelines/integration-test/policy-controller-fbc-e2e.yaml b/pipelines/integration-test/policy-controller-fbc-e2e.yaml
index ebde7df4..a656f53e 100644
--- a/pipelines/integration-test/policy-controller-fbc-e2e.yaml
+++ b/pipelines/integration-test/policy-controller-fbc-e2e.yaml
@@ -28,10 +28,6 @@ spec:
         default: policy-controller-operator
       - name: POLICY_CONTROLLER_OPERATOR_GIT_URL
         default: https://github.com/securesign/policy-controller-operator
-      - name: POLICY_CONTROLLER_OPERATOR_GIT_REVISION
-        default: main
-      - name: POLICY_CONTROLLER_OPERATOR_INSTALL_CHANNEL
-        default: stable
       - name: POLICY_CONTROLLER_OPERATOR_DEPLOYMENT_NAME
         default: policy-controller-manager
       - name: RHTAS_GIT_URL
@@ -57,6 +53,25 @@ spec:
         params:
           - name: SNAPSHOT
             value: $(params.SNAPSHOT)
+      - name: release-info
+        runAfter:
+          - parse-metadata
+        taskRef:
+          resolver: git
+          params:
+            - name: url
+              value: https://github.com/securesign/pipelines.git
+            - name: revision
+              value: main
+            - name: pathInRepo
+              value: tasks/integration-test/derive-release-info.yaml
+        params:
+          - name: package-name
+            value: "policy-controller-operator"
+          - name: fbc-image
+            value: "$(tasks.parse-metadata.results.container-image)"
+          - name: ocp-version
+            value: $(params.OCP_VERSION)
       - name: clone-tas-operator-source-code
         runAfter:
           - parse-metadata
@@ -81,7 +96,7 @@ spec:
             workspace: work
       - name: clone-operator-source-code
         runAfter:
-          - parse-metadata
+          - release-info
         taskRef:
           params:
             - name: name
@@ -95,7 +110,7 @@ spec:
           - name: url
             value: $(params.POLICY_CONTROLLER_OPERATOR_GIT_URL)
           - name: revision
-            value: $(params.POLICY_CONTROLLER_OPERATOR_GIT_REVISION)
+            value: "$(tasks.release-info.results.release-branch)"
           - name: subdirectory
             value: "operator"
         workspaces:
@@ -281,7 +296,7 @@ spec:
         timeout: "0h5m0s"
         runAfter:
           - provision-cluster
-          - parse-metadata
+          - release-info
         taskRef:
           resolver: git
           params:
@@ -303,7 +318,7 @@ spec:
           - name: operator-deployment-name
             value: "$(params.POLICY_CONTROLLER_OPERATOR_DEPLOYMENT_NAME)"
           - name: installChannel
-            value: $(params.POLICY_CONTROLLER_OPERATOR_INSTALL_CHANNEL)
+            value: "$(tasks.release-info.results.channel)"
       - name: download-binaries
         workspaces:
           - name: work