diff --git a/README.md b/README.md
index 24dcd37..a1ba329 100644
--- a/README.md
+++ b/README.md
@@ -69,7 +69,7 @@ docker compose up
 ```
 
 Then wait until CKAN and MSL-API have started. This may take a couple of minutes. Navigate to
-[https://epos-msl.ckan](https://epos-msl.ckan) in your browser. The development VM runs with
+https://epos-msl.ckan in your browser. The development VM runs with
 self-signed certificates, so you'll need to accept the security warning in your browser.
 
 ## Local development VM
diff --git a/docker/images/ckan/Dockerfile b/docker/images/ckan/Dockerfile
index 859b8df..59c1ca2 100644
--- a/docker/images/ckan/Dockerfile
+++ b/docker/images/ckan/Dockerfile
@@ -2,7 +2,7 @@
 
 # See CKAN docs on installation from Docker Compose on usage
 FROM ubuntu:jammy
-MAINTAINER Yoda team
+LABEL org.opencontainers.image.authors="Yoda team"
 
 # Set timezone
 ENV TZ=UTC
diff --git a/docker/images/msl-api/Dockerfile b/docker/images/msl-api/Dockerfile
index 28f2c44..08a9577 100644
--- a/docker/images/msl-api/Dockerfile
+++ b/docker/images/msl-api/Dockerfile
@@ -2,7 +2,7 @@
 
 # See CKAN docs on installation from Docker Compose on usage
 FROM ubuntu:jammy
-MAINTAINER Yoda team
+LABEL org.opencontainers.image.authors="Yoda team"
 
 # Need bash to get nvm/npm to work with default init files
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
diff --git a/docker/images/mta/Dockerfile b/docker/images/mta/Dockerfile
index 004aba1..bebe809 100644
--- a/docker/images/mta/Dockerfile
+++ b/docker/images/mta/Dockerfile
@@ -2,7 +2,7 @@
 
 # See CKAN docs on installation from Docker Compose on usage
 FROM ubuntu:noble
-MAINTAINER Yoda team
+LABEL org.opencontainers.image.authors="Yoda team"
 
 ENV MAILPIT_VERSION=v1.21.8
 
diff --git a/docker/images/nginx/Dockerfile b/docker/images/nginx/Dockerfile
index 105f5c1..614d1b1 100644
--- a/docker/images/nginx/Dockerfile
+++ b/docker/images/nginx/Dockerfile
@@ -1,7 +1,7 @@
 # Image for Nginx reverse proxy configured for CKAN
 
 FROM nginx:1.27
-MAINTAINER Yoda team
+LABEL org.opencontainers.image.authors="Yoda team"
 
 RUN apt update && \
     apt install -y git vim \
diff --git a/docker/images/solr/Dockerfile b/docker/images/solr/Dockerfile
index 7b1c0b8..b559855 100644
--- a/docker/images/solr/Dockerfile
+++ b/docker/images/solr/Dockerfile
@@ -1,7 +1,7 @@
 # Image for Solr configured for CKAN
 
 FROM solr:8.11
-MAINTAINER Yoda team
+LABEL org.opencontainers.image.authors="Yoda team"
 
 ENV SOLR_CONFIG_DIR="/opt/solr/server/solr/configsets"