diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 0fb1754..1663fe0 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -1,67 +1,67 @@
-
 ---
 document: modulemd
 version: 2
 data:
-    name: mariadb
-    stream: 10.3
-    summary: MariaDB Module
-    description: MariaDB is a community developed branch of MySQL.
-                 MariaDB is a multi-user, multi-threaded SQL database server.
-                 It is a client/server implementation consisting of a server
-                 daemon (mysqld) and many different client programs and
-                 libraries. The base package contains the standard
-                 MariaDB/MySQL client programs and generic MySQL files.
-    license:
-        module: [MIT]
-    dependencies:
-        - buildrequires:
-              platform: [el8]
-          requires:
-              platform: [el8]
-    references:
-        community: http://mariadb.org
-        documentation: https://mariadb.com/kb/en/library/documentation/
-        tracker: http://bugzilla.redhat.com
-    profiles:
-        server:
-            rpms:
-                - mariadb-server
-        galera:
-            rpms:
-                - mariadb-server
-                - mariadb-server-galera
-        client:
-            rpms:
-                - mariadb
-    api:
-        rpms:
-            - mariadb
-            - mariadb-server
-    filter:
-        rpms:
-            - Judy-devel
-            - asio-devel
-    buildopts:
-        rpms:
-            macros: |
-                %runselftest 1
-                %ignore_testsuite_result 0
-    components:
-        rpms:
-            mariadb:
-                rationale: MariaDB package
-                ref: stream-10.3-rhel-8.1.0 # stream-10.3
-                buildorder: 8
-            galera:
-                rationale: Galera package for MariaDB server replication
-                ref: stream-10.3-rhel-8.1.0 # stream-10.3
-                buildorder: 16
-            Judy:
-                rationale: MariaDB dependency for OQgraph computation engine
-                ref: stream-mariadb-10.3-rhel-8.1.0 # stream-mariadb-10.3
-                buildorder: 4
-            asio:
-                rationale: Galera dependency for asynchronous I/O operation
-                ref: stream-mariadb-10.3-rhel-8.1.0 # stream-mariadb-10.3
-                buildorder: 12
+  name: mariadb
+  stream: 10.5
+  summary: MariaDB Module
+  description: >-
+    MariaDB is a community developed branch of MySQL. MariaDB is a multi-user, multi-threaded
+    SQL database server. It is a client/server implementation consisting of a server
+    daemon (mysqld) and many different client programs and libraries. The base package
+    contains the standard MariaDB/MySQL client programs and generic MySQL files.
+  license:
+    module:
+    - MIT
+  dependencies:
+  - buildrequires:
+      platform: [el8]
+    requires:
+      platform: [el8]
+  references:
+    community: http://mariadb.org
+    documentation: https://mariadb.com/kb/en/library/documentation/
+    tracker: http://bugzilla.redhat.com
+  profiles:
+    client:
+      rpms:
+      - mariadb
+    galera:
+      rpms:
+      - mariadb-server
+      - mariadb-server-galera
+    server:
+      rpms:
+      - mariadb-server
+  api:
+    rpms:
+    - mariadb
+    - mariadb-server
+  filter:
+    rpms:
+    - Judy-devel
+    - asio-devel
+  buildopts:
+    rpms:
+      macros: |
+        %runselftest 0
+        %ignore_testsuite_result 0
+  components:
+    rpms:
+      Judy:
+        rationale: MariaDB dependency for OQgraph computation engine
+        ref: stream-mariadb-10.5-rhel-8.4.0
+        buildorder: 4
+      asio:
+        rationale: Galera dependency for asynchronous I/O operation
+        ref: stream-mariadb-10.5-rhel-8.4.0
+        buildorder: 12
+      galera:
+        rationale: Galera package for MariaDB server replication
+        ref: stream-10.5-rhel-8.4.0
+        buildorder: 16
+      mariadb:
+        rationale: MariaDB package
+        ref: stream-10.5-rhel-8.4.0
+        buildorder: 8
+...
diff --git a/mariadb.yaml b/mariadb.yaml
deleted file mode 100644
index 0f7bc21..0000000
--- a/mariadb.yaml
+++ /dev/null
@@ -1,66 +0,0 @@
----
-document: modulemd
-version: 2
-data:
-    name: mariadb
-    stream: "10.3"
-    summary: MariaDB Module
-    description: MariaDB is a community developed branch of MySQL.
-                 MariaDB is a multi-user, multi-threaded SQL database server.
-                 It is a client/server implementation consisting of a server
-                 daemon (mysqld) and many different client programs and
-                 libraries. The base package contains the standard
-                 MariaDB/MySQL client programs and generic MySQL files.
-    license:
-        module: [MIT]
-    dependencies:
-        - buildrequires:
-              platform: [el8.4.0]
-          requires:
-              platform: [el8]
-    references:
-        community: http://mariadb.org
-        documentation: https://mariadb.com/kb/en/library/documentation/
-        tracker: http://bugzilla.redhat.com
-    profiles:
-        server:
-            rpms:
-                - mariadb-server
-        galera:
-            rpms:
-                - mariadb-server
-                - mariadb-server-galera
-        client:
-            rpms:
-                - mariadb
-    api:
-        rpms:
-            - mariadb
-            - mariadb-server
-    filter:
-        rpms:
-            - Judy-devel
-            - asio-devel
-    buildopts:
-        rpms:
-            macros: |
-                %runselftest 1
-                %ignore_testsuite_result 0
-    components:
-        rpms:
-            mariadb:
-                rationale: MariaDB package
-                ref: 7a4c1a038c8477feda2d92e801b0a92e7892f878
-                buildorder: 8
-            galera:
-                rationale: Galera package for MariaDB server replication
-                ref: d098086255f9f8c5e3301d03cb2850d329071f0d
-                buildorder: 16
-            Judy:
-                rationale: MariaDB dependency for OQgraph computation engine
-                ref: a3583b33f939e74a530f2a1dff0552dff2c8ea73
-                buildorder: 4
-            asio:
-                rationale: Galera dependency for asynchronous I/O operation
-                ref: cdabfcd4d31c03c44940bd96f8d55750952affb8
-                buildorder: 12