diff --git a/misc/curl/Dockerfile b/misc/curl/Dockerfile
index b552f47..06b79d7 100644
--- a/misc/curl/Dockerfile
+++ b/misc/curl/Dockerfile
@@ -1,6 +1,8 @@
+# syntax=docker/dockerfile:1
+
 ARG ALPINE_VERSION
 
-FROM alpine:${ALPINE_VERSION} as base
+FROM alpine:${ALPINE_VERSION} AS base
 
 # All images based on this one will have these ENV vars
 ENV KIND=druid-docker-image \
diff --git a/misc/docker-bake.hcl b/misc/docker-bake.hcl
index ccc3e59..5cb89d9 100644
--- a/misc/docker-bake.hcl
+++ b/misc/docker-bake.hcl
@@ -1,13 +1,18 @@
-variable ALPINE_VERSION {}
+variable "ALPINE_VERSION" {
+  default = "3.20.3"
+}
+
 variable SIMPLESAMLPHP_VERSION {
   default = "2.2.1"
 }
 
 group "default" {
-  targets = ["curl", "s3-sync", "saml-idp", "solr", "varnish"]
+  #targets = ["curl", "s3-sync", "saml-idp", "solr", "varnish"]
+  targets = ["s3-sync", "saml-idp", "solr", "varnish"]
 }
 
 target "common" {
+  debug = true
   args = {
     ALPINE_VERSION = "${ALPINE_VERSION}"
   }
diff --git a/misc/s3-sync/Dockerfile b/misc/s3-sync/Dockerfile
index 0f247b0..ffcde28 100644
--- a/misc/s3-sync/Dockerfile
+++ b/misc/s3-sync/Dockerfile
@@ -1,12 +1,11 @@
-ARG ALPINE_VERSION
+# syntax=docker/dockerfile:1
 
-FROM alpine:${ALPINE_VERSION} as base
+ARG ALPINE_VERSION=3.20.3
 
-ARG ALPINE_VERSION
+FROM alpine:${ALPINE_VERSION} AS base
 
 # All images based on this one will have these ENV vars
-ENV KIND=druid-docker-image \
-    ALPINE_VERSION=${ALPINE_VERSION}
+ENV KIND=druid-docker-image
 
 COPY s3cfg /root/.s3cfg
 COPY entrypoint.sh /
diff --git a/misc/saml-idp/Dockerfile b/misc/saml-idp/Dockerfile
index fd36606..79c2a31 100644
--- a/misc/saml-idp/Dockerfile
+++ b/misc/saml-idp/Dockerfile
@@ -1,4 +1,6 @@
-FROM alpine as simplesamlphp
+# syntax=docker/dockerfile:1
+
+FROM alpine AS simplesamlphp
 
 ARG SIMPLESAMLPHP_VERSION
 ARG SIMPLESAMLPHP_URL=https://github.com/simplesamlphp/simplesamlphp/releases/download/v${SIMPLESAMLPHP_VERSION}/simplesamlphp-${SIMPLESAMLPHP_VERSION}-slim.tar.gz
@@ -9,7 +11,7 @@ RUN tar xzf /tmp/simplesamlphp.tar.gz -C /tmp
 RUN mv /tmp/simplesamlphp-* /home/simplesamlphp
 RUN rm -rf /home/simplesamlphp/modules/cron /home/simplesamlphp/modules/multiauth
 
-FROM druidfi/php-fpm:8.3 as final
+FROM druidfi/php-fpm:8.3 AS final
 
 USER root
 
diff --git a/misc/solr/Dockerfile b/misc/solr/Dockerfile
index ae881aa..38bffb9 100644
--- a/misc/solr/Dockerfile
+++ b/misc/solr/Dockerfile
@@ -1,24 +1,27 @@
+# syntax=docker/dockerfile:1
+# check=skip=InvalidBaseImagePlatform
+
 #
 # AMD64
 #
-FROM --platform=linux/amd64 solr:8.11-slim as solr-8-amd64
+FROM --platform=linux/amd64 solr:8.11-slim AS solr-8-amd64
 
 ENV ARCH=amd64
 
 #
 # ARM64
 #
-FROM --platform=linux/arm64 arm64v8/solr:8.11-slim as solr-8-arm64
+FROM --platform=linux/arm64 arm64v8/solr:8.11-slim AS solr-8-arm64
 
 ENV ARCH=arm64
 
 #
 # Final
 #
-FROM solr-8-${TARGETARCH} as solr
+FROM solr-8-${TARGETARCH} AS solr
 
 ENV SOLR_HEAP="1024m" \
-    SOLR_DEFAULT_CONFIG_SET="search_api_solr_4.2.1"
+    SOLR_DEFAULT_CONFIG_SET="search_api_solr_4.3.0"
 
 RUN rm -rf /opt/docker-solr/configsets/
 
diff --git a/misc/varnish/Dockerfile b/misc/varnish/Dockerfile
index ec3e6af..eb39c31 100644
--- a/misc/varnish/Dockerfile
+++ b/misc/varnish/Dockerfile
@@ -1,5 +1,8 @@
+# syntax=docker/dockerfile:1
+# check=skip=SecretsUsedInArgOrEnv
+
 # See https://github.com/wodby/varnish
-FROM wodby/varnish:6 as base
+FROM wodby/varnish:6 AS base
 
 ENV VARNISH_SECRET=secret \
     VARNISH_BACKEND_HOST=app \