diff --git a/build/latest/Dockerfile b/build/latest/Dockerfile
index 02a6aaf..e469f04 100644
--- a/build/latest/Dockerfile
+++ b/build/latest/Dockerfile
@@ -1,26 +1,26 @@
 FROM mcr.microsoft.com/dotnet/runtime:8.0
 
-LABEL org.opencontainers.image.title="OpenSimulator (unofficial)"
-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"
+LABEL \
+	org.opencontainers.image.title="OpenSimulator (unofficial)" \
+	org.opencontainers.image.authors="code@soupbowl.io" \
+	org.opencontainers.image.source="https://github.com/soup-bowl/opensimulator-docker" \
+	org.opencontainers.image.licenses="MIT"
 
 ARG OPENSIM_VERSION=0.9.3.0
 ARG OPENSIM_SHA1="a4bcd861626195af80cc1f962d3a2f4528859ad2"
 
 RUN apt-get update \
-    && apt-get install -y apt-utils curl libc6-dev libgdiplus libsqlite3-dev screen uuid-runtime \
-    && apt-get clean
-
-RUN mkdir /opt/opensim-tmp \
-    && curl -o /opt/opensim-tmp/opensim.tar.gz "http://opensimulator.org/dist/opensim-${OPENSIM_VERSION}.tar.gz" \
-    && echo "${OPENSIM_SHA1}  /opt/opensim-tmp/opensim.tar.gz" | sha1sum -c - \
-    && tar xzf /opt/opensim-tmp/opensim.tar.gz -C /opt/opensim-tmp \
-    && rm /opt/opensim-tmp/opensim*/bin/OpenSim.ini \
-    && rm /opt/opensim-tmp/opensim*/bin/config-include/StandaloneCommon.ini \
-    && rm /opt/opensim-tmp/opensim*/bin/config-include/storage/SQLiteStandalone.ini \
-    && mkdir /opt/opensim \
-    && mv /opt/opensim-tmp/opensim*/* /opt/opensim
+	&& apt-get install -y apt-utils curl libc6-dev libgdiplus libsqlite3-dev screen uuid-runtime \
+	&& apt-get clean \
+	&& mkdir /opt/opensim-tmp \
+	&& curl -o /opt/opensim-tmp/opensim.tar.gz "http://opensimulator.org/dist/opensim-${OPENSIM_VERSION}.tar.gz" \
+	&& echo "${OPENSIM_SHA1}  /opt/opensim-tmp/opensim.tar.gz" | sha1sum -c - \
+	&& tar xzf /opt/opensim-tmp/opensim.tar.gz -C /opt/opensim-tmp \
+	&& rm /opt/opensim-tmp/opensim*/bin/OpenSim.ini \
+	&& rm /opt/opensim-tmp/opensim*/bin/config-include/StandaloneCommon.ini \
+	&& rm /opt/opensim-tmp/opensim*/bin/config-include/storage/SQLiteStandalone.ini \
+	&& mkdir /opt/opensim \
+	&& mv /opt/opensim-tmp/opensim*/* /opt/opensim
 
 COPY defaults  /opt/opensim/bin/defaults
 
diff --git a/build/latest/Dockerfile.mono b/build/latest/Dockerfile.mono
index 471b29a..4af4712 100644
--- a/build/latest/Dockerfile.mono
+++ b/build/latest/Dockerfile.mono
@@ -1,26 +1,26 @@
 FROM docker.io/library/mono:6
 
-LABEL org.opencontainers.image.title="OpenSimulator (unofficial)"
-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"
+LABEL \
+	org.opencontainers.image.title="OpenSimulator (unofficial)" \
+	org.opencontainers.image.authors="code@soupbowl.io" \
+	org.opencontainers.image.source="https://github.com/soup-bowl/opensimulator-docker" \
+	org.opencontainers.image.licenses="MIT"
 
 ARG OPENSIM_VERSION=0.9.2.2
 ARG OPENSIM_SHA1="b280d109cf04755a02db1c729af5a5e4160d1ce6"
 
 RUN apt-get update \
-    && apt-get install -y curl screen uuid-runtime \
-    && apt-get clean
-
-RUN mkdir /opt/opensim-tmp \
-    && curl -o /opt/opensim-tmp/opensim.tar.gz "http://opensimulator.org/dist/opensim-${OPENSIM_VERSION}.tar.gz" \
-    && echo "${OPENSIM_SHA1}  /opt/opensim-tmp/opensim.tar.gz" | sha1sum -c - \
-    && tar xzf /opt/opensim-tmp/opensim.tar.gz -C /opt/opensim-tmp \
-    && rm /opt/opensim-tmp/opensim*/bin/OpenSim.ini \
-    && rm /opt/opensim-tmp/opensim*/bin/config-include/StandaloneCommon.ini \
-    && rm /opt/opensim-tmp/opensim*/bin/config-include/storage/SQLiteStandalone.ini \
-    && mkdir /opt/opensim \
-    && mv /opt/opensim-tmp/opensim*/* /opt/opensim
+	&& apt-get install -y curl screen uuid-runtime \
+	&& apt-get clean \
+	&& mkdir /opt/opensim-tmp \
+	&& curl -o /opt/opensim-tmp/opensim.tar.gz "http://opensimulator.org/dist/opensim-${OPENSIM_VERSION}.tar.gz" \
+	&& echo "${OPENSIM_SHA1}  /opt/opensim-tmp/opensim.tar.gz" | sha1sum -c - \
+	&& tar xzf /opt/opensim-tmp/opensim.tar.gz -C /opt/opensim-tmp \
+	&& rm /opt/opensim-tmp/opensim*/bin/OpenSim.ini \
+	&& rm /opt/opensim-tmp/opensim*/bin/config-include/StandaloneCommon.ini \
+	&& rm /opt/opensim-tmp/opensim*/bin/config-include/storage/SQLiteStandalone.ini \
+	&& mkdir /opt/opensim \
+	&& mv /opt/opensim-tmp/opensim*/* /opt/opensim
 
 COPY defaults  /opt/opensim/bin/defaults
 
diff --git a/build/latest/Dockerfile.noscreen b/build/latest/Dockerfile.noscreen
index 1f8a6c9..375e6d9 100644
--- a/build/latest/Dockerfile.noscreen
+++ b/build/latest/Dockerfile.noscreen
@@ -1,26 +1,26 @@
 FROM mcr.microsoft.com/dotnet/runtime:8.0
 
-LABEL org.opencontainers.image.title="OpenSimulator (unofficial)"
-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"
+LABEL \
+	org.opencontainers.image.title="OpenSimulator (unofficial)" \
+	org.opencontainers.image.authors="code@soupbowl.io" \
+	org.opencontainers.image.source="https://github.com/soup-bowl/opensimulator-docker" \
+	org.opencontainers.image.licenses="MIT"
 
 ARG OPENSIM_VERSION=0.9.3.0
 ARG OPENSIM_SHA1="a4bcd861626195af80cc1f962d3a2f4528859ad2"
 
 RUN apt-get update \
-    && apt-get install -y apt-utils curl libc6-dev libgdiplus libsqlite3-dev screen uuid-runtime \
-    && apt-get clean
-
-RUN mkdir /opt/opensim-tmp \
-    && curl -o /opt/opensim-tmp/opensim.tar.gz "http://opensimulator.org/dist/opensim-${OPENSIM_VERSION}.tar.gz" \
-    && echo "${OPENSIM_SHA1}  /opt/opensim-tmp/opensim.tar.gz" | sha1sum -c - \
-    && tar xzf /opt/opensim-tmp/opensim.tar.gz -C /opt/opensim-tmp \
-    && rm /opt/opensim-tmp/opensim*/bin/OpenSim.ini \
-    && rm /opt/opensim-tmp/opensim*/bin/config-include/StandaloneCommon.ini \
-    && rm /opt/opensim-tmp/opensim*/bin/config-include/storage/SQLiteStandalone.ini \
-    && mkdir /opt/opensim \
-    && mv /opt/opensim-tmp/opensim*/* /opt/opensim
+	&& apt-get install -y apt-utils curl libc6-dev libgdiplus libsqlite3-dev screen uuid-runtime \
+	&& apt-get clean \
+	&& mkdir /opt/opensim-tmp \
+	&& curl -o /opt/opensim-tmp/opensim.tar.gz "http://opensimulator.org/dist/opensim-${OPENSIM_VERSION}.tar.gz" \
+	&& echo "${OPENSIM_SHA1}  /opt/opensim-tmp/opensim.tar.gz" | sha1sum -c - \
+	&& tar xzf /opt/opensim-tmp/opensim.tar.gz -C /opt/opensim-tmp \
+	&& rm /opt/opensim-tmp/opensim*/bin/OpenSim.ini \
+	&& rm /opt/opensim-tmp/opensim*/bin/config-include/StandaloneCommon.ini \
+	&& rm /opt/opensim-tmp/opensim*/bin/config-include/storage/SQLiteStandalone.ini \
+	&& mkdir /opt/opensim \
+	&& mv /opt/opensim-tmp/opensim*/* /opt/opensim
 
 COPY defaults  /opt/opensim/bin/defaults
 
diff --git a/build/latest/Dockerfile.source b/build/latest/Dockerfile.source
index 59b6cad..8e238b3 100644
--- a/build/latest/Dockerfile.source
+++ b/build/latest/Dockerfile.source
@@ -4,28 +4,29 @@ FROM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION} AS build
 
 ARG OPENSIM_VERSION=0.9.3.0
 # Cache Bust to avoid caching skipping the latest commit
-ADD https://api.github.com/repos/opensim/opensim/git/refs/heads/master version.json
+ADD https://api.github.com/repos/opensim/opensim/git/refs/heads/${OPENSIM_VERSION} version.json
 RUN git clone --depth 1 --branch "${OPENSIM_VERSION}" https://github.com/opensim/opensim.git /app
 WORKDIR /app
 RUN rm -rf .git && \
-    ./runprebuild.sh && \
-    ./compile.sh && \
-    rm bin/config-include/storage/SQLiteStandalone.ini
+	./runprebuild.sh && \
+	./compile.sh && \
+	rm bin/config-include/storage/SQLiteStandalone.ini
+COPY defaults  bin/defaults
 
 FROM mcr.microsoft.com/dotnet/runtime:${DOTNET_VERSION}
 
-LABEL org.opencontainers.image.title="OpenSimulator (unofficial)"
-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"
+LABEL \
+	org.opencontainers.image.title="OpenSimulator (unofficial)" \
+	org.opencontainers.image.authors="code@soupbowl.io" \
+	org.opencontainers.image.source="https://github.com/soup-bowl/opensimulator-docker" \
+	org.opencontainers.image.licenses="MIT"
 
-RUN apt-get update && apt-get install -y apt-utils libc6-dev libgdiplus libsqlite3-dev screen uuid-runtime \
-    && apt-get clean
+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
 
-COPY defaults  /opt/opensim/bin/defaults
-
 EXPOSE 9000
 
 WORKDIR /opt/opensim/bin