diff --git a/images/golang/Dockerfile.ubuntu b/images/golang/ubuntu.Dockerfile
similarity index 65%
rename from images/golang/Dockerfile.ubuntu
rename to images/golang/ubuntu.Dockerfile
index a1ca6337..e80d0a28 100644
--- a/images/golang/Dockerfile.ubuntu
+++ b/images/golang/ubuntu.Dockerfile
@@ -7,12 +7,12 @@ USER root
 RUN curl -L "https://go.dev/dl/go1.20.linux-amd64.tar.gz" | tar -C /usr/local -xzvf -
 
 # Setup go env vars
-ENV GOROOT /usr/local/go
-ENV PATH $PATH:$GOROOT/bin
+ENV GOROOT=/usr/local/go
+ENV PATH=$PATH:$GOROOT/bin
 
-ENV GOPATH /home/coder/go
-ENV GOBIN $GOPATH/bin
-ENV PATH $PATH:$GOBIN
+ENV GOPATH=/home/coder/go
+ENV GOBIN=$GOPATH/bin
+ENV PATH=$PATH:$GOBIN
 
 # Set back to coder user
 USER coder
diff --git a/images/java/Dockerfile.ubuntu b/images/java/ubuntu.Dockerfile
similarity index 87%
rename from images/java/Dockerfile.ubuntu
rename to images/java/ubuntu.Dockerfile
index 4f76efb2..7b0dd9e8 100644
--- a/images/java/Dockerfile.ubuntu
+++ b/images/java/ubuntu.Dockerfile
@@ -6,26 +6,23 @@ USER root
 # Install JDK (OpenJDK 8)
 RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y && \
     apt-get install -y openjdk-11-jdk
-ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
-ENV PATH $PATH:$JAVA_HOME/bin
+ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
+ENV PATH=$PATH:$JAVA_HOME/bin
 
 # Install Maven
 ARG MAVEN_VERSION=3.9.5
 ARG MAVEN_SHA512=4810523ba025104106567d8a15a8aa19db35068c8c8be19e30b219a1d7e83bcab96124bf86dc424b1cd3c5edba25d69ec0b31751c136f88975d15406cab3842b
 
-ENV MAVEN_HOME /usr/share/maven
-ENV MAVEN_CONFIG "/home/coder/.m2"
+ENV MAVEN_HOME=/usr/share/maven
+ENV MAVEN_CONFIG="/home/coder/.m2"
 
 RUN mkdir -p $MAVEN_HOME $MAVEN_HOME/ref \
   && echo "Downloading maven" \
   && curl -fsSL -o /tmp/apache-maven.tar.gz https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz \
-  \
   && echo "Checking downloaded file hash" \
   && echo "${MAVEN_SHA512}  /tmp/apache-maven.tar.gz" | sha512sum -c - \
-  \
   && echo "Unzipping maven" \
   && tar -xzf /tmp/apache-maven.tar.gz -C $MAVEN_HOME --strip-components=1 \
-  \
   && echo "Cleaning and setting links" \
   && rm -f /tmp/apache-maven.tar.gz \
   && ln -s $MAVEN_HOME/bin/mvn /usr/bin/mvn
@@ -34,23 +31,20 @@ RUN mkdir -p $MAVEN_HOME $MAVEN_HOME/ref \
 ENV GRADLE_VERSION=6.7
 ARG GRADLE_SHA512=d495bc65379d2a854d2cca843bd2eeb94f381e5a7dcae89e6ceb6ef4c5835524932313e7f30d7a875d5330add37a5fe23447dc3b55b4d95dffffa870c0b24493
 
-ENV GRADLE_HOME /usr/bin/gradle
+ENV GRADLE_HOME=/usr/bin/gradle
 
 RUN mkdir -p /usr/share/gradle /usr/share/gradle/ref \
   && echo "Downloading gradle" \
   && curl -fsSL -o /tmp/gradle.zip https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip \
-  \
   && echo "Checking downloaded file hash" \
   && echo "${GRADLE_SHA512}  /tmp/gradle.zip" | sha512sum -c - \
-  \
   && echo "Unziping gradle" \
   && unzip -d /usr/share/gradle /tmp/gradle.zip \
-   \
   && echo "Cleaning and setting links" \
   && rm -f /tmp/gradle.zip \
   && ln -s /usr/share/gradle/gradle-${GRADLE_VERSION} /usr/bin/gradle
 
-ENV PATH $PATH:$GRADLE_HOME/bin
+ENV PATH=$PATH:$GRADLE_HOME/bin
 
 # Set back to coder user
 USER coder
diff --git a/images/node/Dockerfile.ubuntu b/images/node/ubuntu.Dockerfile
similarity index 100%
rename from images/node/Dockerfile.ubuntu
rename to images/node/ubuntu.Dockerfile
diff --git a/scripts/images.sh b/scripts/images.sh
index d131d6a3..067bc72e 100644
--- a/scripts/images.sh
+++ b/scripts/images.sh
@@ -5,4 +5,7 @@ set -euo pipefail
 IMAGES=(
   "base"
   "minimal"
+  "golang"
+  "java"
+  "node"
 )