diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 0108633..fda178b 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -2,6 +2,7 @@
 document: modulemd
 version: 2
 data:
+  name: go-toolset
   summary: Go
   description: Go Tools and libraries
   stream: rhel8
@@ -28,13 +29,18 @@ data:
         - go-toolset
         - go-toolset-golang
         - golang
+        - delve
   components:
     rpms:
-      go-toolset-7:
+      go-toolset:
         rationale: Meta package for go-toolset providing scl enable scripts.
-        ref: stream-rhel-8-rhel-8.1.0
+        ref: stream-rhel-8-rhel-8.2.0
         buildorder: 0
       golang:
         rationale: Package providing the Go compiler toolchain.
-        ref: stream-rhel-8-rhel-8.1.0
+        ref: stream-rhel-8-rhel-8.2.0
         buildorder: 1
+      delve:
+        rationale: A debugger for the Go programming language
+        ref: stream-rhel-8-rhel-8.2.0
+        buildorder: 2
diff --git a/go-toolset.yaml b/go-toolset.yaml
deleted file mode 100644
index 6655890..0000000
--- a/go-toolset.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-document: modulemd
-version: 2
-data:
-  name: go-toolset
-  stream: rhel8
-  summary: Go
-  description: >-
-    Go Tools and libraries
-  license:
-    module:
-    - MIT
-  dependencies:
-  - buildrequires:
-      go-toolset: [rhel8]
-      platform: [el8.1.0]
-    requires:
-      platform: [el8]
-  profiles:
-    common:
-      rpms:
-      - go-toolset
-  api:
-    rpms:
-    - golang
-  buildopts:
-    rpms:
-      whitelist:
-      - go-toolset
-      - go-toolset-1.10
-      - go-toolset-1.10-golang
-      - go-toolset-golang
-      - golang
-  components:
-    rpms:
-      go-toolset:
-        rationale: Meta package for go-toolset providing scl enable scripts.
-        ref: 59bb25bb6ac0b1853fe0e92c4b65667c99e31789
-      golang:
-        rationale: Package providing the Go compiler toolchain.
-        ref: 6cdaae3bf8e64a21fec89c49be4742a17ee468e2
-        buildorder: 1
-...
-