diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index c8b6d08..075cb01 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -34,13 +34,13 @@ data:
     rpms:
       go-toolset:
         rationale: Meta package for go-toolset providing scl enable scripts.
-        ref: stream-rhel-8-rhel-8.4.0
+        ref: stream-rhel-8-rhel-8.5.0
         buildorder: 0
       golang:
         rationale: Package providing the Go compiler toolchain.
-        ref: stream-rhel-8-rhel-8.4.0
+        ref: stream-rhel-8-rhel-8.5.0
         buildorder: 1
       delve:
         rationale: A debugger for the Go programming language
-        ref: stream-rhel-8-rhel-8.4.0
+        ref: stream-rhel-8-rhel-8.5.0
         buildorder: 2
diff --git a/go-toolset.yaml b/go-toolset.yaml
deleted file mode 100644
index e954fb9..0000000
--- a/go-toolset.yaml
+++ /dev/null
@@ -1,49 +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.4.0]
-    requires:
-      platform: [el8]
-  profiles:
-    common:
-      rpms:
-      - go-toolset
-  api:
-    rpms:
-    - golang
-  buildopts:
-    rpms:
-      whitelist:
-      - delve
-      - go-toolset
-      - go-toolset-1.10
-      - go-toolset-1.10-golang
-      - go-toolset-golang
-      - golang
-  components:
-    rpms:
-      delve:
-        rationale: A debugger for the Go programming language
-        ref: aed8ff16ea20e610598c938598fe2b9648340909
-        buildorder: 2
-      go-toolset:
-        rationale: Meta package for go-toolset providing scl enable scripts.
-        ref: 2feb29d775e86835819b16346ddafaff5a73939f
-      golang:
-        rationale: Package providing the Go compiler toolchain.
-        ref: 012508519b34450206e7fbcdead86de98e817ed6
-        buildorder: 1
-...
-