diff --git a/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go b/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go
index b2ff681196d..7c29948f8b6 100644
--- a/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go
+++ b/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go
@@ -85,20 +85,25 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 		It("verifies that toolchain versions have the expected values", func() {
 
 			// These variables need to be maintained according to the component matrix: https://spaces.redhat.com/display/GITOPS/GitOps+Component+Matrix
-			expected_kustomizeVersion := "v5.7.0"
-			expected_helmVersion := "v3.18.4"
-			expected_argocdVersion := "v3.1.11"
-
+			var expected_kustomizeVersion string
+			var expected_helmVersion string
+			var expected_argocdVersion string
 			var expected_dexVersion string
 			var expected_redisVersion string
 
 			if os.Getenv("CI") == "prow" {
 				// when running against openshift-ci
+				expected_kustomizeVersion = "v5.7.0"
+				expected_helmVersion = "v3.18.4"
+				expected_argocdVersion = "v3.1.11"
 				expected_dexVersion = "v2.43.0"
 				expected_redisVersion = "7.2.11"
 
 			} else {
 				// when running against RC/ released version of gitops
+				expected_kustomizeVersion = "v5.7.1"
+				expected_helmVersion = "v3.18.6"
+				expected_argocdVersion = "v3.1.16"
 				expected_dexVersion = "v2.43.1"
 				expected_redisVersion = "7.2.11"
 			}