diff --git a/scripts/build/Platform/Android/build_config.json b/scripts/build/Platform/Android/build_config.json
index 07dc363296..699ccdf20a 100644
--- a/scripts/build/Platform/Android/build_config.json
+++ b/scripts/build/Platform/Android/build_config.json
@@ -27,7 +27,8 @@
   },
   "debug": {
     "TAGS":[
-        "nightly",
+        "nightly-incremental",
+        "nightly-clean",
         "weekly-build-metrics"
     ],
     "COMMAND":"../Windows/build_ninja_windows.cmd",
@@ -67,7 +68,8 @@
   },
   "profile_nounity": {
     "TAGS":[
-        "nightly",
+        "nightly-incremental",
+        "nightly-clean",
         "weekly-build-metrics"
     ],
     "COMMAND":"../Windows/build_ninja_windows.cmd",
@@ -83,7 +85,9 @@
   "asset_profile": {
     "TAGS":[
         "default",
-        "weekly-build-metrics"
+        "weekly-build-metrics",
+        "nightly-incremental",
+        "nightly-clean"
     ],
     "COMMAND":"../Windows/build_asset_windows.cmd",
     "PARAMETERS": {
@@ -98,21 +102,10 @@
         "ASSET_PROCESSOR_PLATFORMS":"es3"
     }
   },
-  "asset_clean_profile": {
-    "TAGS":[
-        "nightly"
-    ],
-    "PIPELINE_ENV": {
-        "CLEAN_ASSETS": "1"
-    },
-    "steps": [
-        "clean",
-        "asset_profile"
-    ]
-  },
   "release": {
     "TAGS":[
-        "nightly",
+        "nightly-incremental",
+        "nightly-clean",
         "weekly-build-metrics"
     ],
     "COMMAND":"../Windows/build_ninja_windows.cmd",
@@ -127,7 +120,8 @@
   },
   "monolithic_release": {
     "TAGS":[
-        "nightly",
+        "nightly-incremental",
+        "nightly-clean",
         "weekly-build-metrics"
     ],
     "COMMAND":"../Windows/build_ninja_windows.cmd",
diff --git a/scripts/build/Platform/Android/pipeline.json b/scripts/build/Platform/Android/pipeline.json
index a4a2700af0..ed10e7022d 100644
--- a/scripts/build/Platform/Android/pipeline.json
+++ b/scripts/build/Platform/Android/pipeline.json
@@ -13,6 +13,9 @@
         },
         "packaging": {
             "CLEAN_WORKSPACE": true
+        },
+        "nightly-clean": {
+            "CLEAN_WORKSPACE": true
         }
     }
 }
