diff --git a/module.yml b/module.yml
new file mode 100644
index 0000000..5830fe1
--- /dev/null
+++ b/module.yml
@@ -0,0 +1,223 @@
+# Module information
+# May not update immediately - rockyautomation may update this as needed
+# instead of human intervention.
+#
+# bootstrap_modules: These are modules used to bootstrap a module that will
+# likely show up as a any other module, whether build or compose or even both.
+#
+# build_modules: These are modules used to do builds of other non-module
+# packages or other module packages. This may not occur in 9+ but will still
+# need a reference point just in case. Modules should be optional in 9, not
+# the default.
+#
+# compose_modules: These are the final modules, plus their profiles, that will
+# show up in the base repos of Rocky Linux. For simplification, they do not
+# have a full module repo name (a la koji+mbs), since a module may exist for an
+# entire release life time, but never update or rebuild. Version may be added
+# in the future.
+# Format:
+#   module:
+#     stream:
+#       - profile
+#
+# Format potentially with version:
+#   module:
+#     stream:
+#       version:
+#       profiles:
+#         - profile
+---
+modules:
+  bootstrap_modules:
+    r8:
+      - module-perl-bootstrap-5.24-8040020210602155812-9f9e2e7e
+      - module-perl-bootstrap-5.26-8040020210601201707-9f9e2e7e
+      - module-perl-bootstrap-5.30-8040020210601185857-9f9e2e7e
+      - module-perl-YAML-bootstrap-1.24-8040020210603022817-e436f1f6
+      - module-python38-3.8-bootstrap-8040020210611140355-b1b639b6
+      - module-python39-3.9-bootstrap-8040020210611165006-f1d9d306
+    r9: []
+  build_modules:
+    r8:
+      - module-gimp-2.8-8030020210427153901-c307c522
+      - module-go-toolset-rhel8-8050020211109170803-8aa62369
+      - module-httpd-2.4-8050020211109175647-b4937e53
+      - module-idm-client-8050020211109131657-de73ecb2
+      - module-javapackages-tools-201801-8030020210424203036-82c16c76
+      - module-llvm-toolset-rhel8-8050020211109145317-b4937e53
+      - 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-php-7.2-8040020210530192442-02bae935
+      - module-pki-deps-10.6-8050020211109195756-b4937e53
+      - module-postgresql-10-8050020211109140304-b4937e53
+      - module-python27-2.7-8050020211211230954-3e7ace8b
+      - module-python36-3.6-8050020211109130820-982725ab
+      - module-ruby-2.5-8040020210530171040-9f9e2e7e
+      - module-rust-toolset-rhel8-8050020211109135014-f73640c0
+      - module-subversion-1.10-8040020210530192448-0deeb44b
+      - module-swig-3.0-8040020210530171044-9f9e2e7e
+      - module-virt-rhel-8050020211109130141-b4937e53
+    r9: []
+    r9lh: []
+    r9-beta: []
+  compose_modules:
+    r8:
+      389-ds:
+        1.4: []
+      ant:
+        1.10: ['common']
+      container-tools:
+        1.0: ['common']
+      container-tools:
+        2.0: ['common']
+      container-tools:
+        3.0: ['common']
+      container-tools:
+        rhel8: ['common']
+      freeradius:
+        3.0: ['server']
+      gimp:
+        2.8: ['common', 'devel']
+      go-toolset:
+        rhel8: ['common']
+      httpd:
+        2.4: ['common', 'devel', 'minimal']
+      idm:
+        DL1: ['adtrust', 'client', 'common', 'dns', 'server']
+      idm:
+        client: ['common']
+      inkscape:
+        0.92.3: ['common']
+      javapackages-runtime:
+        201801: ['common']
+      javapackages-tools:
+        201801: ['common']
+      jmc:
+        rhel8: ['common', 'core']
+      libselinux-python:
+        2.8: ['common']
+      llvm-toolset:
+        rhel8: ['common']
+      mailman:
+        2.1: ['common']
+      mariadb-devel:
+        10.3: []
+      mariadb:
+        10.3: ['client', 'galera', 'server']
+        10.5: ['client', 'galera', 'server']
+      maven:
+        3.5: ['common']
+        3.6: ['common']
+      mercurial:
+        4.8: ['common']
+      mod_auth_openidc:
+        2.3: []
+      mysql:
+        8.0: ['client', 'server']
+      nginx:
+        1.14: ['common']
+        1.16: ['common']
+        1.18: ['common']
+        1.20: ['common']
+      nodejs:
+        10: ['common', 'development', 'minimal', 's2i']
+        12: ['common', 'development', 'minimal', 's2i']
+        14: ['common', 'development', 'minimal', 's2i']
+        16: ['common', 'development', 'minimal', 's2i']
+      parfait:
+        0.5: ['common']
+      perl-App-cpanminus:
+        1.7044: ['common']
+      perl-DBD-MySQL:
+        4.046: ['common']
+      perl-DBD-Pg:
+        3.7: ['common']
+      perl-DBD-SQLite:
+        1.58: ['common']
+      perl-DBI:
+        1.641: ['common']
+      perl-FCGI:
+        0.78: ['common']
+      perl-IO-Socket-SSL:
+        2.066: ['common']
+      perl-YAML:
+        1.24: ['common']
+      perl-libwww-perl:
+        6.34: ['common']
+      perl:
+        5.24: ['common', 'minimal']
+        5.26: ['common', 'minimal']
+        5.30: ['common', 'minimal']
+      php:
+        7.2: ['common', 'devel', 'minimal']
+        7.3: ['common', 'devel', 'minimal']
+        7.4: ['common', 'devel', 'minimal']
+      pki-core:
+        10.6: []
+      pki-deps:
+        10.6: []
+      pmdk:
+        1-fileformat-v6: []
+      postgresql:
+        9.6: ['client', 'server']
+        10: ['client', 'server']
+        12: ['client', 'server']
+        13: ['client', 'server']
+      python27:
+        2.7: ['common']
+      python36:
+        3.6: ['build', 'common']
+      python38-devel:
+        3.8: []
+      python38:
+        3.8: ['build', 'common']
+      python39-devel:
+        3.9: []
+      python39:
+        3.9: ['build', 'common']
+      redis:
+        5: ['common']
+        6: ['common']
+      rhn-tools:
+        1.0: ['common']
+      ruby:
+        2.5: ['common']
+        2.6: ['common']
+        2.7: ['common']
+        3.0: ['common']
+      rust-toolset:
+        rhel8: ['common']
+      satellite-5-client:
+        1.0: ['common', 'gui']
+      scala:
+        2.10: ['common']
+      squid:
+        4: ['common']
+      subversion:
+        1.10: ['common', 'server']
+        1.14: ['common', 'server']
+      swig:
+        3.0: ['common', 'complete']
+        4.0: ['common', 'complete']
+      varnish:
+        6: ['common']
+      virt-devel:
+        rhel: []
+      virt:
+        rhel: ['common']
+    r9:
+      idm:
+        DL1: ['adtrust', 'client', 'common', 'dns', 'server']
+        client: ['common', 'default', 'epn', 'smb']
+    r9lh:
+      idm:
+        DL1: ['adtrust', 'client', 'common', 'dns', 'server']
+        client: ['common', 'default', 'epn', 'smb']
+    r9-beta:
+      idm:
+        DL1: ['adtrust', 'client', 'common', 'dns', 'server']
+        client: ['common', 'default', 'epn', 'smb']
+...
diff --git a/patch.yml b/patch.yml
index 8b6a5d3..dd12f03 100644
--- a/patch.yml
+++ b/patch.yml
@@ -1,4 +1,12 @@
 # Packages that are patched or debranded
+# build_patch: These needed modifications to build properly or they are being
+#              addressed for other issues that isn't done upstream.
+# previous: These are previously patched packages that are no longer patched in
+#           Rocky as they are upstreamed.
+# dnt: Do Not Touch - These are for packages that "appear" to need to be 
+#      debranded, but that is not the case.
+# debrand: Packages that need trademarks removed/changed for Rocky to remove
+#          Red Hat references.
 ---
 build_patch: []
 previous: []
@@ -6,7 +14,7 @@ dnt:
   all:
     - redhat-fonts
 debrand:
-  rl8:
+  r8:
     - anaconda
     - dotnet3.0
     - fwupdate
@@ -14,7 +22,7 @@ debrand:
     - osinfo-db             # temporary, might be needed for 9 temporarily
     - pcs                   ## Might be needed for 9
     - python2
-  rl9:
+  r9:
     - libguestfs            # temporary
   all:
     - abrt