diff --git a/.drone.jsonnet b/.drone.jsonnet
index ac47762..67b9671 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -24,7 +24,7 @@ local PipelineLint = {
   steps: [
     {
       name: 'flake8',
-      image: 'python:3.8',
+      image: 'python:3.9',
       environment: {
         PY_COLORS: 1,
       },
@@ -52,6 +52,7 @@ local PipelineTest = {
     PythonVersion(pyversion='3.6'),
     PythonVersion(pyversion='3.7'),
     PythonVersion(pyversion='3.8'),
+    PythonVersion(pyversion='3.9'),
   ],
   depends_on: [
     'lint',
@@ -71,7 +72,7 @@ local PipelineSecurity = {
   steps: [
     {
       name: 'bandit',
-      image: 'python:3.8',
+      image: 'python:3.9',
       environment: {
         PY_COLORS: 1,
       },
@@ -100,7 +101,7 @@ local PipelineBuildPackage = {
   steps: [
     {
       name: 'build',
-      image: 'python:3.8',
+      image: 'python:3.9',
       commands: [
         'python setup.py sdist bdist_wheel',
       ],
@@ -158,7 +159,7 @@ local PipelineBuildContainer(arch='amd64') = {
   steps: [
     {
       name: 'build',
-      image: 'python:3.8',
+      image: 'python:3.9',
       commands: [
         'python setup.py bdist_wheel',
       ],
@@ -232,11 +233,10 @@ local PipelineDocs = {
   },
   steps: [
     {
-      name: 'assets',
-      image: 'byrnedo/alpine-curl',
+      name: 'generate',
+      image: 'thegeeklab/alpine-tools',
       commands: [
-        'mkdir -p docs/themes/hugo-geekdoc/',
-        'curl -L https://github.com/thegeeklab/hugo-geekdoc/releases/latest/download/hugo-geekdoc.tar.gz | tar -xz -C docs/themes/hugo-geekdoc/ --strip-components=1',
+        'make doc',
       ],
     },
     {
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..90a6b14
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,20 @@
+# renovate: datasource=github-releases depName=thegeeklab/hugo-geekdoc
+THEME_VERSION := v0.5.0
+THEME := hugo-geekdoc
+BASEDIR := docs
+THEMEDIR := $(BASEDIR)/themes
+
+.PHONY: all
+all: doc
+
+.PHONY: doc
+doc: doc-assets
+
+.PHONY: doc-assets
+doc-assets:
+	mkdir -p $(THEMEDIR)/$(THEME)/ ; \
+	curl -sSL "https://github.com/thegeeklab/$(THEME)/releases/download/${THEME_VERSION}/$(THEME).tar.gz" | tar -xz -C $(THEMEDIR)/$(THEME)/ --strip-components=1
+
+.PHONY: clean
+clean:
+	rm -rf $(THEMEDIR) && \
diff --git a/renovate.json b/renovate.json
index f45d8f1..91ced0d 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,5 +1,14 @@
 {
-  "extends": [
-    "config:base"
-  ]
+  "extends": ["config:base"],
+  "regexManagers": [
+    {
+      "fileMatch": ["^Makefile$"],
+      "matchStrings": [
+        "# renovate: datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)( versioning=(?<versioning>.*?))?\\n.*?_VERSION := (?<currentValue>.*)\\s"
+      ]
+    }
+  ],
+  "droneci": {
+    "enabled": false
+  }
 }
diff --git a/setup.py b/setup.py
index ce317ee..6b133b8 100755
--- a/setup.py
+++ b/setup.py
@@ -56,6 +56,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",
         "Topic :: Software Development :: Documentation",