diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5b88669b8..09a49e258 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -74,7 +74,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: ["1.17"]
+        go-version: ["1.17", "1.18"]
     steps:
     - name: checkout
       uses: actions/checkout@v2
diff --git a/build/makelib/golang.mk b/build/makelib/golang.mk
index f948a7007..0b179ffc8 100644
--- a/build/makelib/golang.mk
+++ b/build/makelib/golang.mk
@@ -48,7 +48,7 @@ GO_TEST_FLAGS ?=
 # ====================================================================================
 # Setup go environment
 
-GO_SUPPORTED_VERSIONS ?= 1.17
+GO_SUPPORTED_VERSIONS ?= 1.17|1.18
 
 GO_PACKAGES := $(foreach t,$(GO_SUBDIRS),$(GO_PROJECT)/$(t)/...)
 GO_INTEGRATION_TEST_PACKAGES := $(foreach t,$(GO_INTEGRATION_TESTS_SUBDIRS),$(GO_PROJECT)/$(t)/integration)
@@ -210,7 +210,7 @@ $(CONTROLLER_GEN):
 		export CGO_ENABLED=$(CGO_ENABLED_VALUE) ;\
 		export GOBIN=$$CONTROLLER_GEN_TMP_DIR ;\
 		echo === installing controller-gen ;\
-		go get sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_GEN_VERSION);\
+		go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_GEN_VERSION);\
 		mv $$CONTROLLER_GEN_TMP_DIR/controller-gen $(CONTROLLER_GEN) ;\
 		rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
 	}