diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index b25e97c..f1523fb 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -3,35 +3,36 @@ document: modulemd
 version: 2
 data:
   name: freeradius
-  stream: "3.0"
+  stream: 3.0
   summary: High-performance and highly configurable free RADIUS server
   description: >-
-    The FreeRADIUS Server Project is a high performance and highly configurable
-    GPL'd free RADIUS server. The server is similar in some respects to
-    Livingston's 2.0 server.  While FreeRADIUS started as a variant of the
-    Cistron RADIUS server, they don't share a lot in common any more. It now
-    has many more features than Cistron or Livingston, and is much more
-    configurable.
+    The FreeRADIUS Server Project is a high performance and highly configurable GPL'd
+    free RADIUS server. The server is similar in some respects to Livingston's 2.0
+    server.  While FreeRADIUS started as a variant of the Cistron RADIUS server, they
+    don't share a lot in common any more. It now has many more features than Cistron
+    or Livingston, and is much more configurable.
 
-    FreeRADIUS is an Internet authentication daemon, which implements the
-    RADIUS protocol, as defined in RFC 2865 (and others). It allows Network
-    Access Servers (NAS boxes) to perform authentication for dial-up users.
-    There are also RADIUS clients available for Web servers, firewalls, Unix
-    logins, and more.  Using RADIUS allows authentication and authorization
-    for a network to be centralized, and minimizes the amount of
+    FreeRADIUS is an Internet authentication daemon, which implements the RADIUS protocol,
+    as defined in RFC 2865 (and others). It allows Network Access Servers (NAS boxes)
+    to perform authentication for dial-up users. There are also RADIUS clients available
+    for Web servers, firewalls, Unix logins, and more.  Using RADIUS allows authentication
+    and authorization for a network to be centralized, and minimizes the amount of
     re-configuration which has to be done when adding or deleting new users.
   license:
     module:
     - GPL
   dependencies:
   - buildrequires:
-      # Depends on net-snmp which is built only against Perl 5.26
       perl: [5.26]
       platform: [el8]
     requires:
-      # Depends on net-snmp which is built only against Perl 5.26
       perl: [5.26]
       platform: [el8]
+  profiles:
+    server:
+      description: The FreeRADIUS Server
+      rpms:
+      - freeradius
   api:
     rpms:
     - freeradius
@@ -46,16 +47,10 @@ data:
     - freeradius-sqlite
     - freeradius-unixODBC
     - freeradius-utils
-  profiles:
-    server:
-      description: The FreeRADIUS Server
-      rpms:
-        - freeradius
   components:
     rpms:
       freeradius:
         rationale: Provides the FreeRADIUS server
-        ref: stream-3.0-rhel-8.1.0
+        ref: stream-3.0-rhel-8.2.0
         buildorder: 10
 ...
-
diff --git a/freeradius.yaml b/freeradius.yaml
deleted file mode 100644
index 8dededd..0000000
--- a/freeradius.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-document: modulemd
-version: 2
-data:
-  name: freeradius
-  stream: 3.0
-  summary: High-performance and highly configurable free RADIUS server
-  description: >-
-    The FreeRADIUS Server Project is a high performance and highly configurable GPL'd
-    free RADIUS server. The server is similar in some respects to Livingston's 2.0
-    server.  While FreeRADIUS started as a variant of the Cistron RADIUS server, they
-    don't share a lot in common any more. It now has many more features than Cistron
-    or Livingston, and is much more configurable.
-
-    FreeRADIUS is an Internet authentication daemon, which implements the RADIUS protocol,
-    as defined in RFC 2865 (and others). It allows Network Access Servers (NAS boxes)
-    to perform authentication for dial-up users. There are also RADIUS clients available
-    for Web servers, firewalls, Unix logins, and more.  Using RADIUS allows authentication
-    and authorization for a network to be centralized, and minimizes the amount of
-    re-configuration which has to be done when adding or deleting new users.
-  license:
-    module:
-    - GPL
-  dependencies:
-  - buildrequires:
-      perl: [5.26]
-      platform: [el8.1.0]
-    requires:
-      perl: [5.26]
-      platform: [el8]
-  profiles:
-    server:
-      description: The FreeRADIUS Server
-      rpms:
-      - freeradius
-  api:
-    rpms:
-    - freeradius
-    - freeradius-devel
-    - freeradius-doc
-    - freeradius-krb5
-    - freeradius-ldap
-    - freeradius-mysql
-    - freeradius-perl
-    - freeradius-postgresql
-    - freeradius-rest
-    - freeradius-sqlite
-    - freeradius-unixODBC
-    - freeradius-utils
-  components:
-    rpms:
-      freeradius:
-        rationale: Provides the FreeRADIUS server
-        ref: 33c70114bdcd85d1579f46f4fcde95be93f25a44
-        buildorder: 10
-...
-