diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index afbe77a..85b7d33 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -1,6 +1,7 @@
 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,
@@ -74,37 +75,37 @@ data:
     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 ]
       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
diff --git a/idm.yaml b/idm.yaml
deleted file mode 100644
index 3aa5cbe..0000000
--- a/idm.yaml
+++ /dev/null
@@ -1,116 +0,0 @@
-document: modulemd
-version: 2
-data:
-  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, 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
-  dependencies:
-  - buildrequires:
-      platform:
-      - el8.0.0
-      pki-core:
-      - 10.6
-      httpd:
-      - 2.4
-      389-ds:
-      - 1.4
-    requires:
-      platform:
-      - el8
-  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
-  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
-  filter:
-    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
-  components:
-    rpms:
-      ipa:
-        rationale: Module API
-        ref: 141ed1c4409c4f2593e99a66027472f91071f2f8
-      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
-      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: 9d27e51a5724e549f2d33602bb75539e70b05b95
-        buildorder: 1
-      python-qrcode:
-        rationale: QR code generator for IdM two-factor authentication
-        ref: f3346fc24fd7893c8a715796071ef9d4bbce0579
-      python-yubico:
-        rationale: Support for Yubikey-based tokens for IdM two-factor authentication
-        ref: ceb8768db937e08794817ad905ea748ff8ca0e48
-        buildorder: 2
-      pyusb:
-        rationale: Python USB support to access USB tokens for IdM two-factor authentication
-        ref: ad586f2d793e73d20bed53df94ec24ccef550adb
-        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
-  name: idm
-  stream: client