diff --git a/base/Dockerfile b/base/Dockerfile
index 39488957..261577c3 100755
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -2,7 +2,7 @@ ARG ROOT_CONTAINER=quay.io/jupyter/base-notebook:82d322f00937
 ARG BASE_CONTAINER=$ROOT_CONTAINER
 FROM $BASE_CONTAINER
 
-MAINTAINER Jan Janssen <janssen@mpie.de>, Niklas Siemer <n.siemer@mpi-susmat.de>
+LABEL org.opencontainers.image.authors="Jan Janssen <janssen@mpie.de>, Niklas Siemer <n.siemer@mpi-susmat.de>"
 
 USER root
 
diff --git a/md/Dockerfile b/md/Dockerfile
index 6c3fa8c1..dbd8ce77 100755
--- a/md/Dockerfile
+++ b/md/Dockerfile
@@ -2,7 +2,7 @@ ARG ROOT_CONTAINER=pyiron/base:latest
 ARG BASE_CONTAINER=$ROOT_CONTAINER
 FROM $BASE_CONTAINER
 
-MAINTAINER Jan Janssen <janssen@mpie.de>, Muhammad Hassani <hassani@mpie.de>
+LABEL org.opencontainers.image.authors="Jan Janssen <janssen@mpie.de>, Niklas Siemer <n.siemer@mpi-susmat.de>"
 
 USER $DOCKER_UID
 WORKDIR $HOME
diff --git a/md/environment.yml b/md/environment.yml
index dca11b9d..d9e386d6 100644
--- a/md/environment.yml
+++ b/md/environment.yml
@@ -4,6 +4,7 @@ channels:
 dependencies:
 - pyiron =0.5.2
 - pyiron_atomistics =0.7.20
+- matscipy <1.2.0  # could be an indirect dependency of pyiron_atomistics, restrict to allow for a pip check passing environment build
 - pyiron-data =0.0.30
 - nglview =3.1.4
 - lammps =2024.06.27=*openmpi*
diff --git a/mpie_cmti/Dockerfile b/mpie_cmti/Dockerfile
index b5cf971b..74a96356 100755
--- a/mpie_cmti/Dockerfile
+++ b/mpie_cmti/Dockerfile
@@ -1,7 +1,7 @@
 ARG ROOT_IMAGE=quay.io/jupyter/base-notebook:82d322f00937 AS root_image
 FROM $ROOT_IMAGE
 
-MAINTAINER Jan Janssen <janssen@mpie.de>, Marian Bruns <m.bruns@mpie.de>
+LABEL org.opencontainers.image.authors="Jan Janssen <janssen@mpie.de>, Niklas Siemer <n.siemer@mpi-susmat.de>"
 
 ARG DOCKER_UID="1000"
 ARG DOCKER_GID="100"
diff --git a/potentialworkshop/Dockerfile b/potentialworkshop/Dockerfile
index 1d8a6e60..af3bbe85 100755
--- a/potentialworkshop/Dockerfile
+++ b/potentialworkshop/Dockerfile
@@ -2,7 +2,7 @@ ARG ROOT_CONTAINER=pyiron/pyiron:latest
 ARG BASE_CONTAINER=$ROOT_CONTAINER
 FROM $BASE_CONTAINER
 
-MAINTAINER Jan Janssen <janssen@mpie.de>, Muhammad Hassani <hassani@mpie.de>
+LABEL org.opencontainers.image.authors="Jan Janssen <janssen@mpie.de>, Niklas Siemer <n.siemer@mpi-susmat.de>"
 
 USER $DOCKER_UID
 WORKDIR $HOME
diff --git a/pyiron/Dockerfile b/pyiron/Dockerfile
index 957840f3..53d5a19b 100755
--- a/pyiron/Dockerfile
+++ b/pyiron/Dockerfile
@@ -2,7 +2,7 @@ ARG ROOT_CONTAINER=pyiron/md:latest
 ARG BASE_CONTAINER=$ROOT_CONTAINER
 FROM $BASE_CONTAINER
 
-MAINTAINER Jan Janssen <janssen@mpie.de>, Muhammad Hassani <hassani@mpie.de>
+LABEL org.opencontainers.image.authors="Jan Janssen <janssen@mpie.de>, Niklas Siemer <n.siemer@mpi-susmat.de>"
 
 USER $DOCKER_UID
 WORKDIR $HOME