diff --git a/Dockerfile b/Dockerfile
index 439a6fa9..b7f9677a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM golang:1.12-alpine as base
-MAINTAINER "Hunter Long (https://github.com/hunterlong)"
+LABEL maintainer="Hunter Long (https://github.com/hunterlong)"
 ARG VERSION
 ENV DEP_VERSION v0.5.0
 RUN apk add --no-cache libstdc++ gcc g++ make git ca-certificates linux-headers wget curl jq libsass
@@ -16,7 +16,7 @@ RUN make install
 
 # Statping :latest Docker Image
 FROM alpine:latest
-MAINTAINER "Hunter Long (https://github.com/hunterlong)"
+LABEL maintainer="Hunter Long (https://github.com/hunterlong)"
 
 ARG VERSION
 ENV IS_DOCKER=true
diff --git a/dev/Dockerfile-cypress b/dev/Dockerfile-cypress
index d47bbb54..d8bae322 100644
--- a/dev/Dockerfile-cypress
+++ b/dev/Dockerfile-cypress
@@ -1,5 +1,5 @@
 FROM cypress/browsers:chrome67
-MAINTAINER "Hunter Long (https://github.com/hunterlong)"
+LABEL maintainer="Hunter Long (https://github.com/hunterlong)"
 # Statping 'test' image for running a full test using the production environment
 
 WORKDIR $HOME/statping
@@ -12,4 +12,4 @@ RUN npm install
 ADD ./statping-linux-amd64 /usr/local/bin/statping
 RUN statping version
 
-RUN npm run test-docker
\ No newline at end of file
+RUN npm run test-docker
diff --git a/dev/Dockerfile-demo b/dev/Dockerfile-demo
index d3122cee..43d6d0c1 100644
--- a/dev/Dockerfile-demo
+++ b/dev/Dockerfile-demo
@@ -1,5 +1,5 @@
 FROM alpine
-MAINTAINER "Hunter Long (https://github.com/hunterlong)"
+LABEL maintainer="Hunter Long (https://github.com/hunterlong)"
 
 ENV STATPING_VERSION=0.80.35