diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index cabc83e..0c8f6b5 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -41,21 +41,21 @@ data:
     buildopts:
         rpms:
             macros: |
-                %runselftest 0
+                %runselftest 1
                 %check_testsuite 1
     components:
         rpms:
             mysql:
-                rationale: MySQL server package..
-                ref: stream-8.0-rhel-8.0.0
+                rationale: MySQL server package
+                ref: stream-8.0-rhel-8.2.0
                 buildorder: 10
             mecab:
                 rationale: A dependency of mysql
-                ref: stream-8.0
+                ref: stream-8.0-rhel-8.2.0
                 buildorder: 8
             mecab-ipadic:
                 rationale: A dictionary for mecab
-                ref: stream-8.0
+                ref: stream-8.0-rhel-8.2.0
                 buildorder: 9
             rapidjson:
                 rationale: A build-time only dependency of mysql
diff --git a/mysql.yaml b/mysql.yaml
deleted file mode 100644
index 1de3f67..0000000
--- a/mysql.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-document: modulemd
-version: 2
-data:
-    name: mysql
-    stream: 8.0
-    summary: MySQL Module
-    description: MySQL is a multi-user, multi-threaded SQL database server.
-                 MySQL is a client/server implementation consisting of
-                 a server daemon (mysqld) and many different client programs
-                 and libraries. The base package contains the standard MySQL
-                 client programs and generic MySQL files.
-    license:
-        module: [MIT]
-    dependencies:
-        - buildrequires:
-              platform: [el8.0.0]
-          requires:
-              platform: [el8]
-    references:
-        community: https://dev.mysql.com/
-        documentation: https://dev.mysql.com/doc/refman/8.0/en/
-        tracker: http://bugzilla.redhat.com/
-    profiles:
-        server:
-            rpms:
-                - mysql-server
-        client:
-            rpms:
-                - mysql
-    api:
-        rpms:
-            - mysql
-            - mysql-server
-    filter:
-        rpms:
-            - mecab-devel
-            - rapidjson
-            - rapidjson-devel
-            - rapidjson-doc
-    buildopts:
-        rpms:
-            macros: |
-                %runselftest 0
-                %check_testsuite 1
-    components:
-        rpms:
-            mysql:
-                rationale: MySQL server package..
-                ref: d565bec117e89cbfa5255f9b08ea7344ad753f26
-                buildorder: 10
-            mecab:
-                rationale: A dependency of mysql
-                ref: 5789ec297e80c2e5ac008f1abf0d2fe330a55f33
-                buildorder: 8
-            mecab-ipadic:
-                rationale: A dictionary for mecab
-                ref: 453491a3407a43db9c5d631068473e05bb3b4cf9
-                buildorder: 9
-            rapidjson:
-                rationale: A build-time only dependency of mysql
-                ref: f0d524f07188a5d7ca8733ff52dcfb3adc3a3be1
-                buildorder: 7