diff --git a/module.yml b/module.yml
index d3ecf9b..821150b 100644
--- a/module.yml
+++ b/module.yml
@@ -33,6 +33,7 @@ modules:
       - module-perl-bootstrap-5.24-8040020210602155812-9f9e2e7e
       - module-perl-bootstrap-5.26-8040020210601201707-9f9e2e7e
       - module-perl-bootstrap-5.30-8040020210601185857-9f9e2e7e
+      - module-perl-bootstrap-5.32-8050020220420221328-b4937e53
       - module-perl-YAML-bootstrap-1.24-8040020210603022817-e436f1f6
       - module-python38-3.8-bootstrap-8040020210611140355-b1b639b6
       - module-python39-3.9-bootstrap-8040020210611165006-f1d9d306
@@ -40,21 +41,22 @@ modules:
   build_modules:
     r8:
       - module-gimp-2.8-8030020210427153901-c307c522
-      - module-go-toolset-rhel8-8050020211215173118-8aa62369
+      - module-go-toolset-rhel8-8060020220330021457-76a129d7
       - module-httpd-2.4-8050020211109175647-b4937e53
       - module-idm-client-8050020211109131657-de73ecb2
+      - module-jmc-rhel8-8050020211109115703-6392b1f8
       - module-javapackages-tools-201801-8030020210424203036-82c16c76
-      - module-llvm-toolset-rhel8-8050020211109145317-b4937e53
+      - module-llvm-toolset-rhel8-8060020220330021522-d63f516d
       - module-mariadb-10.3-8030020210427020015-30b713e6
       - module-nodejs-10-8030020210426100849-30b713e6
-      - module-perl-5.26-8040020210601184636-9f9e2e7e
       - module-perl-App-cpanminus-1.7044-8040020210603121643-034ca732
       - module-perl-DBD-MySQL-4.046-8040020210603121508-cbeb47de
+      - module-perl-YAML-1.24-8040020210603025146-0adf1e88
       - module-php-7.2-8040020210530192442-02bae935
       - module-pki-deps-10.6-8050020211109195756-b4937e53
       - module-postgresql-10-8050020211109140304-b4937e53
       - module-ruby-2.5-8040020210530171040-9f9e2e7e
-      - module-rust-toolset-rhel8-8050020211109135014-f73640c0
+      - module-rust-toolset-rhel8-8060020220330021819-eab6f2ea
       - module-subversion-1.10-8040020210530192448-0deeb44b
       - module-swig-3.0-8040020210530171044-9f9e2e7e
       - module-virt-rhel-8050020211221163306-b4937e53
@@ -149,10 +151,12 @@ modules:
         5.24: ['common', 'minimal']
         5.26: ['common', 'minimal']
         5.30: ['common', 'minimal']
+        5.32: ['common', 'minimal']
       php:
         7.2: ['common', 'devel', 'minimal']
         7.3: ['common', 'devel', 'minimal']
         7.4: ['common', 'devel', 'minimal']
+        8.0: ['common', 'devel', 'minimal']
       pki-core:
         10.6: []
       pki-deps:
@@ -207,17 +211,23 @@ modules:
       virt:
         rhel: ['common']
     r9:
-      idm:
-        DL1: ['adtrust', 'client', 'common', 'dns', 'server']
-        client: ['common', 'default', 'epn', 'smb']
       container-tools:
         3.0: ['common']
         latest: ['common']
+      idm:
+        DL1: ['adtrust', 'client', 'common', 'dns', 'server']
+        client: ['common', 'default', 'epn', 'smb']
     r9lh:
+      container-tools:
+        3.0: ['common']
+        latest: ['common']
       idm:
         DL1: ['adtrust', 'client', 'common', 'dns', 'server']
         client: ['common', 'default', 'epn', 'smb']
     r9-beta:
+      container-tools:
+        3.0: ['common']
+        latest: ['common']
       idm:
         DL1: ['adtrust', 'client', 'common', 'dns', 'server']
         client: ['common', 'default', 'epn', 'smb']
diff --git a/patch.yml b/patch.yml
index 38e0b51..25b7f99 100644
--- a/patch.yml
+++ b/patch.yml
@@ -44,6 +44,8 @@ provides:
   system-logos-httpd: rocky-logos-httpd
   system-logos-ipa: rocky-logos-ipa
   system-release: rocky-release
+  system-repos: rocky-repos
+  system-sb-certs: rocky-sb-certs
 dnt:
   all:
     - redhat-fonts