diff --git a/org/cloudfoundry.yml b/org/cloudfoundry.yml
index 23fa5a40..3a400ab7 100644
--- a/org/cloudfoundry.yml
+++ b/org/cloudfoundry.yml
@@ -412,6 +412,7 @@ orgs:
         description: Get your workstation setup to work on the bosh team
         has_projects: false
         has_wiki: false
+        archived: true
         private: true
       bosh_rackspace_cpi_spike:
         description: An experimental/unsupported/untested CPI for Rackspace
diff --git a/toc/working-groups/foundational-infrastructure.md b/toc/working-groups/foundational-infrastructure.md
index e96a111d..5c438196 100644
--- a/toc/working-groups/foundational-infrastructure.md
+++ b/toc/working-groups/foundational-infrastructure.md
@@ -402,7 +402,6 @@ areas:
   - cloudfoundry/bosh-warden-cpi-release
   - cloudfoundry/bosh-windows-acceptance-tests
   - cloudfoundry/bosh-windows-stemcell-builder
-  - cloudfoundry/bosh-workstation
   - cloudfoundry/bpm-release
   - cloudfoundry/bsdtar
   - cloudfoundry/config-server