diff --git a/Dockerfile.amd64 b/Dockerfile.amd64
index 8233e1f..e9c48d0 100644
--- a/Dockerfile.amd64
+++ b/Dockerfile.amd64
@@ -1,9 +1,13 @@
 FROM scratch
 
-MAINTAINER Max Schmitt
+LABEL maintainer="Max Schmitt <max@schmitt.mx>"
+LABEL readme.md="https://github.com/maxibanki/golang-url-shortener/blob/master/README.md"
+LABEL description="This Dockerfile will install the Golang URL Shortener."
 
 EXPOSE 8080
 
 COPY docker_releases/golang-url-shortener_linux_amd64/golang-url-shortener /
 
+VOLUME ["/data"]
+
 CMD ["/golang-url-shortener"]
diff --git a/Dockerfile.arm b/Dockerfile.arm
index a02322d..3891310 100644
--- a/Dockerfile.arm
+++ b/Dockerfile.arm
@@ -1,9 +1,13 @@
 FROM scratch
 
-MAINTAINER Max Schmitt
+LABEL maintainer="Max Schmitt <max@schmitt.mx>"
+LABEL readme.md="https://github.com/maxibanki/golang-url-shortener/blob/master/README.md"
+LABEL description="This Dockerfile will install the Golang URL Shortener."
 
 EXPOSE 8080
 
 COPY docker_releases/golang-url-shortener_linux_arm/golang-url-shortener /
 
+VOLUME ["/data"]
+
 CMD ["/golang-url-shortener"]