diff --git a/Dockerfile b/Dockerfile
index 005da1f4..8f829651 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM python:3.8-alpine
-MAINTAINER BJ Dierkes <derks@datafolklabs.com>
+LABEL MAINTAINER="BJ Dierkes <derks@datafolklabs.com>"
 ENV PS1="\[\e[0;33m\]|> cement <| \[\e[1;35m\]\W\[\e[0m\] \[\e[0m\]# "
 WORKDIR /src
 COPY . /src
diff --git a/cement/cli/templates/generate/project/Dockerfile b/cement/cli/templates/generate/project/Dockerfile
index b0c65174..a9782596 100644
--- a/cement/cli/templates/generate/project/Dockerfile
+++ b/cement/cli/templates/generate/project/Dockerfile
@@ -1,5 +1,5 @@
 FROM python:3.6-alpine
-MAINTAINER {{ creator }} <{{ creator_email }}>
+LABEL MAINTAINER="{{ creator }} <{{ creator_email }}>"
 ENV PS1="\[\e[0;33m\]|> {{ label }} <| \[\e[1;35m\]\W\[\e[0m\] \[\e[0m\]# "
 
 WORKDIR /src
diff --git a/cement/cli/templates/generate/todo-tutorial/Dockerfile b/cement/cli/templates/generate/todo-tutorial/Dockerfile
index 6089e3d1..a59046ed 100644
--- a/cement/cli/templates/generate/todo-tutorial/Dockerfile
+++ b/cement/cli/templates/generate/todo-tutorial/Dockerfile
@@ -1,5 +1,5 @@
 FROM python:3.6-alpine
-MAINTAINER Your Name <you@yourdomain.com>
+LABEL MAINTAINER="Your Name <you@yourdomain.com>"
 ENV PS1="\[\e[0;33m\]|> todo <| \[\e[1;35m\]\W\[\e[0m\] \[\e[0m\]# "
 
 WORKDIR /src
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index ee7a7360..89266436 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -1,5 +1,5 @@
 FROM python:3.8-alpine
-MAINTAINER BJ Dierkes <derks@datafolklabs.com>
+LABEL MAINTAINER="BJ Dierkes <derks@datafolklabs.com>"
 ENV PS1="\[\e[0;33m\]|> cement <| \[\e[1;35m\]\W\[\e[0m\] \[\e[0m\]# "
 
 WORKDIR /src
diff --git a/docker/Dockerfile.dev-py35 b/docker/Dockerfile.dev-py35
index b2f3b445..df99e0ab 100644
--- a/docker/Dockerfile.dev-py35
+++ b/docker/Dockerfile.dev-py35
@@ -1,5 +1,5 @@
 FROM python:3.5-alpine
-MAINTAINER BJ Dierkes <derks@datafolklabs.com>
+LABEL MAINTAINER="BJ Dierkes <derks@datafolklabs.com>"
 ENV PS1="\[\e[0;33m\]|> cement-py35 <| \[\e[1;35m\]\W\[\e[0m\] \[\e[0m\]# "
 
 WORKDIR /src
diff --git a/docker/Dockerfile.dev-py36 b/docker/Dockerfile.dev-py36
index 99547ac3..95017adb 100644
--- a/docker/Dockerfile.dev-py36
+++ b/docker/Dockerfile.dev-py36
@@ -1,5 +1,5 @@
 FROM python:3.6-alpine
-MAINTAINER BJ Dierkes <derks@datafolklabs.com>
+LABEL MAINTAINER="BJ Dierkes <derks@datafolklabs.com>"
 ENV PS1="\[\e[0;33m\]|> cement-py36 <| \[\e[1;35m\]\W\[\e[0m\] \[\e[0m\]# "
 
 WORKDIR /src
diff --git a/docker/Dockerfile.dev-py37 b/docker/Dockerfile.dev-py37
index 6cb93f1e..04058847 100644
--- a/docker/Dockerfile.dev-py37
+++ b/docker/Dockerfile.dev-py37
@@ -1,5 +1,5 @@
 FROM python:3.7-alpine
-MAINTAINER BJ Dierkes <derks@datafolklabs.com>
+LABEL MAINTAINER="BJ Dierkes <derks@datafolklabs.com>"
 ENV PS1="\[\e[0;33m\]|> cement-py37 <| \[\e[1;35m\]\W\[\e[0m\] \[\e[0m\]# "
 
 WORKDIR /src
diff --git a/docker/Dockerfile.dev-py38 b/docker/Dockerfile.dev-py38
index eafb302b..bbaa732e 100644
--- a/docker/Dockerfile.dev-py38
+++ b/docker/Dockerfile.dev-py38
@@ -1,5 +1,5 @@
 FROM python:3.8-alpine
-MAINTAINER BJ Dierkes <derks@datafolklabs.com>
+LABEL MAINTAINER="BJ Dierkes <derks@datafolklabs.com>"
 ENV PS1="\[\e[0;33m\]|> cement-py38 <| \[\e[1;35m\]\W\[\e[0m\] \[\e[0m\]# "
 
 WORKDIR /src