diff --git a/.github/workflows/kitchen.macos.yml b/.github/workflows/kitchen.macos.yml
index 038ceb61..38608166 100644
--- a/.github/workflows/kitchen.macos.yml
+++ b/.github/workflows/kitchen.macos.yml
@@ -8,13 +8,13 @@ env:
   KITCHEN_LOCAL_YAML: 'kitchen.macos.yml'
 
 jobs:
-  test-12:
+  test-13:
     runs-on: 'macos-12'
     strategy:
       fail-fast: false
       matrix:
         instance:
-          - default-macos-12-latest-py3
+          - default-macos-13-latest-py3
     steps:
       - name: 'Check out code'
         uses: 'actions/checkout@v2'
@@ -31,13 +31,13 @@ jobs:
           bundle install --jobs 4 --retry 3
       - name: 'Run Test Kitchen'
         run: 'bundle exec kitchen verify ${{ matrix.instance }}'
-  test-11:
-    runs-on: 'macos-11'
+  test-12:
+    runs-on: 'macos-12'
     strategy:
       fail-fast: false
       matrix:
         instance:
-          - default-macos-11-latest-py3
+          - default-macos-12-latest-py3
     steps:
       - name: 'Check out code'
         uses: 'actions/checkout@v2'
@@ -54,13 +54,13 @@ jobs:
           bundle install --jobs 4 --retry 3
       - name: 'Run Test Kitchen'
         run: 'bundle exec kitchen verify ${{ matrix.instance }}'
-  test-1015:
-    runs-on: 'macos-10.15'
+  test-11:
+    runs-on: 'macos-11'
     strategy:
       fail-fast: false
       matrix:
         instance:
-          - default-macos-1015-latest-py3
+          - default-macos-11-latest-py3
     steps:
       - name: 'Check out code'
         uses: 'actions/checkout@v2'
diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml
index b99aad0e..635626f4 100644
--- a/.github/workflows/kitchen.vagrant.yml
+++ b/.github/workflows/kitchen.vagrant.yml
@@ -9,7 +9,7 @@ env:
 
 jobs:
   test:
-    runs-on: 'macos-10.15'
+    runs-on: 'macos-12'
     strategy:
       fail-fast: false
       matrix:
diff --git a/kitchen.macos.yml b/kitchen.macos.yml
index 2528195b..88a3b04c 100644
--- a/kitchen.macos.yml
+++ b/kitchen.macos.yml
@@ -7,19 +7,19 @@ driver:
 provisioner:
   sudo: true
   salt_install: bootstrap
-  salt_bootstrap_options: -P stable latest
+  salt_bootstrap_options: -P onedir 3006.1
   salt_call_command: /opt/salt/bin/salt-call
 
 platforms:
-  - name: macos-12-latest-py3
+  - name: macos-13-latest-py3
     verifier:
       inputs:
-        saltmajorversion: 3004
-  - name: macos-11-latest-py3
+        saltmajorversion: 3006
+  - name: macos-12-latest-py3
     verifier:
       inputs:
-        saltmajorversion: 3004
-  - name: macos-1015-latest-py3
+        saltmajorversion: 3006
+  - name: macos-11-latest-py3
     verifier:
       inputs:
-        saltmajorversion: 3004
+        saltmajorversion: 3006
diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml
index c76adae2..d45b3ef9 100644
--- a/kitchen.vagrant.yml
+++ b/kitchen.vagrant.yml
@@ -74,7 +74,7 @@ platforms:
       # yamllint enable rule:line-length
     verifier:
       inputs:
-        saltmajorversion: 3004
+        saltmajorversion: 3006
   - name: windows-81-latest-py3
     driver:
       box: techneg/win81x64-pro-salt
@@ -98,4 +98,4 @@ platforms:
       # yamllint enable rule:line-length
     verifier:
       inputs:
-        saltmajorversion: 3004
+        saltmajorversion: 3006
diff --git a/kitchen.windows.yml b/kitchen.windows.yml
index 401a5032..30247432 100644
--- a/kitchen.windows.yml
+++ b/kitchen.windows.yml
@@ -11,7 +11,7 @@ driver:
 
 provisioner:
   salt_install: bootstrap
-  salt_bootstrap_options: -pythonVersion 3 -version 3004.1-1
+  salt_bootstrap_options: -version onedir
   # yamllint disable rule:line-length
   init_environment: |
     salt-call --local state.single file.managed `
@@ -24,8 +24,8 @@ platforms:
   - name: windows-2022-latest-py3
     verifier:
       inputs:
-        saltmajorversion: 3004
+        saltmajorversion: 3006
   - name: windows-2019-latest-py3
     verifier:
       inputs:
-        saltmajorversion: 3004
+        saltmajorversion: 3006