diff --git a/Makefile b/Makefile
index afddfb9b..74285819 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ PROXY                      ?= http://proxy.foo.com:8000
 NO_PROXY                   ?= localhost,127.0.0.1,.svc.cluster.local
 USE_PROXY                  ?= false
 
-PYTHON_BASE_IMAGE          ?= python:3.5
+PYTHON_BASE_IMAGE          ?= python:3.6
 UBUNTU_BASE_IMAGE          ?= ubuntu:16.04
 
 IMAGE:=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/$(IMAGE_NAME):${IMAGE_TAG}
diff --git a/images/shipyard/Dockerfile b/images/shipyard/Dockerfile
index ae37ef71..726496dc 100644
--- a/images/shipyard/Dockerfile
+++ b/images/shipyard/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-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/src/bin/shipyard_airflow/setup.py b/src/bin/shipyard_airflow/setup.py
index a2c4866c..3042db2c 100644
--- a/src/bin/shipyard_airflow/setup.py
+++ b/src/bin/shipyard_airflow/setup.py
@@ -39,5 +39,6 @@ setuptools.setup(
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
 )
diff --git a/src/bin/shipyard_client/setup.py b/src/bin/shipyard_client/setup.py
index 3b55a156..0981f645 100644
--- a/src/bin/shipyard_client/setup.py
+++ b/src/bin/shipyard_client/setup.py
@@ -34,5 +34,6 @@ setuptools.setup(
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
 )