diff --git a/hack/openshift/get-oc.sh b/hack/openshift/get-oc.sh
index 48d14a08..6fa11ec0 100644
--- a/hack/openshift/get-oc.sh
+++ b/hack/openshift/get-oc.sh
@@ -12,29 +12,25 @@ TOOLS_BIN=${ROOT_DIR}/build/tools/bin
 UNAME_S=$(uname -s)
 UNAME_M=$(uname -m)
 
-rm -rf oc-tmp
-mkdir oc-tmp
-
 if [ "Darwin" = "${UNAME_S}" ]; then
   if [ "x86_64" = "${UNAME_M}" ]; then
     echo "Downloading OpenShift OC CLI ${UNAME_S} ${UNAME_M}"
-  	curl -Ls https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable/openshift-client-mac.tar.gz -o oc-tmp/openshift-client.tar.gz
+  	curl -Ls https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable/openshift-client-mac.tar.gz -o openshift-client.tar.gz
   else
     echo "Downloading OpenShift OC CLI ${UNAME_S} ${UNAME_M}"
-    curl -Ls https://mirror.openshift.com/pub/openshift-v4/aarch64/clients/ocp/stable/openshift-client-mac-arm64.tar.gz -o oc-tmp/openshift-client.tar.gz
+    curl -Ls https://mirror.openshift.com/pub/openshift-v4/aarch64/clients/ocp/stable/openshift-client-mac-arm64.tar.gz -o openshift-client.tar.gz
   fi
 else
   if [ "x86_64" = "${UNAME_M}" ]; then
     echo "Downloading OpenShift OC CLI ${UNAME_S} ${UNAME_M}"
-    curl -Ls https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable/openshift-client-linux.tar.gz -o oc-tmp/openshift-client.tar.gz
+    curl -Ls https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable/openshift-client-linux.tar.gz -o openshift-client.tar.gz
   else
     echo "Downloading OpenShift OC CLI ${UNAME_S} ${UNAME_M}"
-    curl -Ls https://mirror.openshift.com/pub/openshift-v4/aarch64/clients/ocp/stable/openshift-client-linux.tar.gz -o oc-tmp/openshift-client.tar.gz
+    curl -Ls https://mirror.openshift.com/pub/openshift-v4/aarch64/clients/ocp/stable/openshift-client-linux.tar.gz -o openshift-client.tar.gz
   fi
 fi
 
-cd oc-tmp && tar -xvf openshift-client.tar.gz
-mv oc-tmp/oc ${TOOLS_BIN}/oc
-rm -rf oc-tmp
-
+tar -zxvf openshift-client.tar.gz oc
+mv oc ${TOOLS_BIN}/oc
 chmod +x ${TOOLS_BIN}/oc
+rm openshift-client.tar.gz
diff --git a/hack/tools/get-tekton.sh b/hack/tools/get-tekton.sh
index 94fce4f0..1e96c41c 100644
--- a/hack/tools/get-tekton.sh
+++ b/hack/tools/get-tekton.sh
@@ -13,7 +13,10 @@ TOOLS_BIN=${ROOT_DIR}/build/tools/bin
 UNAME_S=$(uname -s)
 UNAME_M=$(uname -m)
 
-TEKTON_VERSION=$(curl -L -s https://dl.k8s.io/release/stable.txt)
+if [ "${TEKTON_VERSION}" == "" ]
+then
+  TEKTON_VERSION=0.40.0
+fi
 
 if [ "Darwin" = "${UNAME_S}" ]; then
   echo "Downloading Tekton ${VERSION} ${UNAME_S} ${UNAME_M}"
diff --git a/tekton/builder.Dockerfile b/tekton/builder.Dockerfile
index f560afff..d2933d70 100644
--- a/tekton/builder.Dockerfile
+++ b/tekton/builder.Dockerfile
@@ -9,7 +9,7 @@ RUN dnf install oracle-java-jdk-release-el* -y \
     && dnf install jdk-21-headful -y \
     && dnf install make which git -y
 
-RUN curl -Ls https://go.dev/dl/$GoVersion.linux-$GoArch.tar.gz -o go-linux.tar.gz \
+RUN curl -Ls https://go.dev/dl/go$GoVersion.linux-$GoArch.tar.gz -o go-linux.tar.gz \
     && rm -rf /usr/local/go \
     && tar -C /usr/local -xzf go-linux.tar.gz \
     && rm go-linux.tar.gz \
diff --git a/tekton/operator-ci-run.yaml b/tekton/operator-ci-run.yaml
new file mode 100644
index 00000000..0882178b
--- /dev/null
+++ b/tekton/operator-ci-run.yaml
@@ -0,0 +1,43 @@
+apiVersion: tekton.dev/v1
+kind: PipelineRun
+metadata:
+  name: NAME_PLACEHOLDER
+spec:
+  pipelineRef:
+    name: operator-ci
+  workspaces:
+    - name: shared-data
+      persistentVolumeClaim:
+        claimName: operator-ci-pvc
+    - name: dockerconfig
+      secret:
+        secretName: container-auth-json
+    - name: git-credentials
+      secret:
+        secretName: github-ssh-credentials
+  taskRunSpecs:
+    - pipelineTaskName: git-clone
+      podTemplate:
+        securityContext:
+          fsGroup: 65532
+  timeouts:
+    pipeline: "2h3m0s"
+    tasks: "2h0m0s"
+  params:
+    - name: repo-url
+      value: GIT_REPO_PLACEHOLDER
+    - name: revision
+      value: REVISION_PLACEHOLDER
+    - name: builder-image-prefix
+      value: "iad.ocir.io/odx-stateservice/tekton/builder"
+    - name: env-configmap
+      value: os-cert-config
+    - name: oci-tenancy-ocid
+      value: "ocid1.tenancy.oc1..aaaaaaaaztkccp2ubbxhhuftzvouv6t3b4sfencpgvsicrtmhwprk2mgahjq"
+    - name: oci-user-ocid
+      value: "ocid1.user.oc1..aaaaaaaa6vuuuw4vx3etfnugb6r34uyy2ovu2hbqivmazxylohc633pflkla"
+    - name: oci-region
+      value: "us-phoenix-1"
+    - name: oci-cli-secret
+      value: oci-cli-secret
+
diff --git a/tekton/rbac-pipeline-admin.yaml b/tekton/rbac-pipeline-admin.yaml
index c28b1fa4..48e03903 100644
--- a/tekton/rbac-pipeline-admin.yaml
+++ b/tekton/rbac-pipeline-admin.yaml
@@ -9,4 +9,4 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: pipeline
-    namespace: coherence-cert
\ No newline at end of file
+    namespace: NAMESPACE_HOLDER
\ No newline at end of file
diff --git a/tekton/task-setup-env.yaml b/tekton/task-setup-env.yaml
index c7136ce4..a0375225 100644
--- a/tekton/task-setup-env.yaml
+++ b/tekton/task-setup-env.yaml
@@ -44,7 +44,7 @@ spec:
           BUILD_ARCH=amd64
         fi
         DOCKER_FILE_SHA1SUM=$(sha1sum "${SOURCE_DIRECTORY}/tekton/builder.Dockerfile")
-        OPERATOR_GO_VERSION=$(sed -n -e 's/^toolchain \(.*\)$/\1/p' ${SOURCE_DIRECTORY}/go.mod)
+        OPERATOR_GO_VERSION=$(cat ${SOURCE_DIRECTORY}/.go-version)
         readarray -d ' ' -t DOCKER_FILE_SHA <<< "${DOCKER_FILE_SHA1SUM}"
         LATEST_GO=$(curl -s 'https://go.dev/VERSION?m=text' | head -n 1)
         BUILDER_IMAGE_NAME="${PARAM_BUILDER_IMAGE_PREFIX}:${DOCKER_FILE_SHA}-${OPERATOR_GO_VERSION}-${BUILD_ARCH}"