diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index c6a1534..6496759 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/vscode/devcontainers/go:1.17
+FROM mcr.microsoft.com/vscode/devcontainers/go:1.18
 ENV DEVELOPMENT=True
 
 # [Option] Install Node.js
diff --git a/Dockerfile b/Dockerfile
index ef82db0..df9fe17 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 ARG BUILD_FROM
 
-FROM golang:1.17-alpine3.16 AS builder
+FROM golang:1.18-alpine3.16 AS builder
 
 WORKDIR /usr/src/landingpage
 ARG BUILD_ARCH
diff --git a/go.mod b/go.mod
index 609548f..f1cd2ce 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/home-assistant/landingpage
 
-go 1.17
+go 1.18
 
 require (
 	github.com/grandcat/zeroconf v1.0.0