diff --git a/cement/cli/templates/generate/project/Dockerfile b/cement/cli/templates/generate/project/Dockerfile
index a9782596..4a9238ae 100644
--- a/cement/cli/templates/generate/project/Dockerfile
+++ b/cement/cli/templates/generate/project/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.6-alpine
+FROM python:3.9-alpine
 LABEL MAINTAINER="{{ creator }} <{{ creator_email }}>"
 ENV PS1="\[\e[0;33m\]|> {{ label }} <| \[\e[1;35m\]\W\[\e[0m\] \[\e[0m\]# "
 
diff --git a/cement/cli/templates/generate/todo-tutorial/Dockerfile b/cement/cli/templates/generate/todo-tutorial/Dockerfile
index a59046ed..3c31b93c 100644
--- a/cement/cli/templates/generate/todo-tutorial/Dockerfile
+++ b/cement/cli/templates/generate/todo-tutorial/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.6-alpine
+FROM python:3.9-alpine
 LABEL MAINTAINER="Your Name <you@yourdomain.com>"
 ENV PS1="\[\e[0;33m\]|> todo <| \[\e[1;35m\]\W\[\e[0m\] \[\e[0m\]# "
 
diff --git a/docker/Dockerfile.dev-py39 b/docker/Dockerfile.dev-py39
new file mode 100644
index 00000000..194b3925
--- /dev/null
+++ b/docker/Dockerfile.dev-py39
@@ -0,0 +1,25 @@
+FROM python:3.9-alpine
+LABEL MAINTAINER="BJ Dierkes <derks@datafolklabs.com>"
+ENV PS1="\[\e[0;33m\]|> cement-py39 <| \[\e[1;35m\]\W\[\e[0m\] \[\e[0m\]# "
+
+WORKDIR /src
+COPY requirements-dev.txt /src/
+RUN apk update \
+    && apk add libmemcached-dev \
+        gcc \
+        musl-dev \
+        cyrus-sasl-dev \
+        zlib-dev \
+        make \
+        vim \
+        bash \
+        git \
+        libffi \
+        libffi-dev \
+        openssl-dev \
+    && ln -sf /usr/bin/vim /usr/bin/vi \
+    && pip install --no-cache-dir -r requirements-dev.txt
+COPY . /src
+COPY docker/vimrc /root/.vimrc
+RUN python setup.py develop
+CMD ["/bin/bash"]