diff --git a/gcc.yaml b/gcc.yaml
index 11289e43ccd..d3bafc5db52 100644
--- a/gcc.yaml
+++ b/gcc.yaml
@@ -1,7 +1,7 @@
 package:
   name: gcc
   version: "15.2.0"
-  epoch: 2
+  epoch: 3
   description: "the GNU compiler collection"
   copyright:
     - license: GPL-3.0-or-later WITH GCC-exception-3.1
@@ -103,7 +103,7 @@ pipeline:
         --with-arch=$march \
         --with-tune=$mtune \
         --with-specs=$specs \
-        --enable-languages=c,c++,fortran,jit,go \
+        --enable-languages=c,c++,fortran,jit \
         --enable-bootstrap \
         --enable-gnu-indirect-function \
         --enable-gnu-unique-object \
@@ -280,52 +280,6 @@ subpackages:
       pipeline:
         - uses: test/tw/ldd-check
 
-  - name: "libgo"
-    description: "GCC go runtime library"
-    pipeline:
-      - runs: |
-          mkdir -p "${{targets.subpkgdir}}"/usr/lib
-          mv "${{targets.destdir}}"/usr/lib/libgo.so.* "${{targets.subpkgdir}}"/usr/lib/
-    test:
-      pipeline:
-        - uses: test/tw/ldd-check
-
-  - name: "gcc-go"
-    description: "GCC go compiler"
-    dependencies:
-      provides:
-        - go-bootstrap=1.18
-    pipeline:
-      - runs: |
-          _libexecdir=/usr/libexec/gcc/${{host.triplet.gnu}}/${{vars.major-version}}
-
-          for i in "$_libexecdir" usr/lib usr/bin; do
-            mkdir -p "${{targets.subpkgdir}}"/$i
-          done
-
-          mv "${{targets.destdir}}"/usr/bin/${{host.triplet.gnu}}-gccgo "${{targets.subpkgdir}}"/usr/bin/
-          for i in go gofmt gccgo; do
-            mv "${{targets.destdir}}"/usr/bin/$i "${{targets.subpkgdir}}"/usr/bin/
-          done
-
-          mv "${{targets.destdir}}"/usr/lib/go "${{targets.subpkgdir}}"/usr/lib/
-          mv "${{targets.destdir}}"/usr/lib/libgo.a "${{targets.subpkgdir}}"/usr/lib/
-          mv "${{targets.destdir}}"/usr/lib/libgobegin.a "${{targets.subpkgdir}}"/usr/lib/
-          mv "${{targets.destdir}}"/usr/lib/libgolibbegin.a "${{targets.subpkgdir}}"/usr/lib/
-          mv "${{targets.destdir}}"/usr/lib/libgo.so "${{targets.subpkgdir}}"/usr/lib/
-
-          for i in cgo go1; do
-            mv "${{targets.destdir}}"/"$_libexecdir"/$i "${{targets.subpkgdir}}"/"$_libexecdir"/
-          done
-    test:
-      pipeline:
-        - runs: |
-            gccgo --version
-            gccgo --help
-            go version
-            go help
-            gofmt --help
-
 test:
   environment:
     contents:
diff --git a/go-1.20.yaml b/go-1.20.yaml
index 098eddd3ada..4f1d98b4dee 100644
--- a/go-1.20.yaml
+++ b/go-1.20.yaml
@@ -1,7 +1,7 @@
 package:
   name: go-1.20
   version: 1.20.14
-  epoch: 8
+  epoch: 9
   description: "the Go programming language"
   copyright:
     - license: BSD-3-Clause
@@ -19,7 +19,7 @@ environment:
       - build-base
       - busybox
       - ca-certificates-bundle
-      - gcc-go
+      - go-1.20
 
 pipeline:
   - uses: fetch
diff --git a/openssf-compiler-options.yaml b/openssf-compiler-options.yaml
index 86949bc30f7..93f523d4130 100644
--- a/openssf-compiler-options.yaml
+++ b/openssf-compiler-options.yaml
@@ -1,7 +1,7 @@
 package:
   name: openssf-compiler-options
   version: 20240627
-  epoch: 31
+  epoch: 32
   description: "Compiler Options Hardening Guide for C and C++"
   url: https://best.openssf.org/Compiler-Hardening-Guides/Compiler-Options-Hardening-Guide-for-C-and-C++.html
   copyright:
@@ -13,7 +13,7 @@ vars:
   # Although the GCC packages install more binaries under /usr/bin/
   # than those that are listed here, only these binaries actually
   # honor/support spec files.
-  gcc-wrapper-bins: c++ g++ gcc gfortran gccgo
+  gcc-wrapper-bins: c++ g++ gcc gfortran
 
 environment:
   contents: