diff --git a/images/linux/scripts/installers/post-deployment.sh b/images/linux/scripts/installers/post-deployment.sh
new file mode 100644
index 00000000..2864dae4
--- /dev/null
+++ b/images/linux/scripts/installers/post-deployment.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+################################################################################
+##  File: post-deployment.sh
+##  Desc: Post deployment actions
+################################################################################
+
+# set chmod -R 777 /opt
+if [[ -d "/opt" ]]; then
+    echo "chmod -R 777 /opt"
+    chmod -R 777 /opt
+fi
+
+# remove installer and helper folders
+rm -rf $HELPER_SCRIPT_FOLDER
+rm -rf $INSTALLER_SCRIPT_FOLDER
+chmod 755 $IMAGE_FOLDER
diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json
index 33263345..3aa477cb 100644
--- a/images/linux/ubuntu1604.json
+++ b/images/linux/ubuntu1604.json
@@ -303,10 +303,13 @@
         },
         {
             "type": "shell",
-            "inline": [
-                "rm -rf {{user `helper_script_folder`}}",
-                "rm -rf {{user `installer_script_folder`}}",
-                "chmod 755 {{user `image_folder`}}"
+            "scripts":[
+                "{{template_dir}}/scripts/installers/post-deployment.sh"
+            ],
+            "environment_vars":[
+                "HELPER_SCRIPT_FOLDER={{user `helper_script_folder`}}",
+                "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}",
+                "IMAGE_FOLDER={{user `image_folder`}}"
             ],
             "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
         },
diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json
index 1dd62bc2..a5b71c07 100644
--- a/images/linux/ubuntu1804.json
+++ b/images/linux/ubuntu1804.json
@@ -307,10 +307,13 @@
         },
         {
             "type": "shell",
-            "inline": [
-                "rm -rf {{user `helper_script_folder`}}",
-                "rm -rf {{user `installer_script_folder`}}",
-                "chmod 755 {{user `image_folder`}}"
+            "scripts":[
+                "{{template_dir}}/scripts/installers/post-deployment.sh"
+            ],
+            "environment_vars":[
+                "HELPER_SCRIPT_FOLDER={{user `helper_script_folder`}}",
+                "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}",
+                "IMAGE_FOLDER={{user `image_folder`}}"
             ],
             "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
         },
diff --git a/images/linux/ubuntu2004.json b/images/linux/ubuntu2004.json
index 67d6e1d6..c2a1bd56 100644
--- a/images/linux/ubuntu2004.json
+++ b/images/linux/ubuntu2004.json
@@ -307,6 +307,18 @@
             "destination": "{{template_dir}}/Ubuntu2004-README.md",
             "direction": "download"
         },
+        {
+            "type": "shell",
+            "scripts":[
+                "{{template_dir}}/scripts/installers/post-deployment.sh"
+            ],
+            "environment_vars":[
+                "HELPER_SCRIPT_FOLDER={{user `helper_script_folder`}}",
+                "INSTALLER_SCRIPT_FOLDER={{user `installer_script_folder`}}",
+                "IMAGE_FOLDER={{user `image_folder`}}"
+            ],
+            "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
+        },
         {
             "type": "shell",
             "scripts":[
@@ -316,15 +328,6 @@
                 "RUN_VALIDATION={{user `run_validation_diskspace`}}"
             ]
         },
-        {
-            "type": "shell",
-            "inline": [
-                "rm -rf {{user `helper_script_folder`}}",
-                "rm -rf {{user `installer_script_folder`}}",
-                "chmod 755 {{user `image_folder`}}"
-            ],
-            "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
-        },
         {
             "type": "file",
             "source": "{{template_dir}}/config/ubuntu2004.conf",