diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 64161c40a..d1662729d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -189,12 +189,16 @@ jobs:
     - name: "Hadolint nipapd"
       uses: hadolint/hadolint-action@v3.1.0
       with:
-        Dockerfile: Dockerfile.nipapd
+        dockerfile: Dockerfile.nipapd
+        failure-threshold: warning
+        override-info: DL3013
 
     - name: "Hadolint WWW"
       uses: hadolint/hadolint-action@v3.1.0
       with:
-        Dockerfile: Dockerfile.www
+        dockerfile: Dockerfile.www
+        failure-threshold: warning
+        override-info: DL3013
 
     - name: "nipapd metadata"
       id: nipapd_meta
diff --git a/Dockerfile.nipapd b/Dockerfile.nipapd
index a47f3318e..30f985824 100644
--- a/Dockerfile.nipapd
+++ b/Dockerfile.nipapd
@@ -33,7 +33,8 @@
 #
 
 FROM ubuntu:noble
-MAINTAINER Kristian Larsson <kristian@spritelink.net>
+
+LABEL org.opencontainers.image.authors="Kristian Larsson <kristian@spritelink.net>, Lukas Garberg <lukas@spritelink.net>"
 
 ENV DEBIAN_FRONTEND=noninteractive
 
diff --git a/Dockerfile.www b/Dockerfile.www
index aca28e7d6..a9e2674fb 100644
--- a/Dockerfile.www
+++ b/Dockerfile.www
@@ -25,7 +25,7 @@
 
 FROM ubuntu:noble
 
-MAINTAINER Lukas Garberg <lukas@spritelink.net>
+LABEL org.opencontainers.image.authors="Kristian Larsson <kristian@spritelink.net>, Lukas Garberg <lukas@spritelink.net>"
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -63,11 +63,10 @@ ENV REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
 COPY pynipap /pynipap
 COPY nipap /nipap
 COPY nipap-www /nipap-www
-RUN cd /pynipap && pip3 --no-input install --break-system-packages --no-cache-dir . && \
-    cd /nipap && pip3 --no-input install --break-system-packages --no-cache-dir . && \
-    cd /nipap-www && pip3 --no-input install --break-system-packages --no-cache-dir . && \
-    mkdir -p /etc/nipap/www/ && cp nipap-www.wsgi /etc/nipap/www/ && \
-    cd ..
+RUN pip3 --no-input install --break-system-packages --no-cache-dir ./pynipap/ && \
+    pip3 --no-input install --break-system-packages --no-cache-dir ./nipap/ && \
+    pip3 --no-input install --break-system-packages --no-cache-dir ./nipap-www/ && \
+    mkdir -p /etc/nipap/www/ && cp ./nipap-www/nipap-www.wsgi /etc/nipap/www/
 
 EXPOSE 80
 VOLUME [ "/var/log/apache2" ]