diff --git a/Dockerfile b/Dockerfile
index 135e0e2b0a..bf562157c3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Build Geth in a stock Go builder container
-FROM golang:1.20.10-alpine3.18@sha256:0d6e012ec44ed21993ee2ccf05839844f13347165ce7599a8e8442b02f836b45 as builder
+FROM golang:1.20.10-alpine3.18@sha256:0d6e012ec44ed21993ee2ccf05839844f13347165ce7599a8e8442b02f836b45 AS builder
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git libstdc++-dev
 
@@ -12,24 +12,24 @@ FROM alpine:3.18@sha256:5292533eb4efd4b5cf35e93b5a2b7d0e07ea193224c49446c7802c19
 RUN apk add --no-cache ca-certificates
 WORKDIR "/opt"
 
-ENV PASSWORD ''
-ENV PRIVATE_KEY ''
-ENV BOOTNODES ''
-ENV VERBOSITY 3
-ENV SYNC_MODE 'snap'
-ENV NETWORK_ID '2021'
-ENV ETHSTATS_ENDPOINT ''
-ENV NODEKEY ''
-ENV FORCE_INIT 'true'
-ENV RONIN_PARAMS ''
-ENV INIT_FORCE_OVERRIDE_CHAIN_CONFIG 'false'
-ENV ENABLE_FAST_FINALITY 'true'
-ENV ENABLE_FAST_FINALITY_SIGN 'false'
-ENV BLS_PRIVATE_KEY ''
-ENV BLS_PASSWORD ''
-ENV BLS_AUTO_GENERATE 'false'
-ENV BLS_SHOW_PRIVATE_KEY 'false'
-ENV GENERATE_BLS_PROOF 'false'
+ENV PASSWORD=''
+ENV PRIVATE_KEY=''
+ENV BOOTNODES=''
+ENV VERBOSITY=3
+ENV SYNC_MODE='snap'
+ENV NETWORK_ID='2021'
+ENV ETHSTATS_ENDPOINT=''
+ENV NODEKEY=''
+ENV FORCE_INIT='true'
+ENV RONIN_PARAMS=''
+ENV INIT_FORCE_OVERRIDE_CHAIN_CONFIG='false'
+ENV ENABLE_FAST_FINALITY='true'
+ENV ENABLE_FAST_FINALITY_SIGN='false'
+ENV BLS_PRIVATE_KEY=''
+ENV BLS_PASSWORD=''
+ENV BLS_AUTO_GENERATE='false'
+ENV BLS_SHOW_PRIVATE_KEY='false'
+ENV GENERATE_BLS_PROOF='false'
 
 COPY --from=builder /opt/build/bin/ronin /usr/local/bin/ronin
 COPY --from=builder /opt/genesis/ ./
diff --git a/Dockerfile.alltools b/Dockerfile.alltools
index 3ae5377e4f..99ec85eaaf 100644
--- a/Dockerfile.alltools
+++ b/Dockerfile.alltools
@@ -4,7 +4,7 @@ ARG VERSION=""
 ARG BUILDNUM=""
 
 # Build Geth in a stock Go builder container
-FROM golang:1.17-alpine as builder
+FROM golang:1.17-alpine AS builder
 
 RUN apk add --no-cache gcc musl-dev linux-headers git
 
diff --git a/docker/bootnode/Dockerfile b/docker/bootnode/Dockerfile
index 6cae289e68..b02d9c2f7e 100644
--- a/docker/bootnode/Dockerfile
+++ b/docker/bootnode/Dockerfile
@@ -1,5 +1,5 @@
 # Build Geth in a stock Go builder container
-FROM golang:1.15.5-alpine as builder
+FROM golang:1.15.5-alpine AS builder
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git