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 a7046b8..0000000
--- a/go-toolset.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
----
-document: modulemd
-version: 2
-data:
-  name: go-toolset
-  summary: Go
-  description: Go Tools and libraries
-  stream: rhel8
-  license:
-    module: [MIT]
-  dependencies:
-    - buildrequires:
-        platform: [el8.4.0]
-        go-toolset: [rhel8]
-      requires:
-        platform: [el8]
-  profiles:
-    common:
-      rpms:
-        - go-toolset
-  api:
-    rpms:
-      - golang
-  buildopts:
-    rpms:
-      whitelist:
-        - go-toolset-1.10
-        - go-toolset-1.10-golang
-        - go-toolset
-        - go-toolset-golang
-        - golang
-        - delve
-  components:
-    rpms:
-      go-toolset:
-        rationale: Meta package for go-toolset providing scl enable scripts.
-        ref: 45883927cf55361bee839913e6e0b4d639fbc6d8
-        buildorder: 0
-      golang:
-        rationale: Package providing the Go compiler toolchain.
-        ref: 347a04a958e51d4e1a15dfabd5b6cc5da25da49a
-        buildorder: 1
-      delve:
-        rationale: A debugger for the Go programming language
-        ref: aed8ff16ea20e610598c938598fe2b9648340909
-        buildorder: 2