diff --git a/pki.yaml b/pki.yaml
index c4b4b4e..6b34c8f 100644
--- a/pki.yaml
+++ b/pki.yaml
@@ -1,162 +1,26 @@
 document: modulemd
-version: 1
+version: 2
 data:
-    summary: pki module
-    description: This pki module has been generated.
+    name: pki
+    summary: Dogtag PKI
+    description: A module for Dogtag PKI.
     license:
         module:
-            - MIT
+          - MIT
     dependencies:
-        buildrequires:
-            bootstrap: master
-            #tomcat: master ## required for jss, but conflicts with bootstrap module
+      - buildrequires:
+            platform: [f28]
         requires:
-            platform: master
-            java: master
-            tomcat: master
-            resteasy: master
-            apache-commons: master
-            networking-base: master
-            python3-ecosystem: master
-            python2-ecosystem: master
+            platform: [f28]
     references:
-        community: https://docs.pagure.org/modularity/
-        documentation: https://github.com/modularity-modules/pki
-        tracker: https://github.com/modularity-modules/pki
-    api:
-        rpms:
-            - pki-base
-            - pki-base-java
-            - pki-ca
-            - pki-kra
-            - pki-server
-            - pki-tools
-            - pylint
-            - python3-nss
-            - python3-pyldap
-            - svrcore
-            - svrcore-devel
-    filter:
-        rpms:
-            - jss
-    profiles:
-        default:
-            description: A generated profile based on top-lvl package list.
-            rpms:
-                - pki-base
-                - pki-base-java
-                - pki-ca
-                - pki-kra
-                - pki-server
-                - pki-tools
-                - python3-nss
-                - python3-pluggy
-                - python3-pyldap
-                - svrcore
-                - svrcore-devel
+        community: http://www.dogtagpki.org
+        documentation: http://www.dogtagpki.org
+        tracker: https://pagure.io/dogtagpki/issues
     components:
         rpms:
-            python-pluggy:
-                rationale: Main component provided in API
-                ref: f27
-                buildorder: -10
-            pylint:
-                rationale: Main component provided in API
-                # why in this module?
-                ref: f27
-                buildorder: -5
-            python-nss:
-                rationale: Main component provided in API, Requirement for pki-base
-                ref: f27
-                buildorder: -5
-            python-pyldap:
-                rationale: Main component provided in API
-                ref: master
-                buildorder: -5
-            svrcore:
-                rationale: Main component provided in API, Build-Requirement for pki-core
-                ref: f27
-                buildorder: -5
-            nuxwdog:
-                rationale: Requirement for pki-server
-                ref: f27
-                buildorder: -3
-            python-ldap:
-                rationale: Requirement for pki-server
-                ref: f27
-                buildorder: -3
-            jss:
-                # available from tomcat module, but that conflicts with bootstrap
-                rationale: Build-Requirement for pki-core
-                ref: f27
-                buildorder: -3
-            ldapjdk:
-                rationale: Build-Requirement for pki-core and requirement for pki-base-java
-                ref: f27
-                buildorder: -3
-            jakarta-commons-httpclient:
-                rationale: Requirement for pki-base-java
-                ref: f27
-            javassist:
-                rationale: Requirement for pki-base-java
-                ref: f27
             pki-core:
-                rationale: Main component provided in API
-                ref: f27
-            pytest:
-                rationale: Build-Requirement for pylint
-                ref: master
-            python-astroid:
-                rationale: Requirement for pylint
-                ref: f27
-            python-beautifulsoup4:
-                rationale: Requirement for python-lxml(pki-server)
-                ref: master
-            python-cryptography:
-                rationale: Requirement for pki-base
-                ref: f27
-            python-cssselect:
-                rationale: Requirement for python-lxml(pki-server)
-                ref: f27
-            python-html5lib:
-                rationale: Requirement for python-lxml(pki-server)
-                ref: f27
-            python-isort:
-                rationale: Requirement for pylint
-                ref: f27
-            python-lazy-object-proxy:
-                rationale: Requirement for python-astroid(pylint)
-                ref: f27
-            python-lxml:
-                rationale: Build-Requirement for pki-core and requirement for pki-server
-                ref: f27
-            python-mccabe:
-                rationale: Requirement for pylint
-                ref: f27
-            python-pytest-runner:
-                rationale: Requirement for pylint
-                ref: master
-            python-webencodings:
-                rationale: Requirement for python-lxml(pki-server)
-                ref: f27
-            python-wrapt:
-                rationale: Requirement for pylint
-                ref: f27
-            slf4j:
-                rationale: Requirement for pki-base-java
-                ref: f27
-            velocity:
-                rationale: Build-Requirement for pki-core and requirement for pki-server
-                ref: f27
-            xalan-j2:
-                rationale: Requirement for pki-base-java
-                ref: f27
-            xerces-j2:
-                rationale: Requirement for pki-base-java
-                ref: f27
-            xml-commons-apis:
-                rationale: Requirement for pki-base-java
-                ref: f27
-            xml-commons-resolver:
-                rationale: Requirement for pki-base-java
-                ref: f27
+                rationale: PKI Core packages
+                ref: 10.6
+            dogtag-pki:
+                rationale: Dogtag PKI packages
+                ref: 10.6