diff --git a/.expeditor/buildkite/artifact.habitat.test.ps1 b/.expeditor/buildkite/artifact.habitat.test.ps1
index 811764eb5..ee2f366d6 100755
--- a/.expeditor/buildkite/artifact.habitat.test.ps1
+++ b/.expeditor/buildkite/artifact.habitat.test.ps1
@@ -9,7 +9,7 @@ $env:HAB_BLDR_CHANNEL = "LTS-2024"
 $env:HAB_ORIGIN = 'ci'
 $env:CHEF_LICENSE = 'accept-no-persist'
 $env:HAB_LICENSE = 'accept-no-persist'
-$Plan = 'test-kitchen'
+$Plan = 'chef-test-kitchen-enterprise'
 
 Write-Host "--- system details"
 $Properties = 'Caption', 'CSName', 'Version', 'BuildType', 'OSArchitecture'
diff --git a/.expeditor/habitat-test.pipeline.yml b/.expeditor/habitat-test.pipeline.yml
index afc6244e4..5089fd325 100644
--- a/.expeditor/habitat-test.pipeline.yml
+++ b/.expeditor/habitat-test.pipeline.yml
@@ -18,18 +18,19 @@ steps:
           image: ruby:3.1
           privileged: true
 
-  - label: ":windows: Validate Habitat Builds of Test Kitchen"
-    commands:
-      - .expeditor/buildkite/artifact.habitat.test.ps1
-    expeditor:
-      executor:
-        docker:
-          host_os: windows
-          shell: ["powershell", "-Command"]
-          image: rubydistros/windows-2019:3.1
-          user: 'NT AUTHORITY\SYSTEM'
-          environment:
-            - FORCE_FFI_YAJL=ext
-            - EXPIRE_CACHE=true
-            - CHEF_LICENSE=accept-no-persist
-            - CHEF_LICENSE_SERVER=http://hosted-license-service-lb-8000-606952349.us-west-2.elb.amazonaws.com:8000/
+# Commenting out the Windows test since it is not required for the RC1 release
+#  - label: ":windows: Validate Habitat Builds of Test Kitchen"
+#    commands:
+#      - .expeditor/buildkite/artifact.habitat.test.ps1
+#    expeditor:
+#      executor:
+#        docker:
+#          host_os: windows
+#          shell: ["powershell", "-Command"]
+#          image: rubydistros/windows-2019:3.1
+#          user: 'NT AUTHORITY\SYSTEM'
+#          environment:
+#            - FORCE_FFI_YAJL=ext
+#            - EXPIRE_CACHE=true
+#            - CHEF_LICENSE=accept-no-persist
+#            - CHEF_LICENSE_SERVER=http://hosted-license-service-lb-8000-606952349.us-west-2.elb.amazonaws.com:8000/
diff --git a/Gemfile b/Gemfile
index 42734a504..6682c6185 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source "https://rubygems.org"
 gemspec
 gem "appbundler"
 gem "pry"
-gem "kitchen-dokken", git: "https://github.com/chef/kitchen-dokken", branch: "hab_testing_branch"
+gem "kitchen-dokken", git: "https://github.com/chef/kitchen-dokken", branch: "main"
 gem "kitchen-inspec", git: "https://github.com/inspec/kitchen-inspec", branch: "temp-point-to-chef-test-kitchen-ent"
 
 group :test do
diff --git a/habitat/plan.sh b/habitat/plan.sh
index f6e395a6f..d74f0cc15 100644
--- a/habitat/plan.sh
+++ b/habitat/plan.sh
@@ -3,7 +3,7 @@ _chef_client_ruby="core/ruby3_1"
 pkg_name="chef-test-kitchen-enterprise"
 pkg_origin="chef"
 pkg_maintainer="The Chef Maintainers <humans@chef.io>"
-pkg_description="The Chef Test Kitchen"
+pkg_description="The Chef Test Kitchen Enterprise"
 pkg_license=('Apache-2.0')
 pkg_bin_dirs=(
   bin