diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
index 940f862d7..2f056f5f5 100644
--- a/.github/workflows/e2e-test.yml
+++ b/.github/workflows/e2e-test.yml
@@ -13,10 +13,10 @@ jobs:
       GO111MODULE: on
     steps:
 
-      - name: Set up Go 1.16
+      - name: Set up Go 1.18
         uses: actions/setup-go@v2
         with:
-          go-version: 1.16
+          go-version: 1.18
         id: go
 
       - name: Check out code into the Go module directory
diff --git a/.github/workflows/nightly-builds.yml b/.github/workflows/nightly-builds.yml
index c33b16630..875b24e75 100644
--- a/.github/workflows/nightly-builds.yml
+++ b/.github/workflows/nightly-builds.yml
@@ -15,10 +15,10 @@ jobs:
       GO111MODULE: on
     steps:
 
-      - name: Set up Go 1.16
+      - name: Set up Go 1.18
         uses: actions/setup-go@v2
         with:
-          go-version: 1.16
+          go-version: 1.18
         id: go
 
       - name: Check out code into the Go module directory
diff --git a/build/ks-apiserver/Dockerfile b/build/ks-apiserver/Dockerfile
index fd2200415..163a0ec05 100644
--- a/build/ks-apiserver/Dockerfile
+++ b/build/ks-apiserver/Dockerfile
@@ -14,8 +14,8 @@ WORKDIR /tmp
 RUN apk add --no-cache ca-certificates
 
 
-# Build 
-FROM golang:1.16.3 as build_context
+# Build
+FROM golang:1.18.4 as build_context
 
 ENV OUTDIR=/out
 RUN mkdir -p ${OUTDIR}/usr/local/bin/
@@ -30,7 +30,7 @@ RUN mv /workspace/bin/cmd/ks-apiserver ${OUTDIR}/usr/local/bin/
 # Final image
 #############
 
-FROM alpine:3.11 
+FROM alpine:3.11
 
 COPY --from=base_os_context /out/ /
 COPY --from=build_context /out/ /
diff --git a/build/ks-controller-manager/Dockerfile b/build/ks-controller-manager/Dockerfile
index 5d7ea6afa..6af91880e 100644
--- a/build/ks-controller-manager/Dockerfile
+++ b/build/ks-controller-manager/Dockerfile
@@ -22,7 +22,7 @@ RUN mv /tmp/ingress-nginx ${OUTDIR}/var/helm-charts/
 
 # Build
 
-FROM golang:1.16.3 as build_context
+FROM golang:1.18.4 as build_context
 
 ENV OUTDIR=/out
 RUN mkdir -p ${OUTDIR}/usr/local/bin/
@@ -40,7 +40,7 @@ RUN mv /workspace/config/watches.yaml ${OUTDIR}/var/helm-charts/
 
 # Final Image
 
-FROM alpine:3.11 
+FROM alpine:3.11
 
 COPY --from=base_os_context /out/ /
 COPY --from=build_context /out/ /