diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 85b7d33..e6eb2cb 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -1,24 +1,26 @@
+---
 document: modulemd
 version: 2
 data:
   stream: client
   summary: RHEL IdM long term support client module
   description: >-
-    RHEL IdM is an integrated solution to provide centrally managed Identity (users, hosts,
-    services), Authentication (SSO, 2FA), and Authorization (host access control,
+    RHEL IdM is an integrated solution to provide centrally managed Identity (users,
+    hosts, services), Authentication (SSO, 2FA), and Authorization (host access control,
     SELinux user roles, services). The solution provides features for further integration
     with Linux based clients (SUDO, automount) and integration with Active Directory
     based infrastructures (Trusts).
 
     This module stream supports only client side of RHEL IdM solution
   license:
-    module: [MIT]
+    module:
+    - MIT
   dependencies:
   - buildrequires:
-      platform: [el8]
-      pki-core: [10.6]
-      httpd: [2.4]
       389-ds: [1.4]
+      httpd: [2.4]
+      pki-core: [10.6]
+      platform: [el8]
     requires:
       platform: [el8]
   references:
@@ -31,81 +33,80 @@ data:
       rpms:
       - ipa-client
   api:
-      rpms:
-        - ipa-client
-        - ipa-client-debuginfo
-        - ipa-client-common
-        - ipa-debuginfo
-        - ipa-debugsource
-        - ipa-common
-        - ipa-python-compat
-        - python3-ipaclient
-        - python3-ipalib
-        - python3-pyusb
-        - python3-qrcode
-        - python3-qrcode-core
-        - python3-jwcrypto
-        - python3-yubico
+    rpms:
+    - ipa-client
+    - ipa-client-common
+    - ipa-client-debuginfo
+    - ipa-common
+    - ipa-debuginfo
+    - ipa-debugsource
+    - ipa-python-compat
+    - python3-ipaclient
+    - python3-ipalib
+    - python3-jwcrypto
+    - python3-pyusb
+    - python3-qrcode
+    - python3-qrcode-core
+    - python3-yubico
   filter:
-      # Filter out server-related content
-      rpms:
-        - ipa-server
-        - ipa-server-trust-ad
-        - ipa-server-trust-ad-debuginfo
-        - ipa-server-dns
-        - ipa-server-common
-        - ipa-server-debuginfo
-        - python3-ipaserver
-        - softhsm
-        - softhsm-devel
-        - softhsm-debuginfo
-        - softhsm-debugsource
-        - python3-custodia
-        - custodia
-        - bind-dyndb-ldap
-        - bind-dyndb-ldap-debuginfo
-        - bind-dyndb-ldap-debugsource
-        - opendnssec
-        - opendnssec-debuginfo
-        - opendnssec-debugsource
-        - slapi-nis
-        - slapi-nis-debuginfo
-        - slapi-nis-debugsource
+    rpms:
+    - bind-dyndb-ldap
+    - bind-dyndb-ldap-debuginfo
+    - bind-dyndb-ldap-debugsource
+    - custodia
+    - ipa-server
+    - ipa-server-common
+    - ipa-server-debuginfo
+    - ipa-server-dns
+    - ipa-server-trust-ad
+    - ipa-server-trust-ad-debuginfo
+    - opendnssec
+    - opendnssec-debuginfo
+    - opendnssec-debugsource
+    - python3-custodia
+    - python3-ipaserver
+    - slapi-nis
+    - slapi-nis-debuginfo
+    - slapi-nis-debugsource
+    - softhsm
+    - softhsm-debuginfo
+    - softhsm-debugsource
+    - softhsm-devel
   components:
     rpms:
-      ipa:
-        rationale: Module API
-        ref: stream-idm-DL1-rhel-8.1.0
       bind-dyndb-ldap:
         rationale: Driver for BIND to store DNS information in LDAP
-        ref: stream-idm-DL1-rhel-8.1.0
-      slapi-nis:
-        rationale: Compatibility plugin to serve legacy clients
-        ref: stream-idm-DL1-rhel-8.1.0
-        # 389-ds-base is not available on i686
-        arches: [ aarch64, x86_64, s390x, ppc64le ]
+        ref: stream-idm-DL1-rhel-8.2.0
       custodia:
         rationale: Remote access to secrets and credentials in IdM topology
-        ref: stream-idm-DL1-rhel-8.1.0
+        ref: stream-idm-DL1-rhel-8.2.0
         buildorder: 2
+      ipa:
+        rationale: Module API
+        ref: stream-idm-DL1-rhel-8.2.0
+      opendnssec:
+        rationale: An implementation of DNSSEC support for IdM integrated DNS server
+        ref: stream-idm-DL1-rhel-8.2.0
       python-jwcrypto:
         rationale: JSON Web Cryptographic Tokens used by Custodia
-        ref: stream-idm-DL1-rhel-8.1.0
+        ref: stream-idm-DL1-rhel-8.2.0
         buildorder: 1
       python-qrcode:
         rationale: QR code generator for IdM two-factor authentication
-        ref: stream-idm-DL1-rhel-8.1.0
+        ref: stream-idm-DL1-rhel-8.2.0
       python-yubico:
         rationale: Support for Yubikey-based tokens for IdM two-factor authentication
-        ref: stream-idm-DL1-rhel-8.1.0
+        ref: stream-idm-DL1-rhel-8.2.0
         buildorder: 2
       pyusb:
         rationale: Python USB support to access USB tokens for IdM two-factor authentication
-        ref: stream-idm-DL1-rhel-8.1.0
+        ref: stream-idm-DL1-rhel-8.2.0
         buildorder: 1
+      slapi-nis:
+        rationale: Compatibility plugin to serve legacy clients
+        ref: stream-idm-DL1-rhel-8.2.0
+        arches: [aarch64, ppc64le, s390x, x86_64]
       softhsm:
         rationale: Software version of a PKCS#11 Hardware Security Module
-        ref: stream-idm-DL1-rhel-8.1.0
-      opendnssec:
-        rationale: An implementation of DNSSEC support for IdM integrated DNS server
-        ref: stream-idm-DL1-rhel-8.1.0
+        ref: stream-idm-DL1-rhel-8.2.0
+...