diff --git a/images/linux/scripts/installers/envvariables.sh b/images/linux/scripts/installers/envvariables.sh
new file mode 100644
index 000000000..7ffdd35f1
--- /dev/null
+++ b/images/linux/scripts/installers/envvariables.sh
@@ -0,0 +1,7 @@
+#Set ImageVersion and ImageOS env variables
+"echo ImageVersion=$IMAGE_VERSION | tee -a /etc/environment",
+"echo ImageOS=$IMAGE_OS | tee -a /etc/environment"
+
+# This directory is supposed to be created in $HOME and owned by user(https://github.com/actions/virtual-environments/issues/491)
+mkdir -p /etc/skel/.config/configstore
+echo 'export XDG_CONFIG_HOME=$HOME/.config' | tee -a /etc/skel/.bashrc
diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json
index 133751f34..dc08e2066 100644
--- a/images/linux/ubuntu1604.json
+++ b/images/linux/ubuntu1604.json
@@ -123,18 +123,12 @@
         },
         {
             "type": "shell",
-            "inline": [
-                "echo ImageVersion={{user `image_version`}} | tee -a /etc/environment",
-                "echo ImageOS={{user `image_os`}} | tee -a /etc/environment"
+            "scripts": [
+                "{{template_dir}}/scripts/installers/envvariables.sh"
             ],
-            "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
-        },
-        {
-            "type": "shell",
-            "inline": [
-                "# This directory is supposed to be created in $HOME and owned by user(https://github.com/actions/virtual-environments/issues/491)",
-                "mkdir -p /etc/skel/.config/configstore",
-                "echo 'export XDG_CONFIG_HOME=$HOME/.config' | tee -a /etc/skel/.bashrc"
+            "environment_vars": [
+                "IMAGE_VERSION={{user `image_version`}}",
+                "IMAGE_OS={{user `image_os`}}"
             ],
             "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
         },
diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json
index d96b8bea7..f5443028e 100644
--- a/images/linux/ubuntu1804.json
+++ b/images/linux/ubuntu1804.json
@@ -126,18 +126,12 @@
         },
         {
             "type": "shell",
-            "inline": [
-                "echo ImageVersion={{user `image_version`}} | tee -a /etc/environment",
-                "echo ImageOS={{user `image_os`}} | tee -a /etc/environment"
+            "scripts": [
+                "{{template_dir}}/scripts/installers/envvariables.sh"
             ],
-            "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
-        },
-        {
-            "type": "shell",
-            "inline": [
-                "# This directory is supposed to be created in $HOME and owned by user(https://github.com/actions/virtual-environments/issues/491)",
-                "mkdir -p /etc/skel/.config/configstore",
-                "echo 'export XDG_CONFIG_HOME=$HOME/.config' | tee -a /etc/skel/.bashrc"
+            "environment_vars": [
+                "IMAGE_VERSION={{user `image_version`}}",
+                "IMAGE_OS={{user `image_os`}}"
             ],
             "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
         },