diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml
index 2dac76a..4f84767 100644
--- a/.github/workflows/kitchen.vagrant.yml
+++ b/.github/workflows/kitchen.vagrant.yml
@@ -14,10 +14,12 @@ jobs:
       fail-fast: false
       matrix:
         instance:
-          - default-freebsd-122-latest-py3
-          # - freebsd-122-latest-py3
-          - default-freebsd-114-latest-py3
-          # - freebsd-114-latest-py3
+          - default-freebsd-122-master-py3
+          # - freebsd-122-master-py3
+          - default-freebsd-114-master-py3
+          # - freebsd-114-master-py3
+          # - default-freebsd-122-3002-6-py3
+          # - default-freebsd-114-3002-6-py3
     steps:
       - name: 'Check out code'
         uses: 'actions/checkout@v2'
diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml
index cb9c6d9..6ca8287 100644
--- a/kitchen.vagrant.yml
+++ b/kitchen.vagrant.yml
@@ -7,17 +7,26 @@ driver:
   customize:
     usbxhci: 'off'
   gui: false
-  linked_clone: true
   ssh:
     shell: /bin/sh
+  <% unless ENV['CI'] %>
+  linked_clone: true
+  synced_folders:
+    - - '.kitchen/kitchen-vagrant/%{instance_name}/vagrant'
+      - '/vagrant'
+      - 'create: true, disabled: false'
+  <% end %>
 
 platforms:
-  - name: freebsd-122-latest-py3
+  - name: freebsd-122-master-py3
     driver:
-      box: bento/freebsd-12.2
-  - name: freebsd-114-latest-py3
+      box: myii/freebsd-12.2-master-py3
+  - name: freebsd-114-master-py3
     driver:
-      box: bento/freebsd-11.4
-
-provisioner:
-  salt_install: bootstrap
+      box: myii/freebsd-11.4-master-py3
+  - name: freebsd-122-3002-6-py3
+    driver:
+      box: myii/freebsd-12.2-3002.6-py3
+  - name: freebsd-114-3002-6-py3
+    driver:
+      box: myii/freebsd-11.4-3002.6-py3