diff --git a/build-config/Makefile b/build-config/Makefile
index 57c90c9d1..147f61b8d 100644
--- a/build-config/Makefile
+++ b/build-config/Makefile
@@ -594,11 +594,11 @@ machine-prefix:
 # The onie/build-config/scripts/onie-build-targets.json file lists
 #  platforms and known working build environments.
 DEBIAN_BUILD_HOST_PACKAGES	= build-essential stgit u-boot-tools util-linux \
-				  gperf device-tree-compiler python-all-dev xorriso \
+				  gperf device-tree-compiler python3-dev xorriso \
 				  autoconf automake bison flex texinfo libtool libtool-bin \
 				  gawk libncurses5 libncurses5-dev bc \
 				  dosfstools mtools pkg-config git wget help2man libexpat1 \
-				  libexpat1-dev fakeroot python-sphinx rst2pdf \
+				  libexpat1-dev fakeroot python3-sphinx rst2pdf \
 				  libefivar-dev libnss3-tools libnss3-dev libpopt-dev \
 				  libssl-dev sbsigntool uuid-runtime uuid-dev cpio \
 				  bsdmainutils unzip
diff --git a/build-config/scripts/mk-part-table.py b/build-config/scripts/mk-part-table.py
index 273966f77..dc3785391 100755
--- a/build-config/scripts/mk-part-table.py
+++ b/build-config/scripts/mk-part-table.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
 
 from struct import pack
 import sys
diff --git a/contrib/build-env/Dockerfile b/contrib/build-env/Dockerfile
index bfeb14cc8..33a3b53e4 100644
--- a/contrib/build-env/Dockerfile
+++ b/contrib/build-env/Dockerfile
@@ -9,11 +9,11 @@ FROM debian:9
 # Add initial development packages
 RUN apt-get update && apt-get install -y \
     build-essential stgit u-boot-tools util-linux \
-    gperf device-tree-compiler python-all-dev xorriso \
+    gperf device-tree-compiler python3-dev xorriso \
     autoconf automake bison flex texinfo libtool libtool-bin \
     realpath gawk libncurses5 libncurses5-dev bc \
     dosfstools mtools pkg-config git wget help2man libexpat1 \
-    libexpat1-dev fakeroot python-sphinx rst2pdf \
+    libexpat1-dev fakeroot python3-sphinx rst2pdf \
     libefivar-dev libnss3-tools libnss3-dev libpopt-dev \
     libssl-dev sbsigntool uuid-runtime uuid-dev cpio \
     bsdmainutils curl sudo unzip
diff --git a/contrib/git-stats/gitdm/findoldfiles b/contrib/git-stats/gitdm/findoldfiles
index 493d5d3e9..d131948e9 100755
--- a/contrib/git-stats/gitdm/findoldfiles
+++ b/contrib/git-stats/gitdm/findoldfiles
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # Another quick hack of a script to find files unchanged
 # since a given commit.
diff --git a/contrib/git-stats/gitdm/logparser.py b/contrib/git-stats/gitdm/logparser.py
index b375034a4..65beef590 100644
--- a/contrib/git-stats/gitdm/logparser.py
+++ b/contrib/git-stats/gitdm/logparser.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #-*- coding:utf-8 -*-
 #
 # Copyright © 2009 Germán Póo-Caamaño <gpoo@gnome.org>
diff --git a/contrib/git-stats/gitdm/tests/gitdm-tests.py b/contrib/git-stats/gitdm/tests/gitdm-tests.py
index a68003ead..996b2de34 100755
--- a/contrib/git-stats/gitdm/tests/gitdm-tests.py
+++ b/contrib/git-stats/gitdm/tests/gitdm-tests.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 
 #
diff --git a/contrib/git-stats/gitdm/treeplot b/contrib/git-stats/gitdm/treeplot
index b6eedcb9d..bc2ba381a 100755
--- a/contrib/git-stats/gitdm/treeplot
+++ b/contrib/git-stats/gitdm/treeplot
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # Create a graph of patch flow into the mainline.
 #
diff --git a/contrib/oce/build-onie.py b/contrib/oce/build-onie.py
index 626829a21..0eef124f1 100755
--- a/contrib/oce/build-onie.py
+++ b/contrib/oce/build-onie.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # -----------------------------------------------------------------------------
 # Copyright (C) 2014-2015 Carlos Cardenas <carlos@cumulusnetworks.com>
diff --git a/contrib/oce/eyes.py b/contrib/oce/eyes.py
index 08856ce9a..f848496b8 100755
--- a/contrib/oce/eyes.py
+++ b/contrib/oce/eyes.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # -----------------------------------------------------------------------------
 # Copyright (C) 2015-2016 Carlos Cardenas <carlos@cumulusnetworks.com>
diff --git a/contrib/oce/test-onie.py b/contrib/oce/test-onie.py
index 7252af066..70f88c1f3 100755
--- a/contrib/oce/test-onie.py
+++ b/contrib/oce/test-onie.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # -----------------------------------------------------------------------------
 # Copyright (C) 2014-2016 Carlos Cardenas <carlos@cumulusnetworks.com>