diff --git a/docker-bake.hcl b/docker-bake.hcl
index fa9ebe7..e99b5d9 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -1,5 +1,5 @@
 group "default" {
-	targets = ["debian-latest", "alpine-latest", "debian-16", "debian-15", "debian-14", "debian-13", "alpine-16", "alpine-15", "alpine-14", "alpine-13"]
+	targets = ["debian-latest", "alpine-latest", "debian-17", "debian-16", "debian-15", "debian-14", "debian-13", "alpine-17", "alpine-16", "alpine-15", "alpine-14", "alpine-13"]
 }
 
 variable "REGISTRY_PREFIX" {
@@ -27,20 +27,40 @@ target "alpine" {
 target "debian-latest" {
 	inherits = ["debian"]
 	platforms = ["linux/amd64", "linux/arm64", "linux/arm/v7", "linux/s390x", "linux/ppc64le"]
-	args = {"BASETAG" = "17"}
+	args = {"BASETAG" = "18"}
 	tags = [
 		"${REGISTRY_PREFIX}${IMAGE_NAME}:latest",
-		"${REGISTRY_PREFIX}${IMAGE_NAME}:17",
-		notequal("", BUILD_REVISION) ? "${REGISTRY_PREFIX}${IMAGE_NAME}:17-debian-${BUILD_REVISION}" : ""
+		"${REGISTRY_PREFIX}${IMAGE_NAME}:18",
+		notequal("", BUILD_REVISION) ? "${REGISTRY_PREFIX}${IMAGE_NAME}:18-debian-${BUILD_REVISION}" : ""
 	]
 }
 
 target "alpine-latest" {
 	inherits = ["alpine"]
 	platforms = ["linux/amd64", "linux/arm64", "linux/arm/v7", "linux/s390x", "linux/ppc64le"]
-	args = {"BASETAG" = "17-alpine"}
+	args = {"BASETAG" = "18-alpine"}
 	tags = [
 		"${REGISTRY_PREFIX}${IMAGE_NAME}:alpine",
+		"${REGISTRY_PREFIX}${IMAGE_NAME}:18-alpine",
+		notequal("", BUILD_REVISION) ? "${REGISTRY_PREFIX}${IMAGE_NAME}:18-alpine-${BUILD_REVISION}" : ""
+	]
+}
+
+target "debian-17" {
+	inherits = ["debian"]
+	platforms = ["linux/amd64", "linux/arm64", "linux/arm/v7", "linux/s390x", "linux/ppc64le"]
+	args = {"BASETAG" = "17"}
+	tags = [
+		"${REGISTRY_PREFIX}${IMAGE_NAME}:17",
+		notequal("", BUILD_REVISION) ? "${REGISTRY_PREFIX}${IMAGE_NAME}:17-debian-${BUILD_REVISION}" : ""
+	]
+}
+
+target "alpine-17" {
+	inherits = ["alpine"]
+	platforms = ["linux/amd64", "linux/arm64", "linux/arm/v7", "linux/s390x", "linux/ppc64le"]
+	args = {"BASETAG" = "17-alpine"}
+	tags = [
 		"${REGISTRY_PREFIX}${IMAGE_NAME}:17-alpine",
 		notequal("", BUILD_REVISION) ? "${REGISTRY_PREFIX}${IMAGE_NAME}:17-alpine-${BUILD_REVISION}" : ""
 	]
diff --git a/generate-docker-bake.sh b/generate-docker-bake.sh
index 1cb72fb..b36be88 100755
--- a/generate-docker-bake.sh
+++ b/generate-docker-bake.sh
@@ -3,8 +3,8 @@
 set -e
 
 GOCRONVER="v0.0.11"
-MAIN_TAG="17"
-TAGS_EXTRA="16 15 14 13"
+MAIN_TAG="18"
+TAGS_EXTRA="17 16 15 14 13"
 PLATFORMS="linux/amd64 linux/arm64 linux/arm/v7 linux/s390x linux/ppc64le"
 DOCKER_BAKE_FILE="${1:-docker-bake.hcl}"