diff --git a/jibri/Dockerfile b/jibri/Dockerfile
index 2c021ac..3239985 100644
--- a/jibri/Dockerfile
+++ b/jibri/Dockerfile
@@ -1,13 +1,13 @@
+ARG JITSI_REPO=jitsi
+ARG BASE_TAG=latest
+FROM ${JITSI_REPO}/base-java:${BASE_TAG}
+
 LABEL org.opencontainers.image.title="Jitsi Broadcasting Infrastructure (jibri)"
 LABEL org.opencontainers.image.description="Components for recording and/or streaming a conference."
 LABEL org.opencontainers.image.url="https://github.com/jitsi/jibri"
 LABEL org.opencontainers.image.source="https://github.com/jitsi/docker-jitsi-meet"
 LABEL org.opencontainers.image.documentation="https://jitsi.github.io/handbook/"
 
-ARG JITSI_REPO=jitsi
-ARG BASE_TAG=latest
-FROM ${JITSI_REPO}/base-java:${BASE_TAG}
-
 RUN apt-dpkg-wrap apt-get update && \
     apt-dpkg-wrap apt-get install -y jibri libgl1-mesa-dri procps jitsi-upload-integrations jq && \
     apt-cleanup
diff --git a/jicofo/Dockerfile b/jicofo/Dockerfile
index 0487193..424eea9 100644
--- a/jicofo/Dockerfile
+++ b/jicofo/Dockerfile
@@ -1,13 +1,13 @@
+ARG JITSI_REPO=jitsi
+ARG BASE_TAG=latest
+FROM ${JITSI_REPO}/base-java:${BASE_TAG}
+
 LABEL org.opencontainers.image.title="Jitsi Conference Focus (jicofo)"
 LABEL org.opencontainers.image.description="Server-side focus component that manages media sessions and acts as load balancer."
 LABEL org.opencontainers.image.url="https://github.com/jitsi/jicofo"
 LABEL org.opencontainers.image.source="https://github.com/jitsi/docker-jitsi-meet"
 LABEL org.opencontainers.image.documentation="https://jitsi.github.io/handbook/"
 
-ARG JITSI_REPO=jitsi
-ARG BASE_TAG=latest
-FROM ${JITSI_REPO}/base-java:${BASE_TAG}
-
 RUN apt-dpkg-wrap apt-get update && \
     apt-dpkg-wrap apt-get install -y jicofo && \
     apt-cleanup
diff --git a/jigasi/Dockerfile b/jigasi/Dockerfile
index 86a8207..8b4c007 100644
--- a/jigasi/Dockerfile
+++ b/jigasi/Dockerfile
@@ -1,13 +1,13 @@
+ARG JITSI_REPO=jitsi
+ARG BASE_TAG=latest
+FROM ${JITSI_REPO}/base:${BASE_TAG}
+
 LABEL org.opencontainers.image.title="Jitsi Gateway to SIP (jigasi)"
 LABEL org.opencontainers.image.description="Server-side application that allows regular SIP clients to join conferences."
 LABEL org.opencontainers.image.url="https://github.com/jitsi/jigasi"
 LABEL org.opencontainers.image.source="https://github.com/jitsi/docker-jitsi-meet"
 LABEL org.opencontainers.image.documentation="https://jitsi.github.io/handbook/"
 
-ARG JITSI_REPO=jitsi
-ARG BASE_TAG=latest
-FROM ${JITSI_REPO}/base:${BASE_TAG}
-
 ENV GOOGLE_APPLICATION_CREDENTIALS /config/key.json
 
 # Jigasi doesn't yet work well with Java 11, let's ccontinue to use 8.
diff --git a/jvb/Dockerfile b/jvb/Dockerfile
index 90b01dc..0a72dc1 100644
--- a/jvb/Dockerfile
+++ b/jvb/Dockerfile
@@ -1,13 +1,13 @@
+ARG JITSI_REPO=jitsi
+ARG BASE_TAG=latest
+FROM ${JITSI_REPO}/base-java:${BASE_TAG}
+
 LABEL org.opencontainers.image.title="Jitsi Videobridge (jvb)"
 LABEL org.opencontainers.image.description="WebRTC compatible server designed to route video streams amongst participants in a conference."
 LABEL org.opencontainers.image.url="https://jitsi.org/jitsi-videobridge/"
 LABEL org.opencontainers.image.source="https://github.com/jitsi/docker-jitsi-meet"
 LABEL org.opencontainers.image.documentation="https://jitsi.github.io/handbook/"
 
-ARG JITSI_REPO=jitsi
-ARG BASE_TAG=latest
-FROM ${JITSI_REPO}/base-java:${BASE_TAG}
-
 RUN apt-dpkg-wrap apt-get update && \
     apt-dpkg-wrap apt-get install -y jitsi-videobridge2 jq curl iproute2 dnsutils && \
     apt-cleanup
diff --git a/prosody/Dockerfile b/prosody/Dockerfile
index 8810010..30b3b7b 100644
--- a/prosody/Dockerfile
+++ b/prosody/Dockerfile
@@ -1,9 +1,3 @@
-LABEL org.opencontainers.image.title="Prosody IM"
-LABEL org.opencontainers.image.description="XMPP server used for signalling."
-LABEL org.opencontainers.image.url="https://prosody.im/"
-LABEL org.opencontainers.image.source="https://github.com/jitsi/docker-jitsi-meet"
-LABEL org.opencontainers.image.documentation="https://jitsi.github.io/handbook/"
-
 ARG JITSI_REPO=jitsi
 ARG BASE_TAG=latest
 
@@ -24,6 +18,12 @@ RUN apt-dpkg-wrap apt-get update && \
 
 FROM ${JITSI_REPO}/base:${BASE_TAG}
 
+LABEL org.opencontainers.image.title="Prosody IM"
+LABEL org.opencontainers.image.description="XMPP server used for signalling."
+LABEL org.opencontainers.image.url="https://prosody.im/"
+LABEL org.opencontainers.image.source="https://github.com/jitsi/docker-jitsi-meet"
+LABEL org.opencontainers.image.documentation="https://jitsi.github.io/handbook/"
+
 ENV XMPP_CROSS_DOMAIN="false"
 
 RUN wget -qO /etc/apt/trusted.gpg.d/prosody.gpg https://prosody.im/files/prosody-debian-packages.key && \
diff --git a/web/Dockerfile b/web/Dockerfile
index c047732..83ea2c6 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -1,13 +1,13 @@
+ARG JITSI_REPO=jitsi
+ARG BASE_TAG=latest
+FROM ${JITSI_REPO}/base:${BASE_TAG}
+
 LABEL org.opencontainers.image.title="Jitsi Meet"
 LABEL org.opencontainers.image.description="WebRTC compatible JavaScript application that uses Jitsi Videobridge to provide high quality, scalable video conferences."
 LABEL org.opencontainers.image.url="https://jitsi.org/jitsi-meet/"
 LABEL org.opencontainers.image.source="https://github.com/jitsi/docker-jitsi-meet"
 LABEL org.opencontainers.image.documentation="https://jitsi.github.io/handbook/"
 
-ARG JITSI_REPO=jitsi
-ARG BASE_TAG=latest
-FROM ${JITSI_REPO}/base:${BASE_TAG}
-
 ADD https://raw.githubusercontent.com/acmesh-official/acme.sh/2.8.8/acme.sh /opt
 COPY rootfs/ /