diff --git a/target/chroot/beagleboard.org-bionic.sh b/target/chroot/beagleboard.org-bionic.sh
index 01b422f15e33e74d336fb8c4588f7889d93c77a9..46b8d478fd4a35f814a14798caeea033e4859469 100755
--- a/target/chroot/beagleboard.org-bionic.sh
+++ b/target/chroot/beagleboard.org-bionic.sh
@@ -153,18 +153,19 @@ setup_desktop () {
 }
 
 install_pip_pkgs () {
-	if [ -f /usr/bin/python3 ] ; then
-		if [ -f /usr/bin/pip3 ] ; then
-			if [ -f /usr/bin/make ] ; then
-				echo "Installing pip packages"
-				git_repo="https://github.com/adafruit/adafruit-beaglebone-io-python.git"
-				git_target_dir="/opt/source/adafruit-beaglebone-io-python"
-				git_clone
-				if [ -f ${git_target_dir}/.git/config ] ; then
-					cd ${git_target_dir}/
-					sed -i -e 's:4.1.0:3.4.0:g' setup.py
-					python3 setup.py install
-				fi
+	if [ -f /usr/bin/make ] ; then
+		echo "Installing pip packages"
+		git_repo="https://github.com/adafruit/adafruit-beaglebone-io-python.git"
+		git_target_dir="/opt/source/adafruit-beaglebone-io-python"
+		git_clone
+		if [ -f ${git_target_dir}/.git/config ] ; then
+			cd ${git_target_dir}/
+			sed -i -e 's:4.1.0:3.4.0:g' setup.py
+			if [ -f /usr/bin/python2 ] ; then
+				python2 setup.py install || true
+			fi
+			if [ -f /usr/bin/python3 ] ; then
+				python3 setup.py install || true
 			fi
 		fi
 	fi
diff --git a/target/chroot/beagleboard.org-buster.sh b/target/chroot/beagleboard.org-buster.sh
index 04eceb22471b5faf589289e2d0e86177d54b5c9c..60393bca7fd9ced85bd3c2c4c7de3cb3ce118882 100755
--- a/target/chroot/beagleboard.org-buster.sh
+++ b/target/chroot/beagleboard.org-buster.sh
@@ -153,18 +153,19 @@ setup_desktop () {
 }
 
 install_pip_pkgs () {
-	if [ -f /usr/bin/python3 ] ; then
-		if [ -f /usr/bin/pip3 ] ; then
-			if [ -f /usr/bin/make ] ; then
-				echo "Installing pip packages"
-				git_repo="https://github.com/adafruit/adafruit-beaglebone-io-python.git"
-				git_target_dir="/opt/source/adafruit-beaglebone-io-python"
-				git_clone
-				if [ -f ${git_target_dir}/.git/config ] ; then
-					cd ${git_target_dir}/
-					sed -i -e 's:4.1.0:3.4.0:g' setup.py
-					python3 setup.py install
-				fi
+	if [ -f /usr/bin/make ] ; then
+		echo "Installing pip packages"
+		git_repo="https://github.com/adafruit/adafruit-beaglebone-io-python.git"
+		git_target_dir="/opt/source/adafruit-beaglebone-io-python"
+		git_clone
+		if [ -f ${git_target_dir}/.git/config ] ; then
+			cd ${git_target_dir}/
+			sed -i -e 's:4.1.0:3.4.0:g' setup.py
+			if [ -f /usr/bin/python2 ] ; then
+				python2 setup.py install || true
+			fi
+			if [ -f /usr/bin/python3 ] ; then
+				python3 setup.py install || true
 			fi
 		fi
 	fi
diff --git a/target/chroot/beagleboard.org-stretch-2gb.sh b/target/chroot/beagleboard.org-stretch-2gb.sh
index 6b84bab3e07be83f58da454ff08c3c350620b22a..fade45908ab2f48db9e7a0b1450464adc1e141b2 100755
--- a/target/chroot/beagleboard.org-stretch-2gb.sh
+++ b/target/chroot/beagleboard.org-stretch-2gb.sh
@@ -179,18 +179,19 @@ setup_desktop () {
 }
 
 install_pip_pkgs () {
-	if [ -f /usr/bin/python3 ] ; then
-		if [ -f /usr/bin/pip3 ] ; then
-			if [ -f /usr/bin/make ] ; then
-				echo "Installing pip packages"
-				git_repo="https://github.com/adafruit/adafruit-beaglebone-io-python.git"
-				git_target_dir="/opt/source/adafruit-beaglebone-io-python"
-				git_clone
-				if [ -f ${git_target_dir}/.git/config ] ; then
-					cd ${git_target_dir}/
-					sed -i -e 's:4.1.0:3.4.0:g' setup.py
-					python3 setup.py install
-				fi
+	if [ -f /usr/bin/make ] ; then
+		echo "Installing pip packages"
+		git_repo="https://github.com/adafruit/adafruit-beaglebone-io-python.git"
+		git_target_dir="/opt/source/adafruit-beaglebone-io-python"
+		git_clone
+		if [ -f ${git_target_dir}/.git/config ] ; then
+			cd ${git_target_dir}/
+			sed -i -e 's:4.1.0:3.4.0:g' setup.py
+			if [ -f /usr/bin/python2 ] ; then
+				python2 setup.py install || true
+			fi
+			if [ -f /usr/bin/python3 ] ; then
+				python3 setup.py install || true
 			fi
 		fi
 	fi
diff --git a/target/chroot/beagleboard.org-stretch.sh b/target/chroot/beagleboard.org-stretch.sh
index 2522dbc1a2bc048ec53c5edc93655b8f72eb73cf..d4747b07eb174497bec9ebf9d63565859b843ed1 100755
--- a/target/chroot/beagleboard.org-stretch.sh
+++ b/target/chroot/beagleboard.org-stretch.sh
@@ -179,18 +179,19 @@ setup_desktop () {
 }
 
 install_pip_pkgs () {
-	if [ -f /usr/bin/python3 ] ; then
-		if [ -f /usr/bin/pip3 ] ; then
-			if [ -f /usr/bin/make ] ; then
-				echo "Installing pip packages"
-				git_repo="https://github.com/adafruit/adafruit-beaglebone-io-python.git"
-				git_target_dir="/opt/source/adafruit-beaglebone-io-python"
-				git_clone
-				if [ -f ${git_target_dir}/.git/config ] ; then
-					cd ${git_target_dir}/
-					sed -i -e 's:4.1.0:3.4.0:g' setup.py
-					python3 setup.py install
-				fi
+	if [ -f /usr/bin/make ] ; then
+		echo "Installing pip packages"
+		git_repo="https://github.com/adafruit/adafruit-beaglebone-io-python.git"
+		git_target_dir="/opt/source/adafruit-beaglebone-io-python"
+		git_clone
+		if [ -f ${git_target_dir}/.git/config ] ; then
+			cd ${git_target_dir}/
+			sed -i -e 's:4.1.0:3.4.0:g' setup.py
+			if [ -f /usr/bin/python2 ] ; then
+				python2 setup.py install || true
+			fi
+			if [ -f /usr/bin/python3 ] ; then
+				python3 setup.py install || true
 			fi
 		fi
 	fi
diff --git a/target/chroot/elinux.sh b/target/chroot/elinux.sh
index 539597e89730d84f28f10e08bedef8ab1ccdbc69..935f4ff6dacd2765214d8bcf4e1077b58237eb31 100755
--- a/target/chroot/elinux.sh
+++ b/target/chroot/elinux.sh
@@ -107,6 +107,23 @@ install_git_repos () {
 	git_repo="https://github.com/beagleboard/bb.org-overlays"
 	git_target_dir="/opt/source/bb.org-overlays"
 	git_clone
+
+	if [ -f /usr/bin/make ] ; then
+		echo "Installing pip packages"
+		git_repo="https://github.com/adafruit/adafruit-beaglebone-io-python.git"
+		git_target_dir="/opt/source/adafruit-beaglebone-io-python"
+		git_clone
+		if [ -f ${git_target_dir}/.git/config ] ; then
+			cd ${git_target_dir}/
+			sed -i -e 's:4.1.0:3.4.0:g' setup.py
+			if [ -f /usr/bin/python2 ] ; then
+				python2 setup.py install || true
+			fi
+			if [ -f /usr/bin/python3 ] ; then
+				python3 setup.py install || true
+			fi
+		fi
+	fi
 }
 
 
diff --git a/target/chroot/machinekit-stretch.sh b/target/chroot/machinekit-stretch.sh
index 9a19bcdd67a153b586446613c54859f10610e216..d1c57c1c7d71fc6052d1043c69ed05f951f58a7a 100755
--- a/target/chroot/machinekit-stretch.sh
+++ b/target/chroot/machinekit-stretch.sh
@@ -191,24 +191,19 @@ setup_desktop () {
 }
 
 install_pip_pkgs () {
-	if [ -f /usr/bin/python ] ; then
-		wget https://bootstrap.pypa.io/get-pip.py || true
-		if [ -f get-pip.py ] ; then
-			python get-pip.py
-			rm -f get-pip.py || true
-
-			if [ -f /usr/local/bin/pip ] ; then
-				if [ -f /usr/bin/make ] ; then
-					echo "Installing pip packages"
-					git_repo="https://github.com/adafruit/adafruit-beaglebone-io-python.git"
-					git_target_dir="/opt/source/adafruit-beaglebone-io-python"
-					git_clone
-					if [ -f ${git_target_dir}/.git/config ] ; then
-						cd ${git_target_dir}/
-						sed -i -e 's:4.1.0:3.4.0:g' setup.py
-						python setup.py install
-					fi
-				fi
+	if [ -f /usr/bin/make ] ; then
+		echo "Installing pip packages"
+		git_repo="https://github.com/adafruit/adafruit-beaglebone-io-python.git"
+		git_target_dir="/opt/source/adafruit-beaglebone-io-python"
+		git_clone
+		if [ -f ${git_target_dir}/.git/config ] ; then
+			cd ${git_target_dir}/
+			sed -i -e 's:4.1.0:3.4.0:g' setup.py
+			if [ -f /usr/bin/python2 ] ; then
+				python2 setup.py install || true
+			fi
+			if [ -f /usr/bin/python3 ] ; then
+				python3 setup.py install || true
 			fi
 		fi
 	fi