diff --git a/ci/pipelines/osspi-wavefront-sdk-go/pipeline.yml b/ci/pipelines/osspi-wavefront-sdk-go/pipeline.yml
index 0953101..f1492d7 100644
--- a/ci/pipelines/osspi-wavefront-sdk-go/pipeline.yml
+++ b/ci/pipelines/osspi-wavefront-sdk-go/pipeline.yml
@@ -5,14 +5,14 @@ resources:
   icon: gitlab
   source:
     uri: git@gitlab.eng.vmware.com:source-insight-tooling/norsk-to-osspi.git
-    private_key: ((tas2to-osspi.norsk-to-osspi-private-key))
+    private_key: ((tas2to.norsk-to-osspi-private-key))
     branch: main
 - name: wavefront-sdk-go
   type: git
   source:
     uri: git@github.com:wavefrontHQ/wavefront-sdk-go
     branch: main
-    private_key: ((tas2to-osspi.github-private-key))
+    private_key: ((tas2to.github-private-key))
 
 jobs:
 - name: wavefront-sdk-go-scan
@@ -32,8 +32,8 @@ jobs:
       params:
         REPO: repo2
         OSM_ENVIRONMENT: ((osm-environment))
-        API_KEY: ((tas2to-osspi.apikey-((osm-environment))))
-        USERNAME: ((tas2to-osspi.user-((osm-environment))))
+        API_KEY: ((tas2to.apikey-((osm-environment))))
+        USERNAME: ((tas2to.user-((osm-environment))))
         PRODUCT: wavefront-sdk-go
         VERSION: ((version))
         OSM_PACKAGE_GROUP_NAME: wavefront-sdk-go
diff --git a/ci/pipelines/osspi-wavefront-sdk-go/set_pipeline.sh b/ci/pipelines/osspi-wavefront-sdk-go/set_pipeline.sh
index 2115bd8..a866602 100755
--- a/ci/pipelines/osspi-wavefront-sdk-go/set_pipeline.sh
+++ b/ci/pipelines/osspi-wavefront-sdk-go/set_pipeline.sh
@@ -3,13 +3,14 @@ set -efuo pipefail
 
 which fly || (
   echo "This requires fly to be installed"
-  echo "Download the binary from https://github.com/concourse/concourse/releases or from the Runway Concourse: https://runway-ci.eng.vmware.com"
+  echo "Download the binary from https://github.com/concourse/concourse/releases or from the Runway Concourse: https://runway-ci-sfo.eng.vmware.com"
   exit 1
 )
 
+TARGET=runway-sfo
 fly -t runway sync || (
   echo "This requires the runway target to be set"
-  echo "Create this target by running 'fly -t runway login -c https://runway-ci.eng.vmware.com -n tobs-k8s-group'"
+  echo "Create this target by running 'fly -t "${TARGET}" login -c https://runway-ci-sfo.eng.vmware.com -n cpo-team-troll'"
   exit 1
 )
 
@@ -18,10 +19,10 @@ VERSION=${VERSION:-"Latest"}
 OSM_ENVIRONMENT=${OSM_ENVIRONMENT:-"production"}
 echo "using OSM_ENVIRONMENT: ${OSM_ENVIRONMENT}. Valid environments are beta and production"
 
-fly --target runway set-pipeline \
-    --pipeline "osspi-wavefront-sdk-go" \
+fly --target "${TARGET}" set-pipeline \
+    --pipeline "wavefront-sdk-go-osspi" \
     --config "${pipeline_dir}/pipeline.yml" \
     --var osm-environment="${OSM_ENVIRONMENT}" \
     --var version="${VERSION}"
 
-fly -t runway order-pipelines --alphabetical > /dev/null
\ No newline at end of file
+fly -t "${TARGET}" order-pipelines --alphabetical > /dev/null
\ No newline at end of file