diff --git a/go1.18.changes b/go1.18.changes
index 9d41e07..6c006f2 100644
--- a/go1.18.changes
+++ b/go1.18.changes
@@ -1,8 +1,9 @@
 -------------------------------------------------------------------
 Fri Aug 19 15:47:43 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
-- bootstrap openSUSE Factory via go1.16, so that we can drop
-  older versions of go from Factory 
+- Bootstrap using go1.16 on SLE-15 and newer. go1.16 is
+  bootstrapped using gcc-go 11 or 12. This allows dropping older
+  versions of Go from Factory.
 
 -------------------------------------------------------------------
 Mon Aug  1 15:40:03 UTC 2022 - Jeff Kowalczyk <jkowalczyk@suse.com>
diff --git a/go1.18.spec b/go1.18.spec
index 47c3681..c862c41 100644
--- a/go1.18.spec
+++ b/go1.18.spec
@@ -31,20 +31,15 @@
 %define go_bootstrap_version go1.16
 %if 0%{?sle_version} == 150000
 # SLE15 or Leap 15.x
-%define gcc_go_version 7
+%define gcc_go_version 11
 %else
 %define gcc_go_version 12
 %endif
 %endif
 
-# By default use go, use '--with gccgo' to bootstrap via gccgo
-%bcond_with    gccgo
-
-# The fallback boostrap method via %%{go_bootstrap_version} would work for Leap
-# but we don't have %%{go_bootstrap_version} in there. Same for SLE15+
-#if ( 0%{?suse_version} < 1550 && 0%{?is_opensuse} ) || ( 0%{?suse_version} >= 1500 && ! 0%{?is_opensuse} )
-#bcond_without gccgo
-#endif
+# Bootstrap go toolchain using existing go package go_bootstrap_version
+# To bootstrap using gccgo use '--with gccgo'
+%bcond_with gccgo
 
 # The fallback bootstrap method via go1.4 doesn't work
 # for aarch64 nor ppc64le because go 1.4 did not support that architecture.
@@ -339,14 +334,14 @@ sed -i "s/\$go_label/%{go_label}/" $GOROOT/bin/gdbinit.d/go.gdb
 %endif
 
 # update-alternatives
- mkdir -p %{buildroot}%{_sysconfdir}/alternatives
- mkdir -p %{buildroot}%{_bindir}
- mkdir -p %{buildroot}%{_sysconfdir}/profile.d
- mkdir -p %{buildroot}%{_sysconfdir}/gdbinit.d
- touch %{buildroot}%{_sysconfdir}/alternatives/{go,gofmt,go.gdb}
- ln -sf %{_sysconfdir}/alternatives/go %{buildroot}%{_bindir}/go
- ln -sf %{_sysconfdir}/alternatives/gofmt %{buildroot}%{_bindir}/gofmt
- ln -sf %{_sysconfdir}/alternatives/go.gdb %{buildroot}%{_sysconfdir}/gdbinit.d/go.gdb
+mkdir -p %{buildroot}%{_sysconfdir}/alternatives
+mkdir -p %{buildroot}%{_bindir}
+mkdir -p %{buildroot}%{_sysconfdir}/profile.d
+mkdir -p %{buildroot}%{_sysconfdir}/gdbinit.d
+touch %{buildroot}%{_sysconfdir}/alternatives/{go,gofmt,go.gdb}
+ln -sf %{_sysconfdir}/alternatives/go %{buildroot}%{_bindir}/go
+ln -sf %{_sysconfdir}/alternatives/gofmt %{buildroot}%{_bindir}/gofmt
+ln -sf %{_sysconfdir}/alternatives/go.gdb %{buildroot}%{_sysconfdir}/gdbinit.d/go.gdb
 
 # documentation and examples
 # fix documetation permissions (rpmlint warning)