diff --git a/.expeditor/buildkite/artifact.habitat.test.ps1 b/.expeditor/buildkite/artifact.habitat.test.ps1
index d93b6ce0..8e6c5731 100755
--- a/.expeditor/buildkite/artifact.habitat.test.ps1
+++ b/.expeditor/buildkite/artifact.habitat.test.ps1
@@ -5,8 +5,8 @@
 # TODO: Set-StrictMode -Version Latest
 $PSDefaultParameterValues['*:ErrorAction']='Stop'
 $ErrorActionPreference = 'Stop'
-$env:HAB_BLDR_CHANNEL = "LTS-2024"
-$env:HAB_REFRESH_CHANNEL = "LTS-2024"
+$env:HAB_BLDR_CHANNEL = "base-2025"
+$env:HAB_REFRESH_CHANNEL = "base-2025"
 $env:CHEF_LICENSE = 'accept-no-persist'
 $env:HAB_LICENSE = 'accept-no-persist'
 $Plan = 'chef-cli'
@@ -61,7 +61,6 @@ finally {
 Write-Host "HAB_ORIGIN set to 'ci' after installation."
 $env:HAB_ORIGIN = 'ci'
 
-
 Write-Host "--- Generating fake origin key"
 hab origin key generate $env:HAB_ORIGIN
 
diff --git a/.expeditor/buildkite/artifact.habitat.test.sh b/.expeditor/buildkite/artifact.habitat.test.sh
index e32cac63..6ddf3f91 100755
--- a/.expeditor/buildkite/artifact.habitat.test.sh
+++ b/.expeditor/buildkite/artifact.habitat.test.sh
@@ -40,7 +40,6 @@ echo "--- Installing Habitat"
 id -a
 curl https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.sh | bash
 
-# Set HAB_ORIGIN after Habitat installation
 echo "--- Setting HAB_ORIGIN to 'ci' after installation"
 export HAB_ORIGIN='ci'
 
diff --git a/.expeditor/habitat-test.pipeline.yml b/.expeditor/habitat-test.pipeline.yml
index cf8634ac..7c20d1c4 100644
--- a/.expeditor/habitat-test.pipeline.yml
+++ b/.expeditor/habitat-test.pipeline.yml
@@ -29,7 +29,7 @@ steps:
         docker:
           host_os: windows
           shell: ["powershell", "-Command"]
-          image: rubydistros/windows-2019:3.1
+          image: rubydistros/windows-2019:3.4
           user: 'NT AUTHORITY\SYSTEM'
           environment:
             - HAB_AUTH_TOKEN
diff --git a/habitat/plan.ps1 b/habitat/plan.ps1
index e7cee43b..bc4650e2 100644
--- a/habitat/plan.ps1
+++ b/habitat/plan.ps1
@@ -1,15 +1,15 @@
 $ErrorActionPreference = "Stop"
 $PSDefaultParameterValues['*:ErrorAction']='Stop'
 
-$env:HAB_BLDR_CHANNEL = "LTS-2024"
-$env:HAB_REFRESH_CHANNEL = "LTS-2024"
+$env:HAB_BLDR_CHANNEL = "base-2025"
+$env:HAB_REFRESH_CHANNEL = "base-2025"
 $pkg_name="chef-cli"
 $pkg_origin="chef"
 $pkg_version=$(Get-Content "$PLAN_CONTEXT/../VERSION")
 $pkg_maintainer="The Chef Maintainers <humans@chef.io>"
 
 $pkg_deps=@(
-  "chef/ruby31-plus-devkit"
+  "core/ruby3_4-plus-devkit"
   "core/git"
 )
 $pkg_bin_dirs=@("bin"
diff --git a/lib/chef-cli/command/license.rb b/lib/chef-cli/command/license.rb
index 039fb34e..f91da8ad 100644
--- a/lib/chef-cli/command/license.rb
+++ b/lib/chef-cli/command/license.rb
@@ -70,7 +70,7 @@ def run(params)
         remaining_args = parse_options(params)
         return 1 unless validate_params!(remaining_args)
 
-        if remaining_args.blank?
+        if remaining_args.empty?
           ChefCLI::Licensing::Base.validate
         else
           ChefCLI::Licensing::Base.send(remaining_args[0])