diff --git a/.expeditor/automate_build.sh b/.expeditor/automate_build.sh
index 88fb1dc3bd..833f6df448 100755
--- a/.expeditor/automate_build.sh
+++ b/.expeditor/automate_build.sh
@@ -42,7 +42,10 @@ HAB_FEAT_OFFLINE_INSTALL=true HAB_FEAT_IGNORE_LOCAL=false HAB_ORIGIN=chef HAB_CA
 
 git clone https://github.com/chef/automate.git
 cd automate
-git checkout ssudheer/ruby_update_3.1
+if [ "${AUTOMATE_BRANCH}" != "" ]
+then
+  git checkout "${AUTOMATE_BRANCH}"
+fi
 
 RESOLVED_RESULTS_DIR=$(realpath results/)
 export DO_CHECK=true
diff --git a/.expeditor/chef_server.sh b/.expeditor/chef_server.sh
index 4af0d2307d..4dd81e44e8 100755
--- a/.expeditor/chef_server.sh
+++ b/.expeditor/chef_server.sh
@@ -6,7 +6,10 @@
 
 git clone https://github.com/chef/automate.git
 cd automate
-git checkout ssudheer/ruby_update_3.1
+if [ "${AUTOMATE_BRANCH}" != "" ]
+then
+  git checkout "${AUTOMATE_BRANCH}"
+fi
 
 #===============================================================================
 chmod +x ./integration/tests/chef_server.sh
diff --git a/.expeditor/chef_server_only.sh b/.expeditor/chef_server_only.sh
index a50d9717c4..f903cccc86 100755
--- a/.expeditor/chef_server_only.sh
+++ b/.expeditor/chef_server_only.sh
@@ -6,7 +6,10 @@
 
 git clone https://github.com/chef/automate.git
 cd automate
-git checkout ssudheer/ruby_update_3.1
+if [ "${AUTOMATE_BRANCH}" != "" ]
+then
+  git checkout "${AUTOMATE_BRANCH}"
+fi
 
 #===============================================================================
 chmod +x ./integration/tests/chef_server_only.sh
diff --git a/.expeditor/ha_chef_server.sh b/.expeditor/ha_chef_server.sh
index f6231ad729..56b87df476 100644
--- a/.expeditor/ha_chef_server.sh
+++ b/.expeditor/ha_chef_server.sh
@@ -6,7 +6,10 @@
 
 git clone https://github.com/chef/automate.git
 cd automate
-git checkout ssudheer/ruby_update_3.1
+if [ "${AUTOMATE_BRANCH}" != "" ]
+then
+  git checkout "${AUTOMATE_BRANCH}"
+fi
 
 #===============================================================================
 
diff --git a/.license_scout.yml b/.license_scout.yml
index b341cf5c4c..0e63904ddf 100644
--- a/.license_scout.yml
+++ b/.license_scout.yml
@@ -214,5 +214,5 @@ exceptions:
     - name: core/nss-myhostname
       reason: Exception made by Chef Legal
     - name: core/xz
-      reason: Added for test to pass
+      reason: Exception made by Chef Legal