diff --git a/component/golang/buildout.cfg b/component/golang/buildout.cfg
index d2b8a866eb756185ab4473881297ded27ea34ec7..4fc4a54168ec92ebd58e35b314ca628634996631 100644
--- a/component/golang/buildout.cfg
+++ b/component/golang/buildout.cfg
@@ -152,7 +152,7 @@ bin	= ${gowork.dir:bin}
 depends = ${gowork.goinstall:recipe}
 
 # go version used for the workspace (possible to override in applications)
-golang  = ${golang1.17:location}
+golang  = ${golang1.18:location}
 
 # no special build flags by default
 buildflags =
diff --git a/software/grafana/software.cfg b/software/grafana/software.cfg
index ace3662c9d193293bcce17a899492cd0a1914b02..3beb74ab96cf2ad7bc8cc22e2e0b9025e2efc82c 100644
--- a/software/grafana/software.cfg
+++ b/software/grafana/software.cfg
@@ -50,6 +50,8 @@ revision      = v1.17.3-0-g24a552b90b
 
 
 [gowork]
+# Fails with current default golang1.18
+golang = ${golang1.17:location}
 install =
   ${go_github.com_grafana_loki:location}:./cmd/loki
   ${go_github.com_grafana_loki:location}:./cmd/promtail