diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index e2a8523..b311f34 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -1,6 +1,7 @@
 document: modulemd
 version: 2
 data:
+  stream: DL1
   summary: The Red Hat Enterprise Linux Identity Management system module
   description: >-
     RHEL IdM is an integrated solution to provide centrally managed Identity (users, hosts,
@@ -38,58 +39,65 @@ data:
       description: Base RHEL IdM Server with integrated CA and no integrated DNS
       rpms:
       - ipa-server
+      - ipa-healthcheck
     dns:
       description: RHEL IdM with integrated DNS server and integrated CA
       rpms:
       - ipa-server
       - ipa-server-dns
+      - ipa-healthcheck
     adtrust:
       description: RHEL IdM Server Integration with Active Directory
       rpms:
       - ipa-server-trust-ad
       - ipa-idoverride-memberof-plugin
+      - ipa-healthcheck
   components:
     rpms:
       ipa:
         rationale: Module API
-        ref: stream-idm-DL1
+        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
+        ref: stream-idm-DL1-rhel-8.1.0
       slapi-nis:
         rationale: Compatibility plugin to serve legacy clients
-        ref: stream-idm-DL1
+        ref: stream-idm-DL1-rhel-8.1.0
         # 389-ds-base is not available on i686
-        arches: [ aarch64 x86_64 s390x ppc64le ]
+        arches: [ aarch64, x86_64, s390x, ppc64le ]
+      ipa-healthcheck:
+        rationale: A tool to detect issues in IdM clusters
+        ref: stream-DL1-rhel-8.1.0
+        buildorder: 3
       ipa-idoverride-memberof:
         rationale: Manage IdM with Active Directory users
-        ref: stream-idm-DL1
+        ref: stream-idm-DL1-rhel-8.1.0
         buildorder: 3
       custodia:
         rationale: Remote access to secrets and credentials in IdM topology
-        ref: stream-idm-DL1
+        ref: stream-idm-DL1-rhel-8.1.0
         buildorder: 2
       python-jwcrypto:
         rationale: JSON Web Cryptographic Tokens used by Custodia
-        ref: stream-idm-DL1
+        ref: stream-idm-DL1-rhel-8.1.0
         buildorder: 1
       python-qrcode:
         rationale: QR code generator for IdM two-factor authentication
-        ref: stream-idm-DL1
+        ref: stream-idm-DL1-rhel-8.1.0
       python-yubico:
         rationale: Support for Yubikey-based tokens for IdM two-factor authentication
-        ref: stream-idm-DL1
+        ref: stream-idm-DL1-rhel-8.1.0
         buildorder: 2
       pyusb:
         rationale: Python USB support to access USB tokens for IdM two-factor authentication
-        ref: stream-idm-DL1
+        ref: stream-idm-DL1-rhel-8.1.0
         buildorder: 1
       softhsm:
         rationale: Software version of a PKCS#11 Hardware Security Module
-        ref: stream-idm-DL1
+        ref: stream-idm-DL1-rhel-8.1.0
       opendnssec:
         rationale: An implementation of DNSSEC support for IdM integrated DNS server
-        ref: stream-idm-DL1
+        ref: stream-idm-DL1-rhel-8.1.0
       python-kdcproxy:
         rationale: MS-KKDCP (kerberos proxy) WSGI module
-        ref: stream-idm-DL1
+        ref: stream-idm-DL1-rhel-8.1.0
diff --git a/idm.yaml b/idm.yaml
deleted file mode 100644
index 74e3098..0000000
--- a/idm.yaml
+++ /dev/null
@@ -1,105 +0,0 @@
-document: modulemd
-version: 2
-data:
-  summary: The Red Hat Enterprise Linux Identity Management system module
-  description: 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).
-  license:
-    module:
-    - MIT
-  dependencies:
-  - buildrequires:
-      platform:
-      - el8.0.0
-      pki-core:
-      - 10.6
-      httpd:
-      - 2.4
-      389-ds:
-      - 1.4
-    requires:
-      platform:
-      - el8
-      pki-core:
-      - 10.6
-      httpd:
-      - 2.4
-      389-ds:
-      - 1.4
-  references:
-    community: https://www.freeipa.org/
-    documentation: https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/linux_domain_identity_authentication_and_policy_guide/index
-    tracker: https://pagure.io/freeipa/issues
-  profiles:
-    common:
-      description: A default profile for RHEL IdM client
-      rpms:
-      - ipa-client
-    client:
-      description: RHEL IdM Client
-      rpms:
-      - ipa-client
-    server:
-      description: Base RHEL IdM Server with integrated CA and no integrated DNS
-      rpms:
-      - ipa-server
-    dns:
-      description: RHEL IdM with integrated DNS server and integrated CA
-      rpms:
-      - ipa-server
-      - ipa-server-dns
-    adtrust:
-      description: RHEL IdM Server Integration with Active Directory
-      rpms:
-      - ipa-server-trust-ad
-      - ipa-idoverride-memberof-plugin
-  components:
-    rpms:
-      ipa:
-        rationale: Module API
-        ref: 6c1c56170b90de4afd3928b57a5bc6a2a4164994
-      bind-dyndb-ldap:
-        rationale: Driver for BIND to store DNS information in LDAP
-        ref: f1d4dec33ab2571cc7d46a65d4073f263cddef45
-      slapi-nis:
-        rationale: Compatibility plugin to serve legacy clients
-        ref: 4ad32457ff1ff6962a75474c9314df40f778ffb5
-        arches:
-        - aarch64 x86_64 s390x ppc64le
-      ipa-idoverride-memberof:
-        rationale: Manage IdM with Active Directory users
-        ref: dd0303a7d8f5f36f3bc626c9b6e71db99d0411df
-        buildorder: 3
-      custodia:
-        rationale: Remote access to secrets and credentials in IdM topology
-        ref: ee26c3641903912f9b648036e965a7247ff9c2a8
-        buildorder: 2
-      python-jwcrypto:
-        rationale: JSON Web Cryptographic Tokens used by Custodia
-        ref: 3f913277df4e03e71cc264cee69f838145cf1778
-        buildorder: 1
-      python-qrcode:
-        rationale: QR code generator for IdM two-factor authentication
-        ref: 483a3a75c1e48738f9e45f55f1a180a11aec3035
-      python-yubico:
-        rationale: Support for Yubikey-based tokens for IdM two-factor authentication
-        ref: 6c357288ff77a31c97d43f1e25ba23f24aab5cb0
-        buildorder: 2
-      pyusb:
-        rationale: Python USB support to access USB tokens for IdM two-factor authentication
-        ref: 7321555e36abbc8a5cc8f76d1b78e280b9cd9560
-        buildorder: 1
-      softhsm:
-        rationale: Software version of a PKCS#11 Hardware Security Module
-        ref: 7a7b1ec20a73f141dc2cde28112a90d0e09d6a39
-      opendnssec:
-        rationale: An implementation of DNSSEC support for IdM integrated DNS server
-        ref: afd8c8d89e1e2d8b335e5a15282aa1ca11ad2201
-      python-kdcproxy:
-        rationale: MS-KKDCP (kerberos proxy) WSGI module
-        ref: a4840c6c91d0789ee704f986304bef69f3cf75c9
-  name: idm
-  stream: DL1