\ No newline at end of file
diff --git a/scripts/build/Platform/Linux/build_config.json b/scripts/build/Platform/Linux/build_config.json
index 426bf1d7ce..4ae4c4ec0b 100644
--- a/scripts/build/Platform/Linux/build_config.json
+++ b/scripts/build/Platform/Linux/build_config.json
@@ -29,7 +29,8 @@
   },
   "debug": {
     "TAGS": [
-      "nightly",
+      "nightly-incremental",
+      "nightly-clean",
       "weekly-build-metrics"
     ],
     "COMMAND": "build_linux.sh",
@@ -43,9 +44,10 @@
   },
   "profile": {
     "TAGS": [
-        "nightly",
-        "daily-pipeline-metrics",
-        "weekly-build-metrics"
+      "nightly-incremental",
+      "nightly-clean",
+      "daily-pipeline-metrics",
+      "weekly-build-metrics"
     ],
     "COMMAND": "build_linux.sh",
     "PARAMETERS": {
@@ -98,7 +100,9 @@
   },
   "asset_profile": {
     "TAGS": [
-      "weekly-build-metrics"
+      "weekly-build-metrics",
+      "nightly-incremental",
+      "nightly-clean"
     ],
     "COMMAND": "build_asset_linux.sh",
     "PARAMETERS": {
@@ -126,21 +130,10 @@
       "ASSET_PROCESSOR_PLATFORMS": "pc,server"
     }
   },
-  "asset_clean_profile": {
-    "TAGS": [
-      "nightly"
-    ],
-    "PIPELINE_ENV": {
-      "CLEAN_ASSETS": "1"
-    },
-    "steps": [
-      "clean",
-      "asset_profile"
-    ]
-  },
   "periodic_test_profile": {
     "TAGS": [
-      "nightly",
+      "nightly-incremental",
+      "nightly-clean",
       "weekly-build-metrics"
     ],
     "COMMAND": "build_test_linux.sh",
@@ -155,7 +148,8 @@
   },
   "benchmark_test_profile": {
     "TAGS": [
-      "nightly",
+      "nightly-incremental",
+      "nightly-clean",
       "weekly-build-metrics"
     ],
     "COMMAND": "build_test_linux.sh",
@@ -170,7 +164,8 @@
   },
   "release": {
     "TAGS": [
-      "nightly",
+      "nightly-incremental",
+      "nightly-clean",
       "weekly-build-metrics"
     ],
     "COMMAND": "build_linux.sh",
@@ -184,7 +179,8 @@
   },
   "monolithic_release": {
     "TAGS": [
-      "nightly",
+      "nightly-incremental",
+      "nightly-clean",
       "weekly-build-metrics"
     ],
     "COMMAND": "build_linux.sh",
diff --git a/scripts/build/Platform/Linux/pipeline.json b/scripts/build/Platform/Linux/pipeline.json
index ec06dff5bf..d964a693ce 100644
--- a/scripts/build/Platform/Linux/pipeline.json
+++ b/scripts/build/Platform/Linux/pipeline.json
@@ -12,6 +12,9 @@
         },
         "packaging": {
             "CLEAN_WORKSPACE": true
+        },
+        "nightly-clean": {
+            "CLEAN_WORKSPACE": true
         }
     }
 }
\ No newline at end of file
diff --git a/scripts/build/Platform/Mac/build_config.json b/scripts/build/Platform/Mac/build_config.json
index f816117331..1e6ca79d8e 100644
--- a/scripts/build/Platform/Mac/build_config.json
+++ b/scripts/build/Platform/Mac/build_config.json
@@ -9,7 +9,8 @@
   },
   "profile_pipe": {
     "TAGS": [
-      "nightly"
+      "nightly-incremental",
+      "nightly-clean"
     ],
     "steps": [
       "profile",
@@ -28,7 +29,8 @@
   },
   "debug": {
     "TAGS": [
-      "nightly",
+      "nightly-incremental",
+      "nightly-clean",
       "weekly-build-metrics"
     ],
     "COMMAND": "build_mac.sh",
@@ -56,7 +58,8 @@
   },
   "profile_nounity": {
     "TAGS": [
-      "nightly",
+      "nightly-incremental",
+      "nightly-clean",
       "weekly-build-metrics"
     ],
     "COMMAND": "build_mac.sh",
@@ -70,7 +73,9 @@
   },
   "asset_profile": {
     "TAGS": [
-        "weekly-build-metrics"
+      "weekly-build-metrics",
+      "nightly-incremental",
+      "nightly-clean"
     ],
     "COMMAND": "build_asset_mac.sh",
     "PARAMETERS": {
@@ -84,21 +89,10 @@
       "ASSET_PROCESSOR_PLATFORMS": "osx_gl"
     }
   },
-  "asset_clean_profile": {
-    "TAGS": [
-      "nightly"
-    ],
-    "PIPELINE_ENV": {
-      "CLEAN_ASSETS": "1"
-    },
-    "steps": [
-      "clean",
-      "asset_profile"
-    ]
-  },
   "periodic_test_profile": {
     "TAGS": [
-      "nightly",
+      "nightly-incremental",
+      "nightly-clean",
       "weekly-build-metrics"
     ],
     "COMMAND": "build_test_mac.sh",
@@ -113,7 +107,8 @@
   },
   "benchmark_test_profile": {
     "TAGS": [
-      "nightly",
+      "nightly-incremental",
+      "nightly-clean",
       "weekly-build-metrics"
     ],
     "COMMAND": "build_test_mac.sh",
@@ -128,7 +123,8 @@
   },
   "release": {
     "TAGS": [
-      "nightly",
+      "nightly-incremental",
+      "nightly-clean",
       "weekly-build-metrics"
     ],
     "COMMAND": "build_mac.sh",
@@ -142,7 +138,8 @@
   },
   "monolithic_release": {
     "TAGS": [
-      "nightly",
+      "nightly-incremental",
+      "nightly-clean",
       "weekly-build-metrics"
     ],
     "COMMAND": "build_mac.sh",
diff --git a/scripts/build/Platform/Mac/pipeline.json b/scripts/build/Platform/Mac/pipeline.json
index bb94f33d70..58f62b421d 100644
--- a/scripts/build/Platform/Mac/pipeline.json
+++ b/scripts/build/Platform/Mac/pipeline.json
@@ -12,6 +12,9 @@
         },
         "packaging": {
             "CLEAN_WORKSPACE": true
+        },
+        "nightly-clean": {
+            "CLEAN_WORKSPACE": true
         }
     }
 }
