diff --git a/meta/main.yml b/meta/main.yml
index 04c44c178600ea2f0e037dc7a381db8f9a90af99..de1af12ccfe621a856d94513479a79e4abec137e 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -10,5 +10,6 @@ galaxy_info:
      - 5.7
      - 5.8
      - 5.9
+     - 6.0
   galaxy_tags: ['OpenBSD', 'bootstrap']
 dependencies: []
diff --git a/molecule.yml b/molecule.yml
index 17a93fa5b2f5de92dea6e2a60cffb34e6c7f8f63..5b5e174b2218671c2f2bc88c4aa917154043fee0 100644
--- a/molecule.yml
+++ b/molecule.yml
@@ -14,10 +14,13 @@ vagrant:
     type: virtualbox
   platforms:
   - name: openbsd
-    box: kaorimatz/openbsd-5.9-amd64
+    box: kaorimatz/openbsd-6.0-amd64
   instances:
   - name: ansible-role-openbsd-bootstrap
     options:
         append_platform_to_hostname: yes
   raw_config_args:
   - 'vm.synced_folder ".", "/vagrant", disabled: true'
+  - 'vbguest.auto_update = false'
+  - 'landrush.enabled = false'
+  - 'landrush_ip.override = false'