diff --git a/images/linux/scripts/installers/python.sh b/images/linux/scripts/installers/python.sh
index 3749d419b..1955e53e5 100644
--- a/images/linux/scripts/installers/python.sh
+++ b/images/linux/scripts/installers/python.sh
@@ -8,10 +8,16 @@
 source $HELPER_SCRIPTS/document.sh
 
 # Install Python, Python 3, pip, pip3
-apt-get install -y --no-install-recommends python3 python3-dev python3-pip
+if isUbuntu20 ; then
+    apt-get install -y --no-install-recommends python3 python3-dev python3-pip
 
-curl https://bootstrap.pypa.io/get-pip.py --output get-pip.py
-python2 get-pip.py
+    curl https://bootstrap.pypa.io/get-pip.py --output get-pip.py
+    python2 get-pip.py
+fi
+
+if isUbuntu16 || isUbuntu18 ; then
+    apt-get install -y --no-install-recommends python python-dev python-pip python3 python3-dev python3-pip
+fi
 
 # Run tests to determine that the software installed as expected
 echo "Testing to make sure that script performed as expected, and basic scenarios work"
diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json
index 508406efe..f03425709 100644
--- a/images/linux/ubuntu2004.json
+++ b/images/linux/ubuntu2004.json
@@ -265,7 +265,7 @@
         {
             "type": "shell",
             "scripts":[
-                "{{template_dir}}/scripts/installers/1804/android.sh",
+                "{{template_dir}}/scripts/installers/2004/android.sh",
                 "{{template_dir}}/scripts/installers/azpowershell.sh",
                 "{{template_dir}}/scripts/installers/python.sh"
             ],