diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index e257576..75209a6 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -11,7 +11,9 @@ jobs:
       matrix:
         image:
           - name: latest
-            python_version: "3.7"
+            python_version: "3.8"
+          - name: python3.8
+            python_version: "3.8"
           - name: python3.7
             python_version: "3.7"
           - name: python3.6
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
deleted file mode 100644
index 0e9450c..0000000
--- a/.github/workflows/main.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-on:
-  schedule:
-  - cron: "0 0 * * *"
-
-jobs:
-  issue-manager:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: tiangolo/issue-manager@master
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        config: >
-            {
-              "answered": {
-                "users": ["tiangolo"],
-                "delay": 864000,
-                "message": "Assuming the original issue was solved, it will be automatically closed now. But feel free to add more comments or create new issues."
-              }
-            }
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8c9b1ae..36c6051 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,7 +11,9 @@ jobs:
       matrix:
         image:
           - name: latest
-            python_version: "3.7"
+            python_version: "3.8"
+          - name: python3.8
+            python_version: "3.8"
           - name: python3.7
             python_version: "3.7"
           - name: python3.6
diff --git a/README.md b/README.md
index 9d31c9d..34be4a5 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,8 @@
 
 ## Supported tags and respective `Dockerfile` links
 
-* [`python3.7`, `latest` _(Dockerfile)_](https://github.com/tiangolo/meinheld-gunicorn-flask-docker/blob/master/docker-images/python3.7.dockerfile)
+* [`python3.8`, `latest` _(Dockerfile)_](https://github.com/tiangolo/meinheld-gunicorn-flask-docker/blob/master/docker-images/python3.8.dockerfile)
+* [`python3.7`, _(Dockerfile)_](https://github.com/tiangolo/meinheld-gunicorn-flask-docker/blob/master/docker-images/python3.7.dockerfile)
 * [`python3.6` _(Dockerfile)_](https://github.com/tiangolo/meinheld-gunicorn-flask-docker/blob/master/docker-images/python3.6.dockerfile)
 * [`python2.7` _(Dockerfile)_](https://github.com/tiangolo/meinheld-gunicorn-flask-docker/blob/master/docker-images/python2.7.dockerfile)
 * [`python3.6-alpine3.8` _(Dockerfile)_](https://github.com/tiangolo/meinheld-gunicorn-flask-docker/blob/master/docker-images/python3.6-alpine3.8.dockerfile)
diff --git a/docker-images/python3.8.dockerfile b/docker-images/python3.8.dockerfile
new file mode 100644
index 0000000..fb43a65
--- /dev/null
+++ b/docker-images/python3.8.dockerfile
@@ -0,0 +1,7 @@
+FROM tiangolo/meinheld-gunicorn:python3.8
+
+LABEL maintainer="Sebastian Ramirez <tiangolo@gmail.com>"
+
+RUN pip install flask
+
+COPY ./app /app
diff --git a/scripts/build.sh b/scripts/build.sh
index 4b404a6..8747a01 100644
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -6,7 +6,7 @@ use_tag="tiangolo/meinheld-gunicorn-flask:$NAME"
 DOCKERFILE="$NAME"
 
 if [ "$NAME" == "latest" ] ; then
-    DOCKERFILE="python3.7"
+    DOCKERFILE="python3.8"
 fi
 
 docker build -t "$use_tag" --file "./docker-images/${DOCKERFILE}.dockerfile" "./docker-images/"
diff --git a/scripts/process_all.py b/scripts/process_all.py
index 712938d..3320b3b 100644
--- a/scripts/process_all.py
+++ b/scripts/process_all.py
@@ -3,7 +3,8 @@
 import sys
 
 environments = [
-    {"NAME": "latest", "PYTHON_VERSION": "3.7"},
+    {"NAME": "latest", "PYTHON_VERSION": "3.8"},
+    {"NAME": "python3.8", "PYTHON_VERSION": "3.8"},
     {"NAME": "python3.7", "PYTHON_VERSION": "3.7"},
     {"NAME": "python3.6", "PYTHON_VERSION": "3.6"},
     {"NAME": "python2.7", "PYTHON_VERSION": "2.7"},
@@ -15,7 +16,7 @@
 build_push = os.environ.get("BUILD_PUSH")
 
 
-def process_tag(*, env: dict):
+def process_tag(*, env: dict) -> None:
     use_env = {**os.environ, **env}
     script = "scripts/test.sh"
     if build_push:
@@ -25,7 +26,7 @@ def process_tag(*, env: dict):
         sys.exit(return_code)
 
 
-def print_version_envs():
+def print_version_envs() -> None:
     env_lines = []
     for env in environments:
         env_vars = []
@@ -36,7 +37,7 @@ def print_version_envs():
         print(line)
 
 
-def main():
+def main() -> None:
     start_at = 0
     if start_with:
         start_at = [