diff --git a/beta/alpine/Dockerfile b/beta/alpine/Dockerfile
index 359460a..5f41807 100644
--- a/beta/alpine/Dockerfile
+++ b/beta/alpine/Dockerfile
@@ -7,8 +7,8 @@ LABEL org.opencontainers.image.licenses="MIT"
 
 ENV OPENSIM_VERSION 0.9.2.2
 
-RUN apk add --no-cache bash curl uuidgen screen
-RUN apk add --no-cache mono --repository=https://dl-cdn.alpinelinux.org/alpine/edge/testing
+RUN apk add --no-cache bash curl screen uuidgen && \
+    apk add --no-cache mono --repository=https://dl-cdn.alpinelinux.org/alpine/edge/testing
 
 RUN mkdir /opt/opensim-tmp \
     && curl "http://opensimulator.org/dist/opensim-${OPENSIM_VERSION}.tar.gz"  | tar xzf - -C /opt/opensim-tmp \
diff --git a/beta/source/Dockerfile b/beta/source/Dockerfile
index 03df3fe..3ffb419 100644
--- a/beta/source/Dockerfile
+++ b/beta/source/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0 as build
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 
 # Cache Bust to avoid caching skipping the latest commit
 ADD https://api.github.com/repos/opensim/opensim/git/refs/heads/master version.json
@@ -17,7 +17,8 @@ LABEL org.opencontainers.image.authors="code@soupbowl.io"
 LABEL org.opencontainers.image.source="https://github.com/soup-bowl/opensimulator-docker"
 LABEL org.opencontainers.image.licenses="MIT"
 
-RUN apt-get update && apt-get install -y apt-utils libgdiplus libc6-dev libsqlite3-dev screen uuid-runtime
+RUN apt-get update && apt-get install -y apt-utils libc6-dev libgdiplus libsqlite3-dev screen uuid-runtime \
+    && apt-get clean
 
 COPY --from=build /app /opt/opensim
 
diff --git a/beta/source/Dockerfile.dotnet6 b/beta/source/Dockerfile.dotnet6
index e228ec6..a1d29eb 100644
--- a/beta/source/Dockerfile.dotnet6
+++ b/beta/source/Dockerfile.dotnet6
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0 as build
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
 
 # Cache Bust to avoid caching skipping the latest commit
 ADD https://api.github.com/repos/opensim/opensim/git/refs/heads/dotnet6 version.json
@@ -17,7 +17,8 @@ LABEL org.opencontainers.image.authors="code@soupbowl.io"
 LABEL org.opencontainers.image.source="https://github.com/soup-bowl/opensimulator-docker"
 LABEL org.opencontainers.image.licenses="MIT"
 
-RUN apt-get update && apt-get install -y apt-utils libgdiplus libc6-dev libsqlite3-dev screen uuid-runtime
+RUN apt-get update && apt-get install -y apt-utils libc6-dev libgdiplus libsqlite3-dev screen uuid-runtime \
+    && apt-get clean
 
 COPY --from=build /app /opt/opensim
 
diff --git a/build/latest/Dockerfile b/build/latest/Dockerfile
index 784551b..56d4838 100644
--- a/build/latest/Dockerfile
+++ b/build/latest/Dockerfile
@@ -9,7 +9,7 @@ ARG OPENSIM_VERSION=0.9.3.0
 
 RUN apt-get update \
     && apt-get install -y apt-utils curl libc6-dev libgdiplus libsqlite3-dev screen uuid-runtime \
-    && rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
+    && apt-get clean
 
 RUN mkdir /opt/opensim-tmp \
     && curl "http://opensimulator.org/dist/opensim-${OPENSIM_VERSION}.tar.gz" | tar xzf - -C /opt/opensim-tmp \
diff --git a/build/latest/Dockerfile.mono b/build/latest/Dockerfile.mono
index fa83489..8273111 100644
--- a/build/latest/Dockerfile.mono
+++ b/build/latest/Dockerfile.mono
@@ -9,7 +9,7 @@ ARG OPENSIM_VERSION=0.9.2.2
 
 RUN apt-get update \
     && apt-get install -y curl screen uuid-runtime \
-    && rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
+    && apt-get clean
 
 RUN mkdir /opt/opensim-tmp \
     && curl "http://opensimulator.org/dist/opensim-${OPENSIM_VERSION}.tar.gz" | tar xzf - -C /opt/opensim-tmp \