diff --git a/eclipse-temurin/Dockerfile b/eclipse-temurin/Dockerfile
index bb42d3a..5b98f71 100644
--- a/eclipse-temurin/Dockerfile
+++ b/eclipse-temurin/Dockerfile
@@ -10,13 +10,13 @@ FROM eclipse-temurin:${BASE_IMAGE_TAG:-11.0.16.1_1-jdk}
 
 # Env variables
 ARG SCALA_VERSION
-ENV SCALA_VERSION ${SCALA_VERSION:-2.13.10}
+ENV SCALA_VERSION=${SCALA_VERSION:-2.13.10}
 ARG SBT_VERSION
-ENV SBT_VERSION ${SBT_VERSION:-1.6.2}
+ENV SBT_VERSION=${SBT_VERSION:-1.6.2}
 ARG USER_ID
-ENV USER_ID ${USER_ID:-1001}
+ENV USER_ID=${USER_ID:-1001}
 ARG GROUP_ID
-ENV GROUP_ID ${GROUP_ID:-1001}
+ENV GROUP_ID=${GROUP_ID:-1001}
 
 # Install dependencies
 # curl for downloading sbt and scala
@@ -88,4 +88,4 @@ RUN \
 ## -w /home/sbtuser
 WORKDIR /root
 
-CMD sbt
+CMD ["sbt"]
diff --git a/eclipse-temurin/alpine.Dockerfile b/eclipse-temurin/alpine.Dockerfile
index 0980a4b..a036be3 100644
--- a/eclipse-temurin/alpine.Dockerfile
+++ b/eclipse-temurin/alpine.Dockerfile
@@ -1,6 +1,6 @@
 # Use a multi-stage build to reduce the size of the final image
 ARG BASE_IMAGE_TAG
-FROM eclipse-temurin:${BASE_IMAGE_TAG:-21.0.2_13-jdk-alpine} as builder
+FROM eclipse-temurin:${BASE_IMAGE_TAG:-21.0.2_13-jdk-alpine} AS builder
 
 ARG SCALA_VERSION=3.4.0
 ARG SBT_VERSION=1.9.9
@@ -88,4 +88,4 @@ RUN \
 ## -w /home/sbtuser
 WORKDIR /root
 
-CMD sbt
+CMD ["sbt"]
diff --git a/graalvm-ce/Dockerfile b/graalvm-ce/Dockerfile
index b921f84..cfc4157 100644
--- a/graalvm-ce/Dockerfile
+++ b/graalvm-ce/Dockerfile
@@ -10,14 +10,14 @@ FROM ghcr.io/graalvm/graalvm-ce:${BASE_IMAGE_TAG:-java11-21.3.0}
 
 # Env variables
 ARG SCALA_VERSION
-ENV SCALA_VERSION ${SCALA_VERSION:-2.13.10}
+ENV SCALA_VERSION=${SCALA_VERSION:-2.13.10}
 ARG SBT_VERSION
-ENV SBT_VERSION ${SBT_VERSION:-1.6.2}
-ENV JAVA_OPTS -XX:+UseG1GC
+ENV SBT_VERSION=${SBT_VERSION:-1.6.2}
+ENV JAVA_OPTS=-XX:+UseG1GC
 ARG USER_ID
-ENV USER_ID ${USER_ID:-1001}
+ENV USER_ID=${USER_ID:-1001}
 ARG GROUP_ID
-ENV GROUP_ID ${GROUP_ID:-1001}
+ENV GROUP_ID=${GROUP_ID:-1001}
 
 # Install sbt
 RUN \
@@ -77,4 +77,4 @@ RUN \
 ## -w /home/sbtuser
 WORKDIR /root
 
-CMD sbt
+CMD ["sbt"]
diff --git a/graalvm-community/Dockerfile b/graalvm-community/Dockerfile
index ccb8f56..8cc81ea 100644
--- a/graalvm-community/Dockerfile
+++ b/graalvm-community/Dockerfile
@@ -10,14 +10,14 @@ FROM ghcr.io/graalvm/graalvm-community:${BASE_IMAGE_TAG:-21.0.1-ol9}
 
 # Env variables
 ARG SCALA_VERSION
-ENV SCALA_VERSION ${SCALA_VERSION:-2.13.12}
+ENV SCALA_VERSION=${SCALA_VERSION:-2.13.12}
 ARG SBT_VERSION
-ENV SBT_VERSION ${SBT_VERSION:-1.9.7}
-ENV JAVA_OPTS -XX:+UseG1GC
+ENV SBT_VERSION=${SBT_VERSION:-1.9.7}
+ENV JAVA_OPTS=-XX:+UseG1GC
 ARG USER_ID
-ENV USER_ID ${USER_ID:-1001}
+ENV USER_ID=${USER_ID:-1001}
 ARG GROUP_ID
-ENV GROUP_ID ${GROUP_ID:-1001}
+ENV GROUP_ID=${GROUP_ID:-1001}
 
 # Install sbt
 RUN \
@@ -77,4 +77,4 @@ RUN \
 ## -w /home/sbtuser
 WORKDIR /root
 
-CMD sbt
+CMD ["sbt"]