diff --git a/.github/actions/run-tests/mysql/Dockerfile b/.github/actions/run-tests/mysql/Dockerfile
index 5ecfbe4b8..0f9d1b5ff 100644
--- a/.github/actions/run-tests/mysql/Dockerfile
+++ b/.github/actions/run-tests/mysql/Dockerfile
@@ -1,4 +1,7 @@
+
 FROM mariadb:10.1
 
+LABEL maintainer="Christian Wolf <github@christianwolf.email>"
+
 HEALTHCHECK --interval=5s --timeout=5s --retries=24 \
 	CMD mysqladmin ping --silent
diff --git a/.github/actions/run-tests/tests/Dockerfile b/.github/actions/run-tests/tests/Dockerfile
index 9c485c425..5c27641e1 100644
--- a/.github/actions/run-tests/tests/Dockerfile
+++ b/.github/actions/run-tests/tests/Dockerfile
@@ -2,6 +2,8 @@
 ARG PHPVERSION
 FROM php:${PHPVERSION}-fpm
 
+LABEL maintainer="Christian Wolf <github@christianwolf.email>"
+
 ARG PHPVERSION
 
 COPY install.sh /install.sh
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d50bd0391..8f1bc4b68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -55,6 +55,8 @@
   [#452](https://github.com/nextcloud/cookbook/pull/452) @christianlupus
 - Code cleanup
   [#579](https://github.com/nextcloud/cookbook/pull/579) @christianlupus
+- Added label to Dockerfile to be consistent with docker guidelines
+  [#582](https://github.com/nextcloud/cookbook/pull/582) @christianlupus
 
 ### Removed
 - Removal of old contoller no longer in use