diff --git a/varnish.yaml b/varnish.yaml
index 341c76c..07ae52f 100644
--- a/varnish.yaml
+++ b/varnish.yaml
@@ -1,138 +1,40 @@
 document: modulemd
-version: 1
+version: 2
 data:
+    name: varnish
+    stream: 6
     summary: Varnish HTTP cache
-    description: An initial version of the Varnish cache module.
+    description: Varnish Cache web application accelerator
     license:
         module: [ MIT ]
     dependencies:
-        buildrequires:
-            #workaround before base-runtime is ready
-            bootstrap: master
-        requires:
-            base-runtime: master
+        - buildrequires:
+                platform: [f31]
+          requires:
+                platform: [f31]
     references:
-        community: https://docs.pagure.org/modularity/
-        documentation: https://github.com/container-images/varnish
-        tracker: https://github.com/container-images/varnish
+        documentation: http://varnish-cache.org/docs/
+        tracker: https://github.com/varnishcache/varnish-cache/issues
     profiles:
         default:
             rpms:
                 - varnish
+                - varnish-modules
+    buildopts:
+        rpms:
+            macros: |
+                %_without_python2 1
+                %_with_python3 1
     api:
         rpms:
             - varnish
+            - varnish-modules
     components:
         rpms:
             varnish:
-                rationale: Provides API for this module.
-                ref: f25
-
-            generic-release: 
-                rationale: dependency.
-                ref: f25
-            hostname: 
-                rationale: dependency.
-                ref: f25
-            initscripts: 
-                rationale: dependency.
-                ref: f25
-            ipcalc: 
-                rationale: dependency.
-                ref: f25
-            iproute: 
-                rationale: dependency.
-                ref: f25
-            iputils: 
-                rationale: dependency.
-                ref: f25
-            jemalloc: 
-                rationale: dependency.
-                ref: f25
-            libedit: 
-                rationale: dependency.
-                ref: f25
-            libmnl: 
-                rationale: dependency.
-                ref: f25
-            logrotate: 
-                rationale: dependency.
-                ref: f25
-            perl-Carp: 
-                rationale: dependency.
-                ref: f25
-            perl-constant: 
-                rationale: dependency.
-                ref: f25
-            perl-Encode: 
-                rationale: dependency.
-                ref: f25
-            perl-Exporter: 
-                rationale: dependency.
-                ref: f25
-            perl-File-Path: 
-                rationale: dependency.
-                ref: f25
-            perl-File-Temp: 
-                rationale: dependency.
-                ref: f25
-            perl-Getopt-Long: 
-                rationale: dependency.
-                ref: f25
-            perl-HTTP-Tiny: 
-                rationale: dependency.
-                ref: f25
-            perl-MIME-Base64: 
-                rationale: dependency.
-                ref: f25
-            perl-parent: 
-                rationale: dependency.
-                ref: f25
-            perl-PathTools: 
-                rationale: dependency.
-                ref: f25
-            perl-Pod-Escapes: 
-                rationale: dependency.
-                ref: f25
-            perl-podlators: 
-                rationale: dependency.
-                ref: f25
-            perl-Pod-Perldoc: 
-                rationale: dependency.
-                ref: f25
-            perl-Pod-Simple: 
-                rationale: dependency.
-                ref: f25
-            perl-Pod-Usage: 
-                rationale: dependency.
-                ref: f25
-            perl-Scalar-List-Utils: 
-                rationale: dependency.
-                ref: f25
-            perl-Socket: 
-                rationale: dependency.
-                ref: f25
-            perl-Term-ANSIColor: 
-                rationale: dependency.
-                ref: f25
-            perl-Term-Cap: 
-                rationale: dependency.
-                ref: f25
-            perl-Text-ParseWords: 
-                rationale: dependency.
-                ref: f25
-            perl-Text-Tabs+Wrap: 
-                rationale: dependency.
-                ref: f25
-            perl-threads: 
-                rationale: dependency.
-                ref: f25
-            perl-threads-shared: 
-                rationale: dependency.
-                ref: f25
-            perl-Time-Local: 
-                rationale: dependency.
-                ref: f25
-            perl-Unicode-Normalize: 
-                rationale: dependency.
-                ref: f25
+                rationale: Module API.
+                ref: stream-6
+            varnish-modules:
+                rationale: Extension modules.
+                ref: stream-6
+                buildorder: 1