diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index d6d355e22..516c701f3 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -51,20 +51,15 @@ subscriptions:
             - "Expeditor: Skip All"
       - built_in:build_gem:
           only_if: built_in:bump_version
-      # - 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"
-  # - workload: buildkite_hab_build_group_published:{{agent_id}}:*
-  #   actions:
-  #     # when all of the hab package publish to the unstable channel, test and promote them
-  #     - trigger_pipeline:habitat/test
+      - trigger_pipeline:habitat/build:
+          only_if: built_in:bump_version
+          ignore_labels:
+            - "Expeditor: Skip Habitat"
+            - "Expeditor: Skip All"
+  - workload: buildkite_hab_build_group_published:{{agent_id}}:*
+    actions:
+      # when all of the hab package publish to the unstable channel, test and promote them
+      - trigger_pipeline:habitat/test
 
 pipelines:
   - verify:
@@ -72,16 +67,17 @@ pipelines:
       public: true
       env:
         - IGNORE_CACHE: 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
+  - 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