diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index ba633d5a2..5750b7efc 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -1,19 +1,9 @@
 # Documentation available at https://expeditor.chef.io/docs/getting-started/
 ---
-
 # Slack channel in Chef Software slack to send notifications about build failures, etc
 slack:
   notify_channel: chef-ws-notify
 
-# This publish is triggered by the `built_in:publish_rubygems` artifact_action.
-rubygems:
-  - berkshelf
-
-artifact_channels:
-  - dev
-  - workstation-build
-  - LTS-2024
-
 github:
   # This deletes the GitHub PR branch after successfully merged into the release branch
   delete_branch_on_merge: true
@@ -28,13 +18,36 @@ github:
 
 release_branches:
   - workstation-LTS:
-      version_constraint: 0*
+      version_constraint: 0.*
   - main:
-      version_constraint: 8*
+      version_constraint: 8.*
+
+artifact_channels:
+  - dev
+  - workstation-build
+  - LTS-2024
 
 changelog:
   rollup_header: Changes not yet released to rubygems.org
 
+pipelines:
+  - verify:
+      description: Pull Request validation tests
+      public: true
+  - habitat/build:
+      env:
+        - HAB_NONINTERACTIVE: "true"
+        - HAB_NOCOLORING: "true"
+        - HAB_STUDIO_SECRET_HAB_NONINTERACTIVE: "true"
+  - habitat/test:
+      description: Execute tests against the habitat artifact
+      definition: .expeditor/habitat-test.pipeline.yml
+      env:
+        - HAB_NONINTERACTIVE: "true"
+        - HAB_NOCOLORING: "true"
+        - HAB_STUDIO_SECRET_HAB_NONINTERACTIVE: "true"
+      trigger: pull_request
+
 subscriptions:
   # These actions are taken, in order they are specified, anytime a Pull Request is merged.
   - workload: pull_request_merged:{{github_repo}}:{{release_branch}}:*
@@ -49,39 +62,27 @@ subscriptions:
           ignore_labels:
             - "Expeditor: Skip Changelog"
             - "Expeditor: Skip All"
+      - trigger_pipeline:habitat/test:
+          only_if: built_in:bump_version
+          ignore_labels:
+            - "Expeditor: Skip Habitat"
+            - "Expeditor: Skip All"
       - trigger_pipeline:habitat/build:
           only_if: built_in:bump_version
           ignore_labels:
             - "Expeditor: Skip Habitat"
             - "Expeditor: Skip All"
+
+  # the habitat chain
   - workload: buildkite_hab_build_group_published:{{agent_id}}:*
     actions:
       # when all of the hab package publish to the unstable channel, test and promote them
       - built_in:promote_habitat_packages
+
+  # Subscribe to the promotion of the dev channel to acceptance
   - workload: project_promoted:{{agent_id}}:dev:*
     actions:
       - built_in:promote_habitat_packages
   - workload: project_promoted:{{agent_id}}:workstation-build:*
     actions:
       - built_in:promote_habitat_packages
-
-pipelines:
-  - verify:
-      description: Pull Request validation tests
-      public: true
-      env:
-        - IGNORE_CACHE: true
-  - habitat/build:
-      description: Build the Habitat packages for berkshelf
-      env:
-        - HAB_NONINTERACTIVE: "true"
-        - HAB_NOCOLORING: "true"
-        - HAB_STUDIO_SECRET_HAB_NONINTERACTIVE: "true"
-  - habitat/test:
-      description: Execute tests against the habitat artifact
-      definition: .expeditor/habitat-test.pipeline.yml
-      env:
-        - HAB_NONINTERACTIVE: "true"
-        - HAB_NOCOLORING: "true"
-        - HAB_STUDIO_SECRET_HAB_NONINTERACTIVE: "true"
-      trigger: pull_request