diff --git a/images/linux/scripts/installers/pipx-packages.sh b/images/linux/scripts/installers/pipx-packages.sh
index d1083735d..beec3ffaf 100644
--- a/images/linux/scripts/installers/pipx-packages.sh
+++ b/images/linux/scripts/installers/pipx-packages.sh
@@ -5,7 +5,7 @@
 ################################################################################
 
 # Add pipx_bin to path
-export PATH="$PATH:/opt/pipx_bin"
+python3 -m pipx ensurepath
 
 # Install yamlint
 pipx install yamllint
diff --git a/images/linux/scripts/installers/python.sh b/images/linux/scripts/installers/python.sh
index 3c7886ae6..85b2775d3 100644
--- a/images/linux/scripts/installers/python.sh
+++ b/images/linux/scripts/installers/python.sh
@@ -26,11 +26,11 @@ export PIPX_HOME=/opt/pipx
 python3 -m pip install pipx
 python3 -m pipx ensurepath
 
-echo "PIPX_BIN_DIR=$PIPX_BIN_DIR" | tee -a /etc/environment
-echo "PIPX_HOME=$PIPX_HOME" | tee -a /etc/environment
+# echo "PIPX_BIN_DIR=$PIPX_BIN_DIR" | tee -a /etc/environment
+# echo "PIPX_HOME=$PIPX_HOME" | tee -a /etc/environment
 
 # Add pipx bin directory to path
-export PATH="$PATH:$PIPX_BIN_DIR"
+# export PATH="$PATH:$PIPX_BIN_DIR"
 echo 'export PATH="$PATH:/opt/pipx_bin"' >> /etc/skel/.bashrc
 
 # Run tests to determine that the software installed as expected