diff --git a/images/linux/scripts/base/repos.sh b/images/linux/scripts/base/repos.sh
index 847101aea..4ecd2028c 100644
--- a/images/linux/scripts/base/repos.sh
+++ b/images/linux/scripts/base/repos.sh
@@ -9,7 +9,7 @@ LSB_RELEASE=$(lsb_release -rs)
 # Install Microsoft repository
 wget https://packages.microsoft.com/config/ubuntu/$LSB_RELEASE/packages-microsoft-prod.deb
 dpkg -i packages-microsoft-prod.deb
-apt-get install -y apt-transport-https
+apt-get install -y apt-transport-https ca-certificates curl software-properties-common
 
 # Install Microsoft GPG public key
 curl -L https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
diff --git a/images/linux/scripts/installers/1604/powershellcore.sh b/images/linux/scripts/installers/1604/powershellcore.sh
index 8ace4742c..726faa0bd 100644
--- a/images/linux/scripts/installers/1604/powershellcore.sh
+++ b/images/linux/scripts/installers/1604/powershellcore.sh
@@ -8,6 +8,7 @@
 source $HELPER_SCRIPTS/document.sh
 
 LSB_RELEASE=$(lsb_release -rs)
+curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list > /etc/apt/sources.list.d/microsoft-prod.list
 
 # Install Powershell
 apt-get install -y powershell
diff --git a/images/linux/scripts/installers/docker-moby.sh b/images/linux/scripts/installers/docker-moby.sh
index 625c93cfa..f84e495f1 100644
--- a/images/linux/scripts/installers/docker-moby.sh
+++ b/images/linux/scripts/installers/docker-moby.sh
@@ -15,10 +15,6 @@ if ! IsInstalled $docker_package; then
     echo "Docker ($docker_package) was not found. Installing..."
     apt-get remove -y moby-engine moby-cli
     apt-get update
-    apt-get install -y apt-transport-https ca-certificates curl software-properties-common
-    curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
-    curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list > /etc/apt/sources.list.d/microsoft-prod.list
-    apt-get update
     apt-get install -y moby-engine moby-cli
 else
     echo "Docker ($docker_package) is already installed"
diff --git a/images/linux/scripts/installers/docker.sh b/images/linux/scripts/installers/docker.sh
index b7fb84e6a..e96e5ab17 100644
--- a/images/linux/scripts/installers/docker.sh
+++ b/images/linux/scripts/installers/docker.sh
@@ -12,8 +12,6 @@ DOCKER_PACKAGE=moby
 
 apt-get remove -y moby-engine mobi-cli
 apt-get update
-apt-get install -y apt-transport-https ca-certificates curl software-properties-common
-apt-get update
 apt-get install -y moby-engine mobi-cli
 
 docker pull node:10
diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json
index 3e605b32e..c9f8cac8a 100644
--- a/images/linux/ubuntu1804.json
+++ b/images/linux/ubuntu1804.json
@@ -127,8 +127,6 @@
                 "{{template_dir}}/scripts/installers/azure-cli.sh",
                 "{{template_dir}}/scripts/installers/azure-devops-cli.sh",
                 "{{template_dir}}/scripts/installers/1804/basic.sh",
-                "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh",
-                "{{template_dir}}/scripts/installers/1804/powershellcore.sh",
                 "{{template_dir}}/scripts/installers/aws.sh",
                 "{{template_dir}}/scripts/installers/build-essential.sh",
                 "{{template_dir}}/scripts/installers/clang.sh",
@@ -136,6 +134,7 @@
                 "{{template_dir}}/scripts/installers/docker-compose.sh",
                 "{{template_dir}}/scripts/installers/docker-moby.sh",
                 "{{template_dir}}/scripts/installers/docker.sh",
+                "{{template_dir}}/scripts/installers/dotnetcore-sdk.sh",
                 "{{template_dir}}/scripts/installers/erlang.sh",
                 "{{template_dir}}/scripts/installers/firefox.sh",
                 "{{template_dir}}/scripts/installers/gcc.sh",
@@ -161,6 +160,7 @@
                 "{{template_dir}}/scripts/installers/1804/php.sh",
                 "{{template_dir}}/scripts/installers/pollinate.sh",
                 "{{template_dir}}/scripts/installers/postgresql.sh",
+                "{{template_dir}}/scripts/installers/1804/powershellcore.sh",
                 "{{template_dir}}/scripts/installers/ruby.sh",
                 "{{template_dir}}/scripts/installers/rust.sh",
                 "{{template_dir}}/scripts/installers/sbt.sh",