diff --git a/Gemfile b/Gemfile
index 425b5da7..e4653195 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,9 +10,11 @@ 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', ref: 'refs/pull/122/head'
 gem 'puppet-blacksmith', '>= 6.0.0', {"groups"=>["development"]}
 gem 'voxpupuli-acceptance', '~> 2.0', {"groups"=>["system_tests"]}
+gem 'beaker', require: false, github: 'voxpupuli/beaker', ref: 'refs/pull/1853/head', groups: ["system_tests"]
+gem 'beaker-hostgenerator', require: false, github: 'voxpupuli/beaker-hostgenerator', ref: 'refs/pull/359/head', groups: ["system_tests"]
 gem 'puppetlabs_spec_helper', {"groups"=>["system_tests"]}
 
 # vim:ft=ruby
diff --git a/metadata.json b/metadata.json
index 17c21d34..4d85adc1 100644
--- a/metadata.json
+++ b/metadata.json
@@ -64,45 +64,6 @@
         "8",
         "9"
       ]
-    },
-    {
-      "operatingsystem": "CentOS",
-      "operatingsystemrelease": [
-        "8",
-        "9"
-      ]
-    },
-    {
-      "operatingsystem": "Debian",
-      "operatingsystemrelease": [
-        "11"
-      ]
-    },
-    {
-      "operatingsystem": "Ubuntu",
-      "operatingsystemrelease": [
-        "20.04",
-        "22.04"
-      ]
-    },
-    {
-      "operatingsystem": "FreeBSD",
-      "operatingsystemrelease": [
-        "11",
-        "12"
-      ]
-    },
-    {
-      "operatingsystem": "DragonFly",
-      "operatingsystemrelease": [
-        "4"
-      ]
-    },
-    {
-      "operatingsystem": "AlmaLinux",
-      "operatingsystemrelease": [
-        "8"
-      ]
     }
   ]
 }