diff --git a/images/linux/scripts/installers/1604/powershellcore.sh b/images/linux/scripts/installers/1604/powershellcore.sh
deleted file mode 100644
index 5c615ae31..000000000
--- a/images/linux/scripts/installers/1604/powershellcore.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-################################################################################
-##  File:  powershellcore.sh
-##  Desc:  Installs powershellcore
-################################################################################
-
-# Source the helpers for use with the script
-source $HELPER_SCRIPTS/document.sh
-
-# Install Powershell
-apt-get install -y powershell
-
-# Run tests to determine that the software installed as expected
-echo "Testing to make sure that script performed as expected, and basic scenarios work"
-if ! command -v pwsh; then
-    echo "pwsh was not installed"
-    exit 1
-fi
-if ! pwsh -c 'Write-Host Hello world'; then
-    echo "pwsh failed to run"
-    exit 1
-fi
-
-# Document what was added to the image
-echo "Lastly, documenting what we added to the metadata file"
-DocumentInstalledItem "Powershell ($(pwsh --version))"
diff --git a/images/linux/scripts/installers/1804/powershellcore.sh b/images/linux/scripts/installers/powershellcore.sh
similarity index 82%
rename from images/linux/scripts/installers/1804/powershellcore.sh
rename to images/linux/scripts/installers/powershellcore.sh
index 2f1922493..e41e604c8 100644
--- a/images/linux/scripts/installers/1804/powershellcore.sh
+++ b/images/linux/scripts/installers/powershellcore.sh
@@ -7,10 +7,14 @@
 # Source the helpers for use with the script
 source $HELPER_SCRIPTS/document.sh
 
-# libicu64, which comes with php-intl module, has powershell breaking issue https://github.com/PowerShell/PowerShell/issues/9746
+LSB_RELEASE=$(lsb_release -rs)
+
+# libicu64, which comes with php-intl module, has powershell breaking issue on Ubuntu 16.04 https://github.com/PowerShell/PowerShell/issues/9746
 # Fix - install additional libicu65 where the issue is fixed
-echo "install libicu65"
-apt get install libicu65
+if [ $LSB_RELEASE == "16.04" ]; then
+    echo "install libicu65"
+    apt get install libicu65
+fi
 
 # Install Powershell
 apt-get install -y powershell
diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json
index 5317804de..7cd93f76f 100644
--- a/images/linux/ubuntu1604.json
+++ b/images/linux/ubuntu1604.json
@@ -157,7 +157,7 @@
                 "{{template_dir}}/scripts/installers/1604/php.sh",
                 "{{template_dir}}/scripts/installers/pollinate.sh",
                 "{{template_dir}}/scripts/installers/postgresql.sh",
-                "{{template_dir}}/scripts/installers/1604/powershellcore.sh",
+                "{{template_dir}}/scripts/installers/powershellcore.sh",
                 "{{template_dir}}/scripts/installers/ruby.sh",
                 "{{template_dir}}/scripts/installers/rust.sh",
                 "{{template_dir}}/scripts/installers/julia.sh",
diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json
index 121a11090..4153b200a 100644
--- a/images/linux/ubuntu1804.json
+++ b/images/linux/ubuntu1804.json
@@ -160,7 +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/powershellcore.sh",
                 "{{template_dir}}/scripts/installers/ruby.sh",
                 "{{template_dir}}/scripts/installers/rust.sh",
                 "{{template_dir}}/scripts/installers/julia.sh",