diff --git a/.gitlab/ci/custom.images.yml b/.gitlab/ci/custom.images.yml
index 6c53072..50ea18f 100644
--- a/.gitlab/ci/custom.images.yml
+++ b/.gitlab/ci/custom.images.yml
@@ -57,8 +57,8 @@ terraform:
 golangci-lint-alpine:
   extends: .build_and_deploy
 
-# Used by gitlab-operator: https://gitlab.com/gitlab-org/gl-openshift/gitlab-operator
-gitlab-operator-build-base:
+# Used by gitlab-operator: https://gitlab.com/gitlab-org/cloud-native/gitlab-operator
+gitlab-operator-build-base-golang-1.18:
   extends: .build_and_deploy
 
 alpine-bash-jq-curl-git:
diff --git a/Dockerfile.gitlab-operator-build-base b/Dockerfile.gitlab-operator-build-base-golang-1.18
similarity index 85%
rename from Dockerfile.gitlab-operator-build-base
rename to Dockerfile.gitlab-operator-build-base-golang-1.18
index 9f12a73..d51a100 100644
--- a/Dockerfile.gitlab-operator-build-base
+++ b/Dockerfile.gitlab-operator-build-base-golang-1.18
@@ -1,8 +1,6 @@
-ARG GOLANG_VERSION=1.16
-ARG ALPINE_VERSION=3.14
-# 3.14 presents challenges: https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.14.0#faccessat2
-# while building OPM. 3.13 has no issues
-ARG OPM_ALPINE_VERSION=3.13
+ARG GOLANG_VERSION=1.18
+ARG ALPINE_VERSION=3.15
+ARG OPM_ALPINE_VERSION=3.15
 
 ## Opm
 
@@ -25,13 +23,11 @@ RUN mkdir -p /src \
 ## Kustomize
 FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} as kustomize
 
-ARG KUSTOMIZE_VERSION=3.8.10
+ARG KUSTOMIZE_VERSION=4.5.7
 ENV GOPROXY="https://proxy.golang.org/"
 
 RUN apk add --no-cache gcc musl-dev
-RUN mkdir /src && cd /src; \
-      go mod init tmp && \
-      go get sigs.k8s.io/kustomize/kustomize/v3@v${KUSTOMIZE_VERSION}
+RUN go install sigs.k8s.io/kustomize/kustomize/v4@v${KUSTOMIZE_VERSION}
 
 ## Controller-gen
 FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} as controller-gen
@@ -39,9 +35,7 @@ FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} as controller-gen
 ARG CONTROLLER_GEN_VERSION=0.7.0
 ENV GOPROXY="https://proxy.golang.org/"
 
-RUN mkdir /src && cd /src; \
-    go mod init tmp \
-	  && go get sigs.k8s.io/controller-tools/cmd/controller-gen@v${CONTROLLER_GEN_VERSION} 
+RUN go install sigs.k8s.io/controller-tools/cmd/controller-gen@v${CONTROLLER_GEN_VERSION}
 
 ## Build
 FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} as build
@@ -63,9 +57,9 @@ RUN apk add --no-cache podman buildah curl make gcc musl-dev git bash coreutils
 # accomodate running podman within docker
 RUN sed -i 's#^driver.*$#driver = "vfs"#g' /etc/containers/storage.conf
 
-RUN go get -u \
-        github.com/onsi/ginkgo/ginkgo \
-        golang.org/x/lint/golint 
+ARG GINKGO_VERSION=1.16.5
+RUN go install github.com/onsi/ginkgo/ginkgo@v${GINKGO_VERSION}
+RUN go install golang.org/x/lint/golint@latest
 
 # Kubebuilder
 RUN mkdir -p /usr/local/kubebuilder/bin \