diff --git a/.drone.jsonnet b/.drone.jsonnet
index f4a500c..48e08ee 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -25,7 +25,7 @@ local PipelineLint = {
   steps: [
     {
       name: 'flake8',
-      image: 'python:3.8',
+      image: 'python:3.9',
       environment: {
         PY_COLORS: 1,
       },
@@ -53,6 +53,7 @@ local PipelineTest = {
     PythonVersion(pyversion='3.6'),
     PythonVersion(pyversion='3.7'),
     PythonVersion(pyversion='3.8'),
+    PythonVersion(pyversion='3.9'),
   ],
   depends_on: [
     'lint',
@@ -72,7 +73,7 @@ local PipelineSecurity = {
   steps: [
     {
       name: 'bandit',
-      image: 'python:3.8',
+      image: 'python:3.9',
       environment: {
         PY_COLORS: 1,
       },
@@ -101,7 +102,7 @@ local PipelineBuildPackage = {
   steps: [
     {
       name: 'build',
-      image: 'python:3.8',
+      image: 'python:3.9',
       commands: [
         'python setup.py sdist bdist_wheel',
       ],
@@ -159,7 +160,7 @@ local PipelineBuildContainer(arch='amd64') = {
   steps: [
     {
       name: 'build',
-      image: 'python:3.8',
+      image: 'python:3.9',
       commands: [
         'python setup.py bdist_wheel',
       ],
diff --git a/docker/Dockerfile b/docker/Dockerfile
index fdcfb9f..3c30c5b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.7-alpine
+FROM python:3.9-alpine
 
 LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>" \
     org.label-schema.name="docker-autotag" \
diff --git a/setup.py b/setup.py
index 68819b0..8b6ebd9 100644
--- a/setup.py
+++ b/setup.py
@@ -55,6 +55,7 @@ setup(
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
         "Topic :: Utilities",
         "Topic :: Software Development",
     ],