diff --git a/content/_index.md b/content/_index.md
index a44cd76..c36d273 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -61,3 +61,22 @@ Chef Workstation includes the following fully integrated tools:
 - **Berkshelf**: Cookbook dependency manager that streamlines the process of managing and retrieving cookbook dependencies
 - **Chef Vault**: Secure data management tool for encrypting and managing secrets within Chef workflows
 - **Ohai**: System profiling tool that detects and reports system attributes for use in Chef recipes
+
+## Component repositories
+
+Chef Workstation is composed of independently maintained projects, each with its own source repository and build pipeline.
+The [chef/chef-workstation](https://github.com/chef/chef-workstation) repository contains the Chef Habitat packaging plan that assembles all components into the unified `chef/chef-workstation` Habitat package.
+
+| Component | Source repository | Habitat package |
+| --- | --- | --- |
+| Chef Workstation (packaging) | [chef/chef-workstation](https://github.com/chef/chef-workstation) | `chef/chef-workstation` |
+| Chef CLI | [chef/chef-cli](https://github.com/chef/chef-cli) | `chef/chef-cli` |
+| Chef Infra Client | [chef/chef](https://github.com/chef/chef) | `chef/chef-infra-client` |
+| Knife | [chef/knife](https://github.com/chef/knife) | `chef/knife` |
+| Chef InSpec | [inspec/inspec](https://github.com/inspec/inspec) | `chef/inspec` |
+| Test Kitchen | [test-kitchen/test-kitchen](https://github.com/test-kitchen/test-kitchen) | `chef/chef-test-kitchen-enterprise` |
+| Cookstyle | [chef/cookstyle](https://github.com/chef/cookstyle) | `chef/cookstyle` |
+| Berkshelf | [chef/berkshelf](https://github.com/chef/berkshelf) | `chef/berkshelf` |
+| Chef Vault | [chef/chef-vault](https://github.com/chef/chef-vault) | `chef/chef-vault` |
+| Ohai | [chef/ohai](https://github.com/chef/ohai) | `chef/ohai` |
+| Fauxhai | [chef/fauxhai](https://github.com/chef/fauxhai) | `chef/fauxhai` |
diff --git a/content/install.md b/content/install.md
index 9f95e18..c936d5b 100644
--- a/content/install.md
+++ b/content/install.md
@@ -12,6 +12,9 @@ draft = false
 
 {{< readfile file="/content/reusable/md/workstation_modularize.md" >}}
 
+The Habitat packaging plan that assembles all components is maintained in the [chef/chef-workstation](https://github.com/chef/chef-workstation) repository.
+See [Component repositories](/workstation/#component-repositories) for a full list of component source repositories.
+
 ## System requirements
 
 Chef Workstation 26 has the following requirements:
diff --git a/content/reusable/md/chef_workstation.md b/content/reusable/md/chef_workstation.md
index 42f08f6..5c73652 100644
--- a/content/reusable/md/chef_workstation.md
+++ b/content/reusable/md/chef_workstation.md
@@ -1,10 +1,13 @@
-Start your infrastructure automation with Chef Workstation. Chef Workstation gives you everything you need to get started with Chef - ad hoc remote execution, remote scanning, configuration tasks, cookbook creation tools as well as robust dependency and testing software - all in one easy-to-install package.
+Start your infrastructure automation with Chef Workstation.
+Chef Workstation gives you everything you need to get started with Chef---ad hoc remote execution, remote scanning, configuration tasks, cookbook creation tools as well as robust dependency and testing software---distributed as modular [Chef Habitat](https://docs.chef.io/habitat/) packages.
 
 Chef Workstation includes:
 
 - Chef Infra Client
 - Chef InSpec
-- Chef Habitat
 - chef and knife command line tools
 - Testing tools such as Test Kitchen and Cookstyle
 - Everything else needed to author cookbooks and upload them to Chef Infra Server
+
+Each tool is an independently maintained project with its own source repository and build pipeline.
+See [Component repositories](/workstation/#component-repositories) for the full list.
diff --git a/content/tools/kitchen/config_yml_kitchen.md b/content/tools/kitchen/config_yml_kitchen.md
index d2aa68e..9bf2c3e 100644
--- a/content/tools/kitchen/config_yml_kitchen.md
+++ b/content/tools/kitchen/config_yml_kitchen.md
@@ -55,7 +55,13 @@ Chef-specific settings:
 : Default value: `/etc/opt` for UNIX and Linux, `$env:systemdrive\\opscode\\chef` on Windows.
 
 `chef_omnibus_url`
-: The URL of an `install.sh` script that will install Chef Infra Client on the machine under test. Default value: `https://omnitruck.chef.io/install.sh`. **This will be deprecated in a future version.**
+: The URL of an `install.sh` script that will install Chef Infra Client on the machine under test.
+
+  Commercial: `https://chefdownload-commercial.chef.io/install.sh?license_id=<LICENSE_ID>`
+
+  Community: `https://chefdownload-community.chef.io/install.sh`
+
+  For the commercial endpoint, replace `<LICENSE_ID>` with your actual license ID. You can find your license key at: [How Do I Find My License Key Needed For Chef Product Downloads](https://community.progress.com/s/article/How-Do-I-Find-My-License-Key-Needed-For-Chef-Product-Downloads)
 
 `chef_solo_path`
 : chef-solo provisioner only.
diff --git a/content/tools/kitchen/ctl_kitchen.md b/content/tools/kitchen/ctl_kitchen.md
index 45e5ead..9621ada 100644
--- a/content/tools/kitchen/ctl_kitchen.md
+++ b/content/tools/kitchen/ctl_kitchen.md
@@ -929,7 +929,7 @@ to return something similar to:
 -----> Converging <default-ubuntu-1804>...
 ...
 -----> Installing Chef install only if missing package
-       Downloading https://omnitruck.chef.io/install.sh to file /tmp/install.sh
+       Downloading https://chefdownload-commercial.chef.io/install.sh?license_id=<LICENSE_ID> to file /tmp/install.sh
 ...
        Installing chef
 ...