diff --git a/Dockerfile b/Dockerfile
index 9ec9c20d79..9b5c182d16 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,11 +39,10 @@ ARG USERNAME="alloy"
 LABEL org.opencontainers.image.source="https://github.com/grafana/alloy"
 
 # Install dependencies needed at runtime.
-RUN <<EOF
-  apt-get update
-  apt-get install -qy libsystemd-dev tzdata ca-certificates
-  rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-EOF
+RUN  apt-get update \
+ &&  apt-get install -qy libsystemd-dev tzdata ca-certificates \
+ &&  rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
 
 COPY --from=build /src/alloy/build/alloy /bin/alloy
 COPY example-config.alloy /etc/alloy/config.alloy
diff --git a/tools/build-image/Dockerfile b/tools/build-image/Dockerfile
index 4b4f891974..3c4d869378 100644
--- a/tools/build-image/Dockerfile
+++ b/tools/build-image/Dockerfile
@@ -65,14 +65,12 @@ FROM rfratto/viceroy:v0.4.0
 # will fail on installing NodeJS for all platforms instead of just our host
 # platform.
 # Source: https://github.com/nodesource/distributions#installation-instructions
-RUN <<EOF
-  apt-get update && apt-get install -qy ca-certificates curl gnupg && mkdir -p /etc/apt/keyrings
-  curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
-  echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
-
-  apt-get update && apt-get install -qy nodejs
-  rm -rf /var/lib/apt/lists/*
-EOF
+
+RUN  apt-get update && apt-get install -qy ca-certificates curl gnupg && mkdir -p /etc/apt/keyrings  \
+ &&  curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
+ &&  echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
+ &&  apt-get update && apt-get install -qy nodejs \
+ &&  rm -rf /var/lib/apt/lists/*
 
 # Install Yarn.
 #