diff --git a/.fixtures-latest.yml b/.fixtures-latest.yml
index 0ba6ef4..53b1629 100644
--- a/.fixtures-latest.yml
+++ b/.fixtures-latest.yml
@@ -1,28 +1,26 @@
 fixtures:
   repositories:
     stdlib:
       repo: https://github.com/puppetlabs/puppetlabs-stdlib.git
     mysql:
       repo: https://github.com/puppetlabs/puppetlabs-mysql.git
     postgresql:
       repo: https://github.com/puppetlabs/puppetlabs-postgresql.git
     java:
       repo: https://github.com/puppetlabs/puppetlabs-java.git
     java_ks:
       repo: https://github.com/puppetlabs/puppetlabs-java_ks.git
     archive:
       repo: https://github.com/voxpupuli/puppet-archive.git
     systemd:
-      repo: https://github.com/camptocamp/puppet-systemd.git
+      repo: https://github.com/voxpupuli/puppet-systemd.git
     yumrepo_core:
       repo: https://github.com/puppetlabs/puppetlabs-yumrepo_core.git
-      puppet_version: ">= 6.0.0"
     augeas_core:
       repo: https://github.com/puppetlabs/puppetlabs-augeas_core.git
-      puppet_version: ">= 6.0.0"
     apt:
       repo: https://github.com/puppetlabs/puppetlabs-apt.git
     concat:
       repo: https://github.com/puppetlabs/puppetlabs-concat.git
   symlinks:
     keycloak: "#{source_dir}"
diff --git a/.fixtures.yml b/.fixtures.yml
index 636327a..fbe8ac8 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -1,37 +1,35 @@
 fixtures:
   repositories:
     stdlib:
       repo: https://github.com/puppetlabs/puppetlabs-stdlib.git
       ref: 4.25.0
     mysql:
       repo: https://github.com/puppetlabs/puppetlabs-mysql.git
       ref: v10.3.0
     postgresql:
       repo: https://github.com/puppetlabs/puppetlabs-postgresql.git
       ref: v6.6.0
     java:
       repo: https://github.com/puppetlabs/puppetlabs-java.git
       ref: v7.3.0
     java_ks:
       repo: https://github.com/puppetlabs/puppetlabs-java_ks.git
       ref: 1.4.1
     archive:
       repo: https://github.com/voxpupuli/puppet-archive.git
       ref: v0.5.1
     systemd:
-      repo: https://github.com/camptocamp/puppet-systemd.git
+      repo: https://github.com/voxpupuli/puppet-systemd.git
       ref: 0.4.0
     augeas_core:
       repo: https://github.com/puppetlabs/puppetlabs-augeas_core.git
-      puppet_version: ">= 6.0.0"
       ref: 1.1.1
     yumrepo_core:
       repo: https://github.com/puppetlabs/puppetlabs-yumrepo_core.git
-      puppet_version: ">= 6.0.0"
       ref: 1.0.7
     apt:
       repo: https://github.com/puppetlabs/puppetlabs-apt.git
     concat:
       repo: https://github.com/puppetlabs/puppetlabs-concat.git
   symlinks:
     keycloak: "#{source_dir}"
diff --git a/metadata.json b/metadata.json
index 4426844..2c4925d 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,92 +1,92 @@
 {
   "name": "treydock-keycloak",
   "version": "7.10.0",
   "author": "treydock",
   "summary": "Keycloak Puppet module",
   "license": "Apache-2.0",
   "source": "https://github.com/treydock/puppet-module-keycloak",
   "project_page": "https://github.com/treydock/puppet-module-keycloak",
   "issues_url": "https://github.com/treydock/puppet-module-keycloak/issues",
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.25.0 <8.0.0"
+      "version_requirement": ">= 4.25.0 <9.0.0"
     },
     {
       "name": "puppetlabs/mysql",
-      "version_requirement": ">= 10.3.0 <12.0.0"
+      "version_requirement": ">= 10.3.0 <13.0.0"
     },
     {
       "name": "puppetlabs/postgresql",
       "version_requirement": ">= 6.6.0 <8.0.0"
     },
     {
       "name": "puppetlabs/java",
       "version_requirement": ">= 7.3.0 <8.0.0"
     },
     {
       "name": "puppetlabs/java_ks",
       "version_requirement": ">= 1.0.0 <5.0.0"
     },
     {
       "name": "puppetlabs/augeas_core",
       "version_requirement": ">= 1.0.0 <2.0.0"
     },
     {
       "name": "puppetlabs/yumrepo_core",
       "version_requirement": ">= 1.0.0 <2.0.0"
     },
     {
       "name": "puppet/archive",
-      "version_requirement": ">= 0.5.1 <6.0.0"
+      "version_requirement": ">= 0.5.1 <7.0.0"
     },
     {
-      "name": "camptocamp/systemd",
+      "name": "puppet/systemd",
       "version_requirement": ">= 0.4.0 <4.0.0"
     }
   ],
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "7",
         "8"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "7"
       ]
     },
     {
       "operatingsystem": "Rocky",
       "operatingsystemrelease": [
         "8"
       ]
     },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
         "9",
         "10"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "18.04",
         "20.04"
       ]
     }
   ],
   "requirements": [
     {
       "name": "puppet",
       "version_requirement": ">= 6.0.0 < 8.0.0"
     }
   ],
   "pdk-version": "1.17.0",
   "template-url": "https://github.com/treydock/pdk-templates.git#master",
   "template-ref": "heads/master-0-g3b13f94"
 }