diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index dfa779d..788e757 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -32,15 +32,12 @@ data:
         - delve
   components:
     rpms:
-      go-toolset:
-        rationale: Meta package for go-toolset providing scl enable scripts.
-        ref: stream-rhel-8-rhel-8.8.0
-        buildorder: 0
       golang:
         rationale: Package providing the Go compiler toolchain.
-        ref: stream-rhel-8-rhel-8.8.0
-        buildorder: 1
+        ref: stream-go-toolset-rhel-next-rhel-8.10.0
+        buildorder: 0
       delve:
         rationale: A debugger for the Go programming language
-        ref: stream-rhel-8-rhel-8.8.0
-        buildorder: 2
+        ref: stream-go-toolset-rhel-next-rhel-8.10.0
+        buildorder: 1
+