diff --git a/koschei.cfg b/koschei.cfg
index 70d4046..65d7ae3 100644
--- a/koschei.cfg
+++ b/koschei.cfg
@@ -18,10 +18,10 @@ config = {
     "topo_sort": True,
 
     "api": [
-        "maven",
+        "maven-3.6-maven",
     ],
     "profiles": {
-        "default": ["maven"],
+        "default": ["maven-3.6-maven"],
     },
     "filter": [
     ],
@@ -38,7 +38,7 @@ config = {
         "javapackages-tools": {
             "3.5": "[201801]",
             "3.6": "[201901]",
-            "master": "[201801]",
+            "master": "[201901]",
         },
         "platform": {
             "3.5": "[]",
@@ -102,7 +102,7 @@ config = {
         "server": "https://koji.kjnet.xyz/kojihub",
         "topurl": "https://koji.kjnet.xyz/kojifiles",
         "multicall_chunk_size": 1000,
-        "tag_name": "jp-build",
+        "tag_name": "m36-hybrid",
     },
     "dependency": {
         "repo_arch": "x86_64",
diff --git a/maven.yaml b/maven.yaml
index a5fba34..2534716 100644
--- a/maven.yaml
+++ b/maven.yaml
@@ -20,10 +20,10 @@ data:
     profiles:
         default:
             rpms:
-                - maven
+                - maven-3.6-maven
     api:
         rpms:
-            - maven
+            - maven-3.6-maven
     filter:
         rpms:
             - aopalliance-javadoc
@@ -31,13 +31,10 @@ data:
             - apache-commons-codec-javadoc
             - apache-commons-io-javadoc
             - apache-commons-lang3-javadoc
-            - apache-commons-logging-javadoc
             - atinject-javadoc
             - atinject-tck
             - cdi-api-javadoc
             - geronimo-annotation-javadoc
-            - glassfish-el
-            - glassfish-el-javadoc
             - google-guice-javadoc
             - guava-javadoc
             - guava-testlib
@@ -53,34 +50,22 @@ data:
             - guice-throwingproviders
             - hawtjni
             - hawtjni-javadoc
-            - httpcomponents-client-cache
             - httpcomponents-client-javadoc
             - httpcomponents-core-javadoc
             - jansi-javadoc
             - jansi-native-javadoc
-            - jboss-interceptors-1.2-api-javadoc
             - jsoup-javadoc
             - jsr-305-javadoc
             - jul-to-slf4j
             - log4j-over-slf4j
             - maven-hawtjni-plugin
             - maven-javadoc
-            - maven-resolver
             - maven-resolver-javadoc
-            - maven-resolver-test-util
-            - maven-resolver-transport-classpath
-            - maven-resolver-transport-file
-            - maven-resolver-transport-http
             - maven-shared-utils-javadoc
-            - maven-wagon
-            - maven-wagon-ftp
-            - maven-wagon-http-lightweight
             - maven-wagon-javadoc
-            - maven-wagon-providers
             - plexus-cipher-javadoc
             - plexus-classworlds-javadoc
             - plexus-containers
-            - plexus-containers-component-javadoc
             - plexus-containers-component-metadata
             - plexus-containers-container-default
             - plexus-containers-javadoc
@@ -88,7 +73,6 @@ data:
             - plexus-sec-dispatcher-javadoc
             - plexus-utils-javadoc
             - sisu-javadoc
-            - slf4j-ext
             - slf4j-javadoc
             - slf4j-jcl
             - slf4j-jdk14
@@ -144,7 +128,7 @@ data:
                 buildorder: 10
                 ref: stream-maven-3.6
                 rationale: >
-                    Runtime dependency of google-guice, maven.
+                    Runtime dependency of google-guice.
             apache-commons-cli:
                 buildorder: 10
                 ref: stream-maven-3.6
@@ -154,23 +138,17 @@ data:
                 buildorder: 10
                 ref: stream-maven-3.6
                 rationale: >
-                    Runtime dependency of httpcomponents-client, maven.
+                    Runtime dependency of httpcomponents-client.
             apache-commons-io:
                 buildorder: 10
                 ref: stream-maven-3.6
                 rationale: >
-                    Runtime dependency of maven, maven-shared-utils,
-                         maven-wagon.
+                    Runtime dependency of maven-shared-utils, maven-wagon.
             apache-commons-lang3:
                 buildorder: 10
                 ref: stream-maven-3.6
                 rationale: >
                     Runtime dependency of maven.
-            apache-commons-logging:
-                buildorder: 10
-                ref: stream-maven-3.6
-                rationale: >
-                    Runtime dependency of httpcomponents-client, maven.
             atinject:
                 buildorder: 10
                 ref: stream-maven-3.6
@@ -180,17 +158,12 @@ data:
                 buildorder: 20
                 ref: stream-maven-3.6
                 rationale: >
-                    Runtime dependency of maven, sisu.
+                    Runtime dependency of sisu.
             geronimo-annotation:
                 buildorder: 10
                 ref: stream-maven-3.6
                 rationale: >
                     Runtime dependency of maven.
-            glassfish-el:
-                buildorder: 10
-                ref: stream-maven-3.6
-                rationale: >
-                    Runtime dependency of cdi-api.
             google-guice:
                 buildorder: 30
                 ref: stream-maven-3.6
@@ -200,22 +173,22 @@ data:
                 buildorder: 20
                 ref: stream-maven-3.6
                 rationale: >
-                    Runtime dependency of google-guice, maven.
+                    Runtime dependency of google-guice.
             hawtjni:
                 buildorder: 10
                 ref: stream-maven-3.6
                 rationale: >
-                    Runtime dependency of jansi, jansi-native, maven.
+                    Runtime dependency of jansi, jansi-native.
             httpcomponents-client:
                 buildorder: 20
                 ref: stream-maven-3.6
                 rationale: >
-                    Runtime dependency of maven, maven-wagon.
+                    Runtime dependency of maven-wagon.
             httpcomponents-core:
                 buildorder: 10
                 ref: stream-maven-3.6
                 rationale: >
-                    Runtime dependency of httpcomponents-client, maven,
+                    Runtime dependency of httpcomponents-client,
                          maven-wagon.
             jansi:
                 buildorder: 30
@@ -226,12 +199,7 @@ data:
                 buildorder: 20
                 ref: stream-maven-3.6
                 rationale: >
-                    Runtime dependency of jansi, maven.
-            jboss-interceptors-1.2-api:
-                buildorder: 10
-                ref: stream-maven-3.6
-                rationale: >
-                    Runtime dependency of cdi-api.
+                    Runtime dependency of jansi.
             jsoup:
                 buildorder: 10
                 ref: stream-maven-3.6