diff --git a/taskcluster/docker/base/Dockerfile b/taskcluster/docker/base/Dockerfile
index 59e1c8cbe..da578438b 100644
--- a/taskcluster/docker/base/Dockerfile
+++ b/taskcluster/docker/base/Dockerfile
@@ -34,9 +34,8 @@ RUN apt-get update -qq \
                           expect \
                           git \
                           curl \
-                          python \
-                          python-pip \
                           python3 \
+                          python3-pip \
                           python3-yaml \
                           locales \
                           tzdata \
@@ -44,9 +43,8 @@ RUN apt-get update -qq \
 			  mercurial \
     && apt-get clean
 
-RUN pip install --upgrade pip
-# TODO update to python3 so we can use newer taskcluster
-RUN pip install taskcluster==44.2.2
+RUN pip3 install --upgrade pip
+RUN pip install taskcluster
 
 RUN locale-gen "$LANG"
 
diff --git a/taskcluster/docker/visual-metrics/Dockerfile b/taskcluster/docker/visual-metrics/Dockerfile
index aff00431b..ae216aed5 100644
--- a/taskcluster/docker/visual-metrics/Dockerfile
+++ b/taskcluster/docker/visual-metrics/Dockerfile
@@ -10,9 +10,7 @@ RUN apt-get update -qq && \
       imagemagick \
       pyssim \
       python \
-      python-pil \
-      python3 \
-      python3-pip
+      python-pil
 
 WORKDIR /builds/worker
 
diff --git a/taskcluster/scripts/get-secret.py b/taskcluster/scripts/get-secret.py
index 90e559a0d..908c81bdc 100755
--- a/taskcluster/scripts/get-secret.py
+++ b/taskcluster/scripts/get-secret.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this