diff --git a/.gitignore b/.gitignore
index bde55c65..31ca83f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,7 +25,6 @@ _build
 .tmp/
 .librarian/
 .yardoc/
-Puppetfile.lock
 modules/*
 .ruby-*
 .bundle/
diff --git a/Puppetfile b/Puppetfile
index 8fc3261e..cf1b97ee 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -1,34 +1,18 @@
 forge 'https://forgeapi.puppet.com/'
 
-# HTTP/2 and SSL support for settings in Hiera
 mod 'puppetlabs/apache',               '>= 8.3'
-
-# SCRAM password support
 mod 'puppetlabs/postgresql',           '>= 10.1'
-
-# Dnfmodule support for Redis 6+ support
 mod 'puppet/redis',                    '>= 8.5.0'
-
-# Soft dependency of theforeman/puppet
-# https://github.com/theforeman/puppet-puppet/#git-repo-support
 mod 'puppetlabs/vcsrepo',              '>= 5.2.0'
-
-# Dependencies
-mod 'theforeman/dhcp',                 :git => 'https://github.com/theforeman/puppet-dhcp'
-mod 'theforeman/dns',                  :git => 'https://github.com/theforeman/puppet-dns'
-mod 'theforeman/puppetserver_foreman', :git => 'https://github.com/theforeman/puppet-puppetserver_foreman'
-mod 'theforeman/tftp',                 :git => 'https://github.com/theforeman/puppet-tftp'
-
-# Katello dependencies
-mod 'katello/candlepin',               :git => 'https://github.com/theforeman/puppet-candlepin'
-mod 'theforeman/pulpcore',             :git => 'https://github.com/theforeman/puppet-pulpcore'
-
-# Top-level modules
-mod 'theforeman/foreman',              :git => 'https://github.com/theforeman/puppet-foreman'
-mod 'theforeman/foreman_proxy',        :git => 'https://github.com/theforeman/puppet-foreman_proxy'
-mod 'theforeman/puppet',               :git => 'https://github.com/theforeman/puppet-puppet'
-
-# Top-level katello modules
-mod 'katello/foreman_proxy_content',   :git => 'https://github.com/theforeman/puppet-foreman_proxy_content'
-mod 'katello/certs',                   :git => 'https://github.com/theforeman/puppet-certs'
-mod 'katello/katello',                 :git => 'https://github.com/theforeman/puppet-katello'
+mod 'theforeman/dhcp',                 '~> 9.2.0'
+mod 'theforeman/dns',                  '~> 11.0.0'
+mod 'theforeman/puppetserver_foreman', '~> 4.0.0'
+mod 'theforeman/tftp',                 '~> 9.1.0'
+mod 'katello/candlepin',               '~> 16.1.0'
+mod 'theforeman/pulpcore',             '~> 10.3.0'
+mod 'theforeman/foreman',              '~> 25.2.0'
+mod 'theforeman/foreman_proxy',        '~> 26.1.0'
+mod 'theforeman/puppet',               '~> 20.0.0'
+mod 'katello/foreman_proxy_content',   '~> 29.0.0'
+mod 'katello/certs',                   '~> 19.0.0'
+mod 'katello/katello',                 '~> 25.2.0'
diff --git a/Puppetfile.lock b/Puppetfile.lock
new file mode 100644
index 00000000..5e715c4f
--- /dev/null
+++ b/Puppetfile.lock
@@ -0,0 +1,117 @@
+FORGE
+  remote: https://forgeapi.puppet.com/
+  specs:
+    katello-candlepin (16.1.0)
+      puppet-extlib (>= 3.0.0, < 8.0.0)
+      puppetlabs-concat (>= 1.0.0, < 10.0.0)
+      puppetlabs-postgresql (>= 9.2.0, < 11.0.0)
+      puppetlabs-stdlib (>= 9.0.0, < 10.0.0)
+    katello-certs (19.0.0)
+      puppet-extlib (>= 3.0.0, < 8.0.0)
+      puppetlabs-stdlib (>= 4.25.0, < 10.0.0)
+    katello-foreman_proxy_content (29.0.0)
+      katello-certs (>= 15.0.0, < 20.0.0)
+      puppet-extlib (>= 3.0.0, < 8.0.0)
+      puppet-trusted_ca (>= 2.0.0, < 6.0.0)
+      puppetlabs-apache (>= 10.1.1, < 13.0.0)
+      puppetlabs-stdlib (>= 4.25.0, < 10.0.0)
+      theforeman-foreman_proxy (>= 26.1.0, < 27.0.0)
+      theforeman-pulpcore (>= 10.0.0, < 11.0.0)
+    katello-katello (25.2.0)
+      katello-candlepin (>= 16.1.0, < 17.0.0)
+      katello-certs (>= 15.0.0, < 20.0.0)
+      puppet-extlib (>= 3.0.0, < 8.0.0)
+      puppetlabs-apache (>= 1.0.0, < 13.0.0)
+      puppetlabs-stdlib (>= 4.25.1, < 10.0.0)
+      theforeman-foreman (>= 17.0.0, < 26.0.0)
+    puppet-extlib (7.2.0)
+      puppetlabs-stdlib (>= 4.18.0, < 10.0.0)
+    puppet-mosquitto (2.1.0)
+      puppet-systemd (>= 3.1.0, < 8.0.0)
+      puppetlabs-stdlib (>= 6.3.0, < 10.0.0)
+    puppet-redis (11.0.0)
+      puppet-systemd (>= 2.0.0, < 8.0.0)
+      puppetlabs-stdlib (>= 8.4.0, < 10.0.0)
+    puppet-systemd (7.1.0)
+      puppetlabs-inifile (>= 1.6.0, < 7.0.0)
+      puppetlabs-stdlib (>= 8.5.0, < 10.0.0)
+    puppet-trusted_ca (5.0.0)
+      puppetlabs-stdlib (>= 9.0.0, < 10.0.0)
+    puppetlabs-apache (12.1.0)
+      puppetlabs-concat (>= 2.2.1, < 10.0.0)
+      puppetlabs-stdlib (>= 4.13.1, < 10.0.0)
+    puppetlabs-apt (9.4.0)
+      puppetlabs-stdlib (>= 9.0.0, < 10.0.0)
+    puppetlabs-concat (9.0.2)
+      puppetlabs-stdlib (>= 9.0.0, < 10.0.0)
+    puppetlabs-inifile (6.1.1)
+      puppetlabs-stdlib (>= 4.13.0, < 10.0.0)
+    puppetlabs-postgresql (10.3.0)
+      puppet-systemd (>= 4.0.1, < 8.0.0)
+      puppetlabs-apt (>= 9.2.0, < 10.0.0)
+      puppetlabs-concat (>= 4.1.0, < 10.0.0)
+      puppetlabs-stdlib (>= 9.0.0, < 10.0.0)
+    puppetlabs-stdlib (9.6.0)
+    puppetlabs-vcsrepo (6.1.0)
+    richardc-datacat (0.6.2)
+    theforeman-dhcp (9.2.0)
+      puppet-systemd (>= 3.1.0, < 8.0.0)
+      puppetlabs-concat (>= 1.0.0, < 10.0.0)
+      puppetlabs-stdlib (>= 4.18.0, < 10.0.0)
+    theforeman-dns (11.0.0)
+      puppetlabs-concat (>= 4.1.0, < 10.0.0)
+      puppetlabs-stdlib (>= 9.0.0, < 10.0.0)
+    theforeman-foreman (25.2.0)
+      puppet-extlib (>= 3.0.0, < 8.0.0)
+      puppet-redis (>= 5.0.0, < 12.0.0)
+      puppet-systemd (>= 3.1.0, < 8.0.0)
+      puppetlabs-apache (>= 8.0.0, < 13.0.0)
+      puppetlabs-apt (>= 2.0.0, < 10.0.0)
+      puppetlabs-concat (>= 1.0.0, < 10.0.0)
+      puppetlabs-postgresql (>= 6.5.0, < 11.0.0)
+      puppetlabs-stdlib (>= 9.0.0, < 10.0.0)
+    theforeman-foreman_proxy (26.1.0)
+      puppet-extlib (>= 3.0.0, < 8.0.0)
+      puppet-mosquitto (>= 1.1.0, < 3.0.0)
+      puppetlabs-stdlib (>= 4.19.0, < 10.0.0)
+      richardc-datacat (>= 0.6.0, < 1.0.0)
+      theforeman-dhcp (>= 6.1.0, < 10.0.0)
+      theforeman-dns (>= 11.0.0, < 12.0.0)
+      theforeman-foreman (>= 19.0.0, < 26.0.0)
+      theforeman-tftp (>= 3.0.0, < 10.0.0)
+    theforeman-pulpcore (10.3.0)
+      puppet-extlib (>= 3.0.0, < 8.0.0)
+      puppet-redis (>= 5.0.0, < 12.0.0)
+      puppet-systemd (>= 2.2.0, < 8.0.0)
+      puppetlabs-apache (>= 5.4.0, < 13.0.0)
+      puppetlabs-concat (>= 4.0.0, < 10.0.0)
+      puppetlabs-postgresql (>= 6.5.0, < 11.0.0)
+      puppetlabs-stdlib (>= 8.3.0, < 10.0.0)
+    theforeman-puppet (20.0.0)
+      puppet-extlib (>= 3.0.0, < 8.0.0)
+      puppet-systemd (>= 2.9.0, < 8.0.0)
+      puppetlabs-concat (>= 4.1.0, < 10.0.0)
+      puppetlabs-stdlib (>= 9.0.0, < 10.0.0)
+    theforeman-puppetserver_foreman (4.0.0)
+      puppetlabs-stdlib (>= 9.0.0, < 10.0.0)
+    theforeman-tftp (9.1.0)
+      puppetlabs-stdlib (>= 4.13.1, < 10.0.0)
+
+DEPENDENCIES
+  katello-candlepin (~> 16.1.0)
+  katello-certs (~> 19.0.0)
+  katello-foreman_proxy_content (~> 29.0.0)
+  katello-katello (~> 25.2.0)
+  puppet-redis (>= 8.5.0)
+  puppetlabs-apache (>= 8.3)
+  puppetlabs-postgresql (>= 10.1)
+  puppetlabs-vcsrepo (>= 5.2.0)
+  theforeman-dhcp (~> 9.2.0)
+  theforeman-dns (~> 11.0.0)
+  theforeman-foreman (~> 25.2.0)
+  theforeman-foreman_proxy (~> 26.1.0)
+  theforeman-pulpcore (~> 10.3.0)
+  theforeman-puppet (~> 20.0.0)
+  theforeman-puppetserver_foreman (~> 4.0.0)
+  theforeman-tftp (~> 9.1.0)
+