\ No newline at end of file
diff --git a/scripts/build/Platform/Windows/build_config.json b/scripts/build/Platform/Windows/build_config.json
index bd10c9e59a..263539cd4a 100644
--- a/scripts/build/Platform/Windows/build_config.json
+++ b/scripts/build/Platform/Windows/build_config.json
@@ -17,7 +17,8 @@
   },
   "debug_vs2019_pipe": {
     "TAGS": [
-      "nightly"
+      "nightly-incremental",
+      "nightly-clean"
     ],
     "steps": [
       "debug_vs2019",
@@ -125,7 +126,8 @@
   },
   "profile_vs2019_nounity": {
     "TAGS": [
-      "nightly",
+      "nightly-incremental",
+      "nightly-clean",
       "weekly-build-metrics"
     ],
     "COMMAND": "build_windows.cmd",
@@ -157,10 +159,11 @@
   },
   "test_gpu_profile_vs2019": {
     "TAGS":[
-        "nightly"
+      "nightly-incremental",
+      "nightly-clean"
     ],
     "PIPELINE_ENV":{
-        "NODE_LABEL":"windows-gpu"
+      "NODE_LABEL":"windows-gpu"
     },
     "COMMAND": "build_test_windows.cmd",
     "PARAMETERS": {
@@ -176,7 +179,9 @@
   },
   "asset_profile_vs2019": {
     "TAGS": [
-        "weekly-build-metrics"
+      "weekly-build-metrics",
+      "nightly-incremental",
+      "nightly-clean"
     ],
     "COMMAND": "build_asset_windows.cmd",
     "PARAMETERS": {
@@ -191,21 +196,10 @@
       "ASSET_PROCESSOR_PLATFORMS": "pc,server"
     }
   },
-  "asset_clean_profile_vs2019": {
-    "TAGS": [
-      "nightly"
-    ],
-    "PIPELINE_ENV": {
-      "CLEAN_ASSETS": "1"
-    },
-    "steps": [
-      "clean",
-      "asset_profile_vs2019"
-    ]
-  },
   "periodic_test_profile_vs2019": {
     "TAGS": [
-      "nightly",
+      "nightly-incremental",
+      "nightly-clean",
       "weekly-build-metrics"
     ],
     "COMMAND": "build_test_windows.cmd",
@@ -222,7 +216,8 @@
   },
   "sandbox_test_profile_vs2019": {
     "TAGS": [
-      "nightly",
+      "nightly-incremental",
+      "nightly-clean",
       "weekly-build-metrics"
     ],
     "PIPELINE_ENV": {
@@ -242,7 +237,8 @@
   },
   "benchmark_test_profile_vs2019": {
     "TAGS": [
-      "nightly",
+      "nightly-incremental",
+      "nightly-clean",
       "weekly-build-metrics"
     ],
     "COMMAND": "build_test_windows.cmd",
@@ -259,7 +255,8 @@
   },
   "release_vs2019": {
     "TAGS": [
-      "nightly",
+      "nightly-incremental",
+      "nightly-clean",
       "weekly-build-metrics"
     ],
     "COMMAND": "build_windows.cmd",
@@ -274,7 +271,8 @@
   },
   "monolithic_release_vs2019": {
     "TAGS": [
-      "nightly",
+      "nightly-incremental",
+      "nightly-clean",
       "weekly-build-metrics"
     ],
     "COMMAND": "build_windows.cmd",
@@ -289,7 +287,8 @@
   },
   "install_profile_vs2019": {
     "TAGS": [
-      "nightly"
+      "nightly-incremental",
+      "nightly-clean"
     ],
     "COMMAND": "build_windows.cmd",
     "PARAMETERS": {
diff --git a/scripts/build/Platform/Windows/pipeline.json b/scripts/build/Platform/Windows/pipeline.json
index 380b8c1a48..5f10ccc7ae 100644
--- a/scripts/build/Platform/Windows/pipeline.json
+++ b/scripts/build/Platform/Windows/pipeline.json
@@ -12,6 +12,9 @@
         },
         "packaging": {
             "CLEAN_WORKSPACE": true
+        },
+        "nightly-clean": {
+            "CLEAN_WORKSPACE": true
         }
     }
 }
\ No newline at end of file
diff --git a/scripts/build/Platform/iOS/build_config.json b/scripts/build/Platform/iOS/build_config.json
index 921262e267..75b5e7b10d 100644
--- a/scripts/build/Platform/iOS/build_config.json
+++ b/scripts/build/Platform/iOS/build_config.json
@@ -19,7 +19,8 @@
   },
   "debug": {
     "TAGS": [
-      "nightly",
+      "nightly-incremental",
+      "nightly-clean",
       "weekly-build-metrics"
     ],
     "COMMAND": "../Mac/build_mac.sh",
@@ -34,7 +35,8 @@
   },
   "profile": {
     "TAGS": [
-      "nightly",
+      "nightly-incremental",
+      "nightly-clean",
       "daily-pipeline-metrics",
       "weekly-build-metrics"
     ],
@@ -50,7 +52,8 @@
   },
   "profile_nounity": {
     "TAGS": [
-      "nightly",
+      "nightly-incremental",
+      "nightly-clean",
       "weekly-build-metrics"
     ],
     "COMMAND": "../Mac/build_mac.sh",
@@ -65,7 +68,8 @@
   },
   "asset_profile": {
     "TAGS": [
-      "nightly",
+      "nightly-incremental",
+      "nightly-clean",
       "weekly-build-metrics"
     ],
     "COMMAND": "../Mac/build_asset_mac.sh",
@@ -80,21 +84,10 @@
       "ASSET_PROCESSOR_PLATFORMS": "ios"
     }
   },
-  "asset_clean_profile": {
-    "TAGS": [
-      "nightly"
-    ],
-    "PIPELINE_ENV": {
-      "CLEAN_ASSETS": "true"
-    },
-    "steps": [
-        "clean",
-        "asset_profile"
-    ]
-  },
   "release": {
     "TAGS": [
-      "nightly",
+      "nightly-incremental",
+      "nightly-clean",
       "weekly-build-metrics"
     ],
     "COMMAND": "../Mac/build_mac.sh",
diff --git a/scripts/build/Platform/iOS/pipeline.json b/scripts/build/Platform/iOS/pipeline.json
index bb94f33d70..58f62b421d 100644
--- a/scripts/build/Platform/iOS/pipeline.json
+++ b/scripts/build/Platform/iOS/pipeline.json
@@ -12,6 +12,9 @@
         },
         "packaging": {
             "CLEAN_WORKSPACE": true
+        },
+        "nightly-clean": {
+            "CLEAN_WORKSPACE": true
         }
     }
 }
\ No newline at end of file