diff --git a/README.md b/README.md
index 4c8ec01b..6293f696 100644
--- a/README.md
+++ b/README.md
@@ -9,12 +9,12 @@ you to have intimate knowledge of all the tools involved.
 - Documentation: [Pivotal Documentation](http://docs.pivotal.io/tiledev/tile-generator.html)
 - PCF Tile Developers Guide: [Pivotal Documentation](http://docs.pivotal.io/tiledev/index.html)
 - Roadmap: [Github Issues](https://github.com/cf-platform-eng/tile-generator/issues)
-- CI Pipeline: [Concourse](https://concourse.cfplatformeng.com/teams/main/pipelines/tile-generator)
+- CI Pipeline: [Concourse](https://hush-house.pivotal.io/teams/PE/pipelines/tile-generator)
 
 ## Continuous Integration
 
 The master branch of this repository is being monitored by
-[this Concourse pipeline](https://concourse.cfplatformeng.com/teams/main/pipelines/tile-generator).
+[this Concourse pipeline](https://hush-house.pivotal.io/teams/PE/pipelines/tile-generator).
 The pipeline verifies that:
 
 - The tile generator passes all unit tests in `tile_generator/*_unittest.py`
diff --git a/ci/pipeline.yml.jinja2 b/ci/pipeline.yml.jinja2
index 2712b879..4ea5cd12 100644
--- a/ci/pipeline.yml.jinja2
+++ b/ci/pipeline.yml.jinja2
@@ -168,7 +168,7 @@ resources:
     hostname: environments.toolsmiths.cf-app.com
     pool_name: us_{{cluster}}
   tags:
-  - platform-eng-vsphere{% if not loop.last %}
+  - toolsmiths-shared-vsphere{% if not loop.last %}
 
 {% endif %}{% endfor %}
 
@@ -585,7 +585,7 @@ jobs:
       params:
         action: claim
       tags:
-      - platform-eng-vsphere
+      - toolsmiths-shared-vsphere
 
 - name: deploy-tile-{{ cluster }}
   disable_manual_trigger: true
@@ -608,7 +608,7 @@ jobs:
       passed: [ claim-{{ cluster }} ]
       trigger: true
       tags:
-      - platform-eng-vsphere
+      - toolsmiths-shared-vsphere
   - task: run-deploy-tile
     image: tile-generator-docker-image
     config:
@@ -641,7 +641,7 @@ jobs:
       passed: [ deploy-tile-{{ cluster }} ]
       trigger: true
       tags:
-      - platform-eng-vsphere
+      - toolsmiths-shared-vsphere
     - get: tile-generator-repo
       passed: [ deploy-tile-{{ cluster }} ]
     - get: version
@@ -683,7 +683,7 @@ jobs:
       passed: [ deployment-tests-{{ cluster }} ]
       trigger: true
       tags:
-      - platform-eng-vsphere
+      - toolsmiths-shared-vsphere
     - get: tile-generator-repo
       passed: [ deployment-tests-{{ cluster }} ]
     - get: version
@@ -716,7 +716,7 @@ jobs:
       action: unclaim
       env_file: pcf-environment-{{ cluster }}/metadata
     tags:
-    - platform-eng-vsphere{% if not loop.last %}
+    - toolsmiths-shared-vsphere{% if not loop.last %}
 
 {% endif %}{% endfor %}{% raw %}