diff --git a/Gemfile b/Gemfile
index 425b5da..474287e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,9 +10,10 @@ gem 'kafo_module_lint', {"groups"=>["test"]}
 gem 'puppet-lint-spaceship_operator_without_tag-check', '~> 1.0', {"groups"=>["test"]}
 gem 'voxpupuli-test', '~> 7.0', {"groups"=>["test"]}
 gem 'github_changelog_generator', '>= 1.15.0', {"groups"=>["development"]}
-gem 'puppet_metadata', '~> 3.4'
+gem 'puppet_metadata', github: 'voxpupuli/puppet_metadata', branch: 'add-debian-12'
 gem 'puppet-blacksmith', '>= 6.0.0', {"groups"=>["development"]}
-gem 'voxpupuli-acceptance', '~> 2.0', {"groups"=>["system_tests"]}
+gem 'voxpupuli-acceptance', github: 'ekohl/voxpupuli-acceptance', branch: 'pass-aio-preference'
+gem 'beaker_puppet_helpers', github: 'ekohl/beaker_puppet_helpers', branch: 'change-ubuntu-package-name'
 gem 'puppetlabs_spec_helper', {"groups"=>["system_tests"]}
 
 # vim:ft=ruby
diff --git a/metadata.json b/metadata.json
index 06de345..501c7cb 100644
--- a/metadata.json
+++ b/metadata.json
@@ -26,32 +26,17 @@
   ],
   "operatingsystem_support": [
     {
-      "operatingsystem": "RedHat",
+      "operatingsystem": "Fedora",
       "operatingsystemrelease": [
-        "7",
-        "8",
-        "9"
-      ]
-    },
-    {
-      "operatingsystem": "CentOS",
-      "operatingsystemrelease": [
-        "7",
-        "8",
-        "9"
-      ]
-    },
-    {
-      "operatingsystem": "Scientific",
-      "operatingsystemrelease": [
-        "7"
+        "37",
+        "38"
       ]
     },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "10",
-        "11"
+        "11",
+        "12"
       ]
     },
     {
@@ -59,21 +44,6 @@
       "operatingsystemrelease": [
         "20.04"
       ]
-    },
-    {
-      "operatingsystem": "FreeBSD",
-      "operatingsystemrelease": [
-        "11"
-      ]
-    },
-    {
-      "operatingsystem": "DragonFly",
-      "operatingsystemrelease": [
-        "4"
-      ]
-    },
-    {
-      "operatingsystem": "Archlinux"
     }
   ]
 }