diff --git a/tinyipa/build-tinyipa.sh b/tinyipa/build-tinyipa.sh
index f695d08..4cd4e8c 100755
--- a/tinyipa/build-tinyipa.sh
+++ b/tinyipa/build-tinyipa.sh
@@ -162,13 +162,13 @@ while read line; do
     sudo chroot --userspec=$TC:$STAFF $BUILDDIR /usr/bin/env -i PATH=$CHROOT_PATH http_proxy=$http_proxy https_proxy=$https_proxy no_proxy=$no_proxy tce-load -wci $line
 done < <(paste $WORKDIR/build_files/$PY_REQS $WORKDIR/build_files/buildreqs.lst)
 
-PIP_COMMAND="pip"
 TINYIPA_PYTHON_EXE="python"
 if [[ $USE_PYTHON3 == "True" ]]; then
-    PIP_COMMAND="pip3"
-    TINYIPA_PYTHON_EXE="python3"
+    TINYIPA_PYTHON_EXE="python3.9"
 fi
 
+PIP_COMMAND="$TINYIPA_PYTHON_EXE -m pip"
+
 # Build python wheels
 $CHROOT_CMD ${TINYIPA_PYTHON_EXE} -m ensurepip
 $CHROOT_CMD ${PIP_COMMAND} install --upgrade pip==${PIP_VERSION} wheel
diff --git a/tinyipa/build_files/buildreqs_python3.lst b/tinyipa/build_files/buildreqs_python3.lst
index 1b6b0c0..5d48288 100644
--- a/tinyipa/build_files/buildreqs_python3.lst
+++ b/tinyipa/build_files/buildreqs_python3.lst
@@ -1,2 +1,2 @@
-python3.6.tcz
-python3.6-dev.tcz
\ No newline at end of file
+python3.9.tcz
+python3.9-dev.tcz
diff --git a/tinyipa/build_files/finalreqs_python3.lst b/tinyipa/build_files/finalreqs_python3.lst
index a2a4bdc..fab523d 100644
--- a/tinyipa/build_files/finalreqs_python3.lst
+++ b/tinyipa/build_files/finalreqs_python3.lst
@@ -1,2 +1,2 @@
-python3.6.tcz
-expat2.tcz
\ No newline at end of file
+python3.9.tcz
+expat2.tcz