diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index a428e7f..2f866e2 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -2,7 +2,6 @@ document: modulemd
 version: 2
 data:
   stream: rhel8
-  arch: x86_64
   summary: Java Mission Control is a profiling and diagnostics tool for the Hotspot JVM
   description: >-
     Java Mission Control is a powerful profiler for HotSpot JVMs and has an
@@ -38,55 +37,55 @@ data:
     rpms:
       directory-maven-plugin:
         buildorder: 0
-        ref: stream-rhel8-rhel-8.4.0
+        ref: stream-rhel8-rhel-8.5.0
         rationale: >
           Dependency of jmc and jaf.
         arches: [x86_64]
       ee4j-parent:
         buildorder: 0
-        ref: stream-rhel8-rhel-8.4.0
+        ref: stream-rhel8-rhel-8.5.0
         arches: [x86_64]
         rationale: >
           Dependency of jaf.
       mvel:
         buildorder: 0
-        ref: stream-rhel8-rhel-8.4.0
+        ref: stream-rhel8-rhel-8.5.0
         arches: [x86_64]
         rationale: >
           Dependency of lz4-java.
       owasp-java-encoder:
         buildorder: 0
-        ref: stream-rhel8-rhel-8.4.0
+        ref: stream-rhel8-rhel-8.5.0
         arches: [x86_64]
         rationale: >
           Dependency of jmc-core.
       jaf:
         buildorder: 1
-        ref: stream-rhel8-rhel-8.4.0
+        ref: stream-rhel8-rhel-8.5.0
         arches: [x86_64]
         rationale: >
           Dependency of jmc.
       lz4-java:
         buildorder: 1
-        ref: stream-rhel8-rhel-8.4.0
+        ref: stream-rhel8-rhel-8.5.0
         arches: [x86_64]
         rationale: >
           Dependency of jmc-core
       HdrHistogram:
         buildorder: 2
-        ref: stream-rhel8-rhel-8.4.0
+        ref: stream-rhel8-rhel-8.5.0
         arches: [x86_64]
         rationale: >
           Dependency of jmc.
       jmc-core:
         buildorder: 2
-        ref: stream-rhel8-rhel-8.4.0
+        ref: stream-rhel8-rhel-8.5.0
         arches: [x86_64]
         rationale: >
           Core API. Dependency of jmc.
       jmc:
         buildorder: 3
-        ref: stream-rhel8-rhel-8.4.0
+        ref: stream-rhel8-rhel-8.5.0
         arches: [x86_64]
         rationale: >
           Standalone application.
diff --git a/jmc.yaml b/jmc.yaml
deleted file mode 100644
index 6a5aee0..0000000
--- a/jmc.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-document: modulemd
-version: 2
-data:
-  name: jmc
-  stream: rhel8
-  arch: x86_64
-  summary: Java Mission Control is a profiling and diagnostics tool for the Hotspot JVM
-  description: >-
-    Java Mission Control is a powerful profiler for HotSpot JVMs and has an
-    advanced set of tools that enables efficient and detailed analysis of the
-    extensive data collected by Java Flight Recorder. The tool chain enables
-    developers and administrators to collect and analyze data from Java
-    applications running locally or deployed in production environments.
-  license:
-    module:
-      - GPL
-  profiles:
-    common:
-      rpms:
-      - jmc
-    core:
-      rpms:
-      - jmc-core
-  dependencies:
-    - buildrequires:
-        platform: [el8.4.0]
-        javapackages-tools: [201801]
-        tycho: [rhel8]
-      requires:
-        platform: [el8]
-  api:
-    rpms:
-    - jmc-core
-  filter:
-    rpms:
-    - mvel
-    - mvel-javadoc
-  components:
-    rpms:
-      directory-maven-plugin:
-        buildorder: 0
-        ref: 308f174e18c20948464958abbd662568800716ee
-        rationale: >
-          Dependency of jmc and jaf.
-        arches: [x86_64]
-      ee4j-parent:
-        buildorder: 0
-        ref: 7e19a60d9616ed628193eaca00da3be64bdf7bfb
-        arches: [x86_64]
-        rationale: >
-          Dependency of jaf.
-      mvel:
-        buildorder: 0
-        ref: a062e2355ff677bcdeea20d5919d0382b660e2f3
-        arches: [x86_64]
-        rationale: >
-          Dependency of lz4-java.
-      owasp-java-encoder:
-        buildorder: 0
-        ref: 4539dec47da48d604b7fac1c150ddd6d1bb90f16
-        arches: [x86_64]
-        rationale: >
-          Dependency of jmc-core.
-      jaf:
-        buildorder: 1
-        ref: cdc491ff7bf1df6a61bc34a5df03b33107b36c46
-        arches: [x86_64]
-        rationale: >
-          Dependency of jmc.
-      lz4-java:
-        buildorder: 1
-        ref: bc45b0043af657bbd6c88ad2566a5f1abc9d6077
-        arches: [x86_64]
-        rationale: >
-          Dependency of jmc-core
-      HdrHistogram:
-        buildorder: 2
-        ref: 98cb92727d7de260a4955f8a8b7feb153005d953
-        arches: [x86_64]
-        rationale: >
-          Dependency of jmc.
-      jmc-core:
-        buildorder: 2
-        ref: dfa8b922a9963056e04653cffa60ebee50ad8808
-        arches: [x86_64]
-        rationale: >
-          Core API. Dependency of jmc.
-      jmc:
-        buildorder: 3
-        ref: b9c44472e903a3ec612d913eb6c186e7d2103a32
-        arches: [x86_64]
-        rationale: >
-          Standalone application.