diff --git a/images.CI/build-image.ps1 b/images.CI/build-image.ps1
index 24d4a4d54..7592ffd1d 100644
--- a/images.CI/build-image.ps1
+++ b/images.CI/build-image.ps1
@@ -54,6 +54,7 @@ packer build    -var "capture_name_prefix=$ResourcesNamePrefix" `
                 -var "virtual_network_name=$VirtualNetworkName" `
                 -var "virtual_network_resource_group_name=$VirtualNetworkRG" `
                 -var "virtual_network_subnet_name=$VirtualNetworkSubnet" `
+                -var "run_validation_diskspace=$env:RUN_VALIDATION_FLAG" `
                 $TemplatePath `
         | Where-Object {
             #Filter sensitive data from Packer logs
diff --git a/images/linux/scripts/installers/validate-disk-space.sh b/images/linux/scripts/installers/validate-disk-space.sh
index 79a589ddc..ffe366c74 100644
--- a/images/linux/scripts/installers/validate-disk-space.sh
+++ b/images/linux/scripts/installers/validate-disk-space.sh
@@ -8,6 +8,12 @@ availableSpaceMB=$(df / -hm | sed 1d | awk '{ print $4}')
 minimumFreeSpaceMB=17800
 
 echo "Available disk space: $availableSpaceMB MB"
+
+if [ $RUN_VALIDATION != "true" ]; then
+    echo "Skipping validation disk space..."
+    exit 0
+fi
+
 if [ $availableSpaceMB -le $minimumFreeSpaceMB ]; then
     echo "Not enough disk space on the image (minimum available space: $minimumFreeSpaceMB MB)"
     exit 1
diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json
index e03b63f54..a493a3302 100644
--- a/images/linux/ubuntu1604.json
+++ b/images/linux/ubuntu1604.json
@@ -24,6 +24,7 @@
         "image_version": "dev",
         "image_os": "ubuntu16",
         "github_feed_token": null,
+        "run_validation_diskspace": "false",
         "go_default": "1.14",
         "go_versions": "1.11 1.12 1.13 1.14"
     },
@@ -344,6 +345,9 @@
             "type": "shell",
             "scripts":[
                 "{{template_dir}}/scripts/installers/validate-disk-space.sh"
+            ],
+            "environment_vars": [
+                "RUN_VALIDATION={{user `run_validation_diskspace`}}"
             ]
         },
         {
diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json
index 7ceff4a93..89a024d34 100644
--- a/images/linux/ubuntu1804.json
+++ b/images/linux/ubuntu1804.json
@@ -24,6 +24,7 @@
         "image_version": "dev",
         "image_os": "ubuntu18",
         "github_feed_token": null,
+        "run_validation_diskspace": "false",
         "go_default": "1.14",
         "go_versions": "1.11 1.12 1.13 1.14"
     },
@@ -348,6 +349,9 @@
             "type": "shell",
             "scripts":[
                 "{{template_dir}}/scripts/installers/validate-disk-space.sh"
+            ],
+            "environment_vars": [
+                "RUN_VALIDATION={{user `run_validation_diskspace`}}"
             ]
         },
         {