diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 3869445..241767b 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -14,7 +14,7 @@ steps:
   expeditor:
     executor:
       docker:
-        image: ruby:2.4-buster
+        image: ruby:2.4
 
 - label: run-lint-and-specs-ruby-2.5
   command:
@@ -22,7 +22,7 @@ steps:
   expeditor:
     executor:
       docker:
-        image: ruby:2.5-buster
+        image: ruby:2.5
 
 - label: run-lint-and-specs-ruby-2.6
   command:
@@ -30,7 +30,7 @@ steps:
   expeditor:
     executor:
       docker:
-        image: ruby:2.6-buster
+        image: ruby:2.6
 
 - label: run-lint-and-specs-ruby-2.7
   command:
@@ -38,7 +38,7 @@ steps:
   expeditor:
     executor:
       docker:
-        image: ruby:2.7-buster
+        image: ruby:2.7
 
 - label: run-lint-and-specs-ruby-3.0
   command:
@@ -46,7 +46,15 @@ steps:
   expeditor:
     executor:
       docker:
-        image: ruby:3.0-buster
+        image: ruby:3.0
+
+- label: run-lint-and-specs-ruby-3.1
+  command:
+    - .expeditor/run_linux_tests.sh rake
+  expeditor:
+    executor:
+      docker:
+        image: ruby:3.1
 
 - label: run-specs-windows
   command:
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 950afb7..25d99ed 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,5 +1,5 @@
 # Order is important. The last matching pattern has the most precedence.
 
-*                 @chef/chef-foundation-owners @chef/chef-foundation-approvers @chef/chef-foundation-reviewers
-.expeditor/       @chef/jex-team
+*                @chef/chef-infra-reviewers @chef/chef-infra-approvers @chef/chef-infra-owners
+.expeditor/       @chef/infra-packages
 *.md              @chef/docs-team