diff --git a/geoserver/Dockerfile b/geoserver/Dockerfile
index 8df14cf..20ab7d2 100644
--- a/geoserver/Dockerfile
+++ b/geoserver/Dockerfile
@@ -5,11 +5,18 @@ COPY maven/ /tmp/
 
 RUN mvn -U clean package --fail-at-end --settings .mvn/settings.xml
 
-FROM tomcat:9.0.95-jre17-temurin AS geoserver
+FROM tomcat:9.0.96-jre17-temurin AS geoserver
+
+LABEL org.opencontainers.image.authors="Tailormap/core-developers" \
+      org.opencontainers.image.description="A GeoServer image for the Tailormap stack" \
+      org.opencontainers.image.vendor="Tailormap" \
+      org.opencontainers.image.title="Tailormap data GeoServer" \
+      org.opencontainers.image.source="https://github.com/Tailormap/tailormap-data/tree/main/geoserver" \
+      org.opencontainers.image.licenses="GPL-2.0"
 
 ARG TZ="Europe/Amsterdam"
 ARG GEOSERVER_DATA_DIR="/opt/geoserver-data"
-
+ENV LANG=en_US.utf8
 ENV JDK_JAVA_OPTIONS="-Djava.awt.headless=true \
                             -Djava.security.egd=file:/dev/./urandom \
                             -server -Xms256m -Xmx1g \
@@ -53,11 +60,4 @@ COPY ./docker-entrypoint-initdb.d /docker-entrypoint-initdb.d
 
 USER www-data:www-data
 
-LABEL org.opencontainers.image.authors="Tailormap/core-developers" \
-      org.opencontainers.image.description="A GeoServer image for the Tailormap stack" \
-      org.opencontainers.image.vendor="Tailormap" \
-      org.opencontainers.image.title="Tailormap data GeoServer" \
-      org.opencontainers.image.source="https://github.com/Tailormap/tailormap-data/tree/main/geoserver" \
-      org.opencontainers.image.licenses="GPL-2.0"
-
 ENTRYPOINT /bin/bash /docker-entrypoint-initdb.d/entrypoint.sh
diff --git a/oracle/Dockerfile b/oracle/Dockerfile
index 3838dcd..0996089 100644
--- a/oracle/Dockerfile
+++ b/oracle/Dockerfile
@@ -1,15 +1,21 @@
 FROM ghcr.io/gvenzl/oracle-free:23.5
-# https://github.com/gvenzl/oci-oracle-free
+
+LABEL org.opencontainers.image.authors="Tailormap/core-developers" \
+      org.opencontainers.image.description="An Oracle Free image for the Tailormap stack" \
+      org.opencontainers.image.vendor="Tailormap" \
+      org.opencontainers.image.title="Tailormap data Oracle Free" \
+      org.opencontainers.image.source="https://github.com/Tailormap/tailormap-data/tree/main/oracle" \
+      org.opencontainers.image.licenses="Apache-2.0"
 
 ARG TZ="Europe/Amsterdam"
+ENV LANG=en_US.utf8
 
 USER root
-
-RUN mkdir -p /docker-entrypoint-initdb.d && mkdir -p /tmp/dumpdir && chown oracle /tmp/dumpdir
+RUN mkdir -p /docker-entrypoint-initdb.d \
+    && mkdir -p /tmp/dumpdir \
+    && chown oracle /tmp/dumpdir
 
 COPY ./docker-entrypoint-initdb.d /docker-entrypoint-initdb.d
 COPY ./dumpdir/*.dump /tmp/dumpdir
 
 USER oracle
-
-
diff --git a/postgis/Dockerfile b/postgis/Dockerfile
index 7063e7e..3a8b9e0 100644
--- a/postgis/Dockerfile
+++ b/postgis/Dockerfile
@@ -1,8 +1,14 @@
-FROM postgis/postgis:17-3.4
+FROM postgis/postgis:17-3.5
 
-ENV LANG=en_US.utf8
+LABEL org.opencontainers.image.authors="Tailormap/core-developers" \
+      org.opencontainers.image.description="A PostGIS image for the Tailormap stack" \
+      org.opencontainers.image.vendor="Tailormap" \
+      org.opencontainers.image.title="Tailormap data PostGIS" \
+      org.opencontainers.image.source="https://github.com/Tailormap/tailormap-data/tree/main/postgis" \
+      org.opencontainers.image.licenses="GPL-2.0"
 
 ARG TZ="Europe/Amsterdam"
+ENV LANG=en_US.utf8
 
 USER root
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone \
@@ -15,4 +21,4 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone \
 
 USER $POSTGRES_USER
 
-COPY ./docker-entrypoint-initdb.d /docker-entrypoint-initdb.d
\ No newline at end of file
+COPY ./docker-entrypoint-initdb.d /docker-entrypoint-initdb.d
diff --git a/sqlserver/Dockerfile b/sqlserver/Dockerfile
index 15c4815..3120654 100644
--- a/sqlserver/Dockerfile
+++ b/sqlserver/Dockerfile
@@ -1,20 +1,26 @@
 FROM mcr.microsoft.com/mssql/server:2022-latest
 
-ENV LANG=en_US.utf8
-ENV ACCEPT_EULA=Y
+LABEL org.opencontainers.image.authors="Tailormap/core-developers" \
+      org.opencontainers.image.description="A SQL Server Developer image for the Tailormap stack" \
+      org.opencontainers.image.vendor="Tailormap" \
+      org.opencontainers.image.title="Tailormap data SQL Server" \
+      org.opencontainers.image.source="https://github.com/Tailormap/tailormap-data/tree/main/sqlserver" \
+      org.opencontainers.image.licenses="Microsoft EULA"
 
 ARG TZ="Europe/Amsterdam"
+ENV LANG=en_US.utf8
+ENV ACCEPT_EULA=Y
 
 USER root
+COPY ./docker-entrypoint-initdb.d /docker-entrypoint-initdb.d
+
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone \
     && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 \
     && sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen \
     && locale-gen "en_US.UTF-8" \
     && apt update && apt upgrade -y && apt autoremove -y && apt autoclean && apt clean && rm -rf /tmp/* && rm -rf /var/tmp/* \
-    && rm -rf /var/lib/apt/lists/*
-
-COPY ./docker-entrypoint-initdb.d /docker-entrypoint-initdb.d
-RUN chmod +r /docker-entrypoint-initdb.d/geodata.backup.dump
+    && rm -rf /var/lib/apt/lists/* \
+    && chmod +r /docker-entrypoint-initdb.d/geodata.backup.dump
 
 USER mssql
-ENTRYPOINT /bin/bash ./docker-entrypoint-initdb.d/entrypoint.sh
\ No newline at end of file
+ENTRYPOINT /bin/bash ./docker-entrypoint-initdb.d/entrypoint.sh