diff --git a/Dockerfile b/Dockerfile
index 4a27824e..c23e2224 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG FROM=python:3.5
+ARG FROM=python:3.6
 FROM ${FROM}
 
 LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode'
diff --git a/Makefile b/Makefile
index 2d9c882d..0e80efb2 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ COMMIT            ?= commit-id
 PYTHON            = python3
 CHARTS            := $(patsubst charts/%/.,%,$(wildcard charts/*/.))
 IMAGE             := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
-PYTHON_BASE_IMAGE ?= python:3.5
+PYTHON_BASE_IMAGE ?= python:3.6
 
 # VERSION INFO
 GIT_COMMIT = $(shell git rev-parse HEAD)
diff --git a/setup.cfg b/setup.cfg
index c29e2943..5b256a49 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,6 +13,7 @@ classifier =
     Programming Language :: Python
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
 
 [files]
 packages =