diff --git a/ci-operator/step-registry/gcp/OWNERS b/ci-operator/step-registry/gcp/OWNERS
index c742af96b2eee..e079a72508195 100644
--- a/ci-operator/step-registry/gcp/OWNERS
+++ b/ci-operator/step-registry/gcp/OWNERS
@@ -2,4 +2,3 @@ approvers:
 - gpei
 - jianlinliu
 - jianli-wei
-
diff --git a/ci-operator/step-registry/gcp/deprovision/OWNERS b/ci-operator/step-registry/gcp/deprovision/OWNERS
index edad27cb2851e..c742af96b2eee 100644
--- a/ci-operator/step-registry/gcp/deprovision/OWNERS
+++ b/ci-operator/step-registry/gcp/deprovision/OWNERS
@@ -1,5 +1,4 @@
 approvers:
-- wgahnagl
 - gpei
 - jianlinliu
 - jianli-wei
diff --git a/ci-operator/step-registry/gcp/deprovision/bastionhost/gcp-deprovision-bastionhost-ref.metadata.json b/ci-operator/step-registry/gcp/deprovision/bastionhost/gcp-deprovision-bastionhost-ref.metadata.json
index 8d4105f0ef617..ebeedd9e72b33 100644
--- a/ci-operator/step-registry/gcp/deprovision/bastionhost/gcp-deprovision-bastionhost-ref.metadata.json
+++ b/ci-operator/step-registry/gcp/deprovision/bastionhost/gcp-deprovision-bastionhost-ref.metadata.json
@@ -2,7 +2,6 @@
 	"path": "gcp/deprovision/bastionhost/gcp-deprovision-bastionhost-ref.yaml",
 	"owners": {
 		"approvers": [
-			"wgahnagl",
 			"gpei",
 			"jianlinliu",
 			"jianli-wei"
diff --git a/ci-operator/step-registry/gcp/deprovision/buildhost/OWNERS b/ci-operator/step-registry/gcp/deprovision/buildhost/OWNERS
index 11686975a2765..a1e232269187e 100644
--- a/ci-operator/step-registry/gcp/deprovision/buildhost/OWNERS
+++ b/ci-operator/step-registry/gcp/deprovision/buildhost/OWNERS
@@ -1,2 +1,3 @@
 approvers:
+- wgahnagl
 - rphillips
diff --git a/ci-operator/step-registry/gcp/deprovision/buildhost/gcp-deprovision-buildhost-ref.metadata.json b/ci-operator/step-registry/gcp/deprovision/buildhost/gcp-deprovision-buildhost-ref.metadata.json
index e424d22513e31..d03d49031c803 100644
--- a/ci-operator/step-registry/gcp/deprovision/buildhost/gcp-deprovision-buildhost-ref.metadata.json
+++ b/ci-operator/step-registry/gcp/deprovision/buildhost/gcp-deprovision-buildhost-ref.metadata.json
@@ -2,6 +2,7 @@
 	"path": "gcp/deprovision/buildhost/gcp-deprovision-buildhost-ref.yaml",
 	"owners": {
 		"approvers": [
+			"wgahnagl",
 			"rphillips"
 		]
 	}
diff --git a/ci-operator/step-registry/gcp/deprovision/vpc/gcp-deprovision-vpc-ref.metadata.json b/ci-operator/step-registry/gcp/deprovision/vpc/gcp-deprovision-vpc-ref.metadata.json
index 12ef1e8bad58f..b1668666c4418 100644
--- a/ci-operator/step-registry/gcp/deprovision/vpc/gcp-deprovision-vpc-ref.metadata.json
+++ b/ci-operator/step-registry/gcp/deprovision/vpc/gcp-deprovision-vpc-ref.metadata.json
@@ -2,7 +2,6 @@
 	"path": "gcp/deprovision/vpc/gcp-deprovision-vpc-ref.yaml",
 	"owners": {
 		"approvers": [
-			"wgahnagl",
 			"gpei",
 			"jianlinliu",
 			"jianli-wei"
diff --git a/ci-operator/step-registry/gcp/provision/OWNERS b/ci-operator/step-registry/gcp/provision/OWNERS
index edad27cb2851e..e079a72508195 100644
--- a/ci-operator/step-registry/gcp/provision/OWNERS
+++ b/ci-operator/step-registry/gcp/provision/OWNERS
@@ -1,6 +1,4 @@
 approvers:
-- wgahnagl
 - gpei
 - jianlinliu
 - jianli-wei
-
diff --git a/ci-operator/step-registry/gcp/provision/bastionhost/gcp-provision-bastionhost-ref.metadata.json b/ci-operator/step-registry/gcp/provision/bastionhost/gcp-provision-bastionhost-ref.metadata.json
index f3fa82b0eefc5..880f5015e89b6 100644
--- a/ci-operator/step-registry/gcp/provision/bastionhost/gcp-provision-bastionhost-ref.metadata.json
+++ b/ci-operator/step-registry/gcp/provision/bastionhost/gcp-provision-bastionhost-ref.metadata.json
@@ -2,7 +2,6 @@
 	"path": "gcp/provision/bastionhost/gcp-provision-bastionhost-ref.yaml",
 	"owners": {
 		"approvers": [
-			"wgahnagl",
 			"gpei",
 			"jianlinliu",
 			"jianli-wei"
diff --git a/ci-operator/step-registry/gcp/provision/buildhost/OWNERS b/ci-operator/step-registry/gcp/provision/buildhost/OWNERS
deleted file mode 120000
index ec405d65a79df..0000000000000
--- a/ci-operator/step-registry/gcp/provision/buildhost/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-../OWNERS
\ No newline at end of file
diff --git a/ci-operator/step-registry/gcp/provision/buildhost/OWNERS b/ci-operator/step-registry/gcp/provision/buildhost/OWNERS
new file mode 100644
index 0000000000000..a1e232269187e
--- /dev/null
+++ b/ci-operator/step-registry/gcp/provision/buildhost/OWNERS
@@ -0,0 +1,3 @@
+approvers:
+- wgahnagl
+- rphillips
diff --git a/ci-operator/step-registry/gcp/provision/buildhost/gcp-provision-buildhost-commands.sh b/ci-operator/step-registry/gcp/provision/buildhost/gcp-provision-buildhost-commands.sh
index b300abd4bd56a..7948b6b4cfdd2 100755
--- a/ci-operator/step-registry/gcp/provision/buildhost/gcp-provision-buildhost-commands.sh
+++ b/ci-operator/step-registry/gcp/provision/buildhost/gcp-provision-buildhost-commands.sh
@@ -28,9 +28,6 @@ workdir=`mktemp -d`
 ###############Log In################
 #####################################
 
-workdir=`mktemp -d`
-curl -L https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o /tmp/yq && chmod +x /tmp/yq
-
 GOOGLE_PROJECT_ID="$(< ${CLUSTER_PROFILE_DIR}/openshift_gcp_project)"
 export GCP_SHARED_CREDENTIALS_FILE="${CLUSTER_PROFILE_DIR}/gce.json"
 sa_email=$(jq -r .client_email ${GCP_SHARED_CREDENTIALS_FILE})
@@ -45,8 +42,8 @@ echo "Using region: ${REGION}"
 
 VPC_CONFIG="${SHARED_DIR}/customer_vpc_subnets.yaml"
 if [[ -z "${NETWORK}" || -z "${CONTROL_PLANE_SUBNET}" ]]; then
-  NETWORK=$(/tmp/yq r "${VPC_CONFIG}" 'platform.gcp.network')
-  CONTROL_PLANE_SUBNET=$(/tmp/yq r "${VPC_CONFIG}" 'platform.gcp.controlPlaneSubnet')
+  NETWORK=$(yq-go r "${VPC_CONFIG}" 'platform.gcp.network')
+  CONTROL_PLANE_SUBNET=$(yq-go r "${VPC_CONFIG}" 'platform.gcp.controlPlaneSubnet')
 fi
 if [[ -z "${NETWORK}" || -z "${CONTROL_PLANE_SUBNET}" ]]; then
   echo "Could not find VPC network and control-plane subnet" && exit 1
diff --git a/ci-operator/step-registry/gcp/provision/buildhost/gcp-provision-buildhost-ref.metadata.json b/ci-operator/step-registry/gcp/provision/buildhost/gcp-provision-buildhost-ref.metadata.json
index 562c3390edc96..66e89378a8f3a 100644
--- a/ci-operator/step-registry/gcp/provision/buildhost/gcp-provision-buildhost-ref.metadata.json
+++ b/ci-operator/step-registry/gcp/provision/buildhost/gcp-provision-buildhost-ref.metadata.json
@@ -3,9 +3,7 @@
 	"owners": {
 		"approvers": [
 			"wgahnagl",
-			"gpei",
-			"jianlinliu",
-			"jianli-wei"
+			"rphillips"
 		]
 	}
 }
\ No newline at end of file
diff --git a/ci-operator/step-registry/gcp/provision/vpc/gcp-provision-vpc-ref.metadata.json b/ci-operator/step-registry/gcp/provision/vpc/gcp-provision-vpc-ref.metadata.json
index ea79ab8ae2694..b47ed0dc0e002 100644
--- a/ci-operator/step-registry/gcp/provision/vpc/gcp-provision-vpc-ref.metadata.json
+++ b/ci-operator/step-registry/gcp/provision/vpc/gcp-provision-vpc-ref.metadata.json
@@ -2,7 +2,6 @@
 	"path": "gcp/provision/vpc/gcp-provision-vpc-ref.yaml",
 	"owners": {
 		"approvers": [
-			"wgahnagl",
 			"gpei",
 			"jianlinliu",
 			"jianli-wei"