diff --git a/commonimages/base/shared.auto.tfvars b/commonimages/base/shared.auto.tfvars
index dba6414f..ec9d351d 100644
--- a/commonimages/base/shared.auto.tfvars
+++ b/commonimages/base/shared.auto.tfvars
@@ -3,7 +3,8 @@ ami_name_prefix = "base"
 
 image_pipeline = {
   schedule = {
-    schedule_expression = "cron(0 0 1 * ? *)"
+    schedule_expression                = "cron(0 0 1 * ? *)"
+    pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
   }
 }
 
diff --git a/commonimages/base/windows_2012_r2/terraform.tfvars b/commonimages/base/windows_2012_r2/terraform.tfvars
index 1df9912b..fdbde0f0 100644
--- a/commonimages/base/windows_2012_r2/terraform.tfvars
+++ b/commonimages/base/windows_2012_r2/terraform.tfvars
@@ -4,7 +4,7 @@
 
 region                = "eu-west-2"
 ami_base_name         = "windows_server_2012_r2"
-configuration_version = "0.1.0"
+configuration_version = "0.1.1"
 release_or_patch      = "release" # or "patch", see nomis AMI image building strategy doc
 description           = "Windows Server 2012 R2"
 
@@ -46,7 +46,8 @@ infrastructure_configuration = {
 
 image_pipeline = {
   schedule = {
-    schedule_expression = "cron(0 0 2 * ? *)"
+    schedule_expression                = "cron(0 0 2 * ? *)"
+    pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
   }
 }
 
diff --git a/commonimages/base/windows_2012_r2_SQL_2014/terraform.tfvars b/commonimages/base/windows_2012_r2_SQL_2014/terraform.tfvars
index 36b313e2..fc74ec24 100644
--- a/commonimages/base/windows_2012_r2_SQL_2014/terraform.tfvars
+++ b/commonimages/base/windows_2012_r2_SQL_2014/terraform.tfvars
@@ -4,7 +4,7 @@
 
 region                = "eu-west-2"
 ami_base_name         = "windows_server_2012_r2_SQL_2014_enterprise"
-configuration_version = "0.0.4"
+configuration_version = "0.0.5"
 release_or_patch      = "release" # or "patch", see nomis AMI image building strategy doc
 description           = "Windows Server 2012 R2 with SQL 2014 Enterprise"
 
@@ -44,7 +44,8 @@ infrastructure_configuration = {
 
 image_pipeline = {
   schedule = {
-    schedule_expression = "cron(0 0 2 * ? *)"
+    schedule_expression                = "cron(0 0 2 * ? *)"
+    pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
   }
 }
 
diff --git a/teams/delius-core/oracle_db/terraform.tfvars b/teams/delius-core/oracle_db/terraform.tfvars
index e6c67fdd..e6c88549 100644
--- a/teams/delius-core/oracle_db/terraform.tfvars
+++ b/teams/delius-core/oracle_db/terraform.tfvars
@@ -5,7 +5,7 @@
 region                = "eu-west-2"
 ami_name_prefix       = "delius_core_ol_8_5"
 ami_base_name         = "oracle_db_19c"
-configuration_version = "0.0.7"
+configuration_version = "0.0.8"
 release_or_patch      = "patch" # see nomis AMI image building strategy doc
 description           = "Delius Core Oracle Database Image"
 
@@ -36,7 +36,8 @@ infrastructure_configuration = {
 
 image_pipeline = {
   schedule = {
-    schedule_expression = "cron(0 0 2 * ? *)"
+    schedule_expression                = "cron(0 0 2 * ? *)"
+    pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
   }
 }
 
diff --git a/teams/delius-iaps/iaps_server/terraform.tfvars b/teams/delius-iaps/iaps_server/terraform.tfvars
index a88ad7bd..ceebaf1f 100644
--- a/teams/delius-iaps/iaps_server/terraform.tfvars
+++ b/teams/delius-iaps/iaps_server/terraform.tfvars
@@ -5,7 +5,7 @@
 region                = "eu-west-2"
 ami_name_prefix       = "delius"
 ami_base_name         = "iaps_server"
-configuration_version = "0.0.31"
+configuration_version = "0.0.32"
 
 release_or_patch = "patch" # see nomis AMI image building strategy doc
 description      = "Delius IAPS server"
@@ -103,7 +103,8 @@ infrastructure_configuration = {
 
 image_pipeline = {
   schedule = {
-    schedule_expression = "cron(0 0 2 * ? *)"
+    schedule_expression                = "cron(0 0 2 * ? *)"
+    pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
   }
 }
 
diff --git a/teams/hmpps/ol_8_5_oracledb_19c/terraform.tfvars b/teams/hmpps/ol_8_5_oracledb_19c/terraform.tfvars
index c41b0ab9..530f1a34 100644
--- a/teams/hmpps/ol_8_5_oracledb_19c/terraform.tfvars
+++ b/teams/hmpps/ol_8_5_oracledb_19c/terraform.tfvars
@@ -5,7 +5,7 @@
 region                = "eu-west-2"
 ami_name_prefix       = "hmpps"
 ami_base_name         = "ol_8_5_oracledb_19c"
-configuration_version = "0.0.4"
+configuration_version = "0.0.5"
 release_or_patch      = "release" # or "patch", see nomis AMI image building strategy doc
 description           = "hmpps oracle 19c image on oracle linux 8.5"
 
@@ -90,7 +90,8 @@ infrastructure_configuration = {
 
 image_pipeline = {
   schedule = {
-    schedule_expression = "cron(0 0 2 * ? *)"
+    schedule_expression                = "cron(0 0 2 * ? *)"
+    pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
   }
 }
 
diff --git a/teams/hmpps/rhel_8_5/terraform.tfvars b/teams/hmpps/rhel_8_5/terraform.tfvars
index 6282f9a3..0953ced4 100644
--- a/teams/hmpps/rhel_8_5/terraform.tfvars
+++ b/teams/hmpps/rhel_8_5/terraform.tfvars
@@ -5,7 +5,7 @@
 region                = "eu-west-2"
 ami_name_prefix       = "hmpps"
 ami_base_name         = "rhel_8_5_join_to_azure"
-configuration_version = "0.0.1"
+configuration_version = "0.0.2"
 release_or_patch      = "release" # or "patch", see nomis AMI image building strategy doc
 description           = "hmpps rhel 8.5 join to Azure domain"
 
@@ -45,7 +45,8 @@ infrastructure_configuration = {
 
 image_pipeline = {
   schedule = {
-    schedule_expression = "cron(0 0 2 * ? *)"
+    schedule_expression                = "cron(0 0 2 * ? *)"
+    pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
   }
 }
 
diff --git a/teams/hmpps/windows_server_2022/terraform.tfvars b/teams/hmpps/windows_server_2022/terraform.tfvars
index 3faab186..b1695d44 100644
--- a/teams/hmpps/windows_server_2022/terraform.tfvars
+++ b/teams/hmpps/windows_server_2022/terraform.tfvars
@@ -5,7 +5,7 @@
 region                = "eu-west-2"
 ami_name_prefix       = "hmpps"
 ami_base_name         = "windows_server_2022"
-configuration_version = "0.0.5"
+configuration_version = "0.0.6"
 release_or_patch      = "release" # or "patch", see nomis AMI image building strategy doc
 description           = "windows server 2022"
 
@@ -39,7 +39,8 @@ infrastructure_configuration = {
 
 image_pipeline = {
   schedule = {
-    schedule_expression = "cron(0 0 2 * ? *)"
+    schedule_expression                = "cron(0 0 2 * ? *)"
+    pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
   }
 }
 
diff --git a/teams/nomis-data-hub/rhel_7_9_app/terraform.tfvars b/teams/nomis-data-hub/rhel_7_9_app/terraform.tfvars
index d00f0967..362eca18 100644
--- a/teams/nomis-data-hub/rhel_7_9_app/terraform.tfvars
+++ b/teams/nomis-data-hub/rhel_7_9_app/terraform.tfvars
@@ -5,7 +5,7 @@
 region                = "eu-west-2"
 ami_name_prefix       = "nomis_data_hub"
 ami_base_name         = "rhel_7_9_app"
-configuration_version = "0.0.1"
+configuration_version = "0.0.2"
 release_or_patch      = "release" # or "patch", see nomis AMI image building strategy doc
 description           = "nomis data hub rhel 7.9 app image"
 
@@ -36,7 +36,8 @@ infrastructure_configuration = {
 
 image_pipeline = {
   schedule = {
-    schedule_expression = "cron(0 0 2 * ? *)"
+    schedule_expression                = "cron(0 0 2 * ? *)"
+    pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
   }
 }
 
diff --git a/teams/nomis-data-hub/rhel_7_9_ems/terraform.tfvars b/teams/nomis-data-hub/rhel_7_9_ems/terraform.tfvars
index d1054cbe..bfb097a1 100644
--- a/teams/nomis-data-hub/rhel_7_9_ems/terraform.tfvars
+++ b/teams/nomis-data-hub/rhel_7_9_ems/terraform.tfvars
@@ -5,7 +5,7 @@
 region                = "eu-west-2"
 ami_name_prefix       = "nomis_data_hub"
 ami_base_name         = "rhel_7_9_ems"
-configuration_version = "0.0.1"
+configuration_version = "0.0.2"
 release_or_patch      = "release" # or "patch", see nomis AMI image building strategy doc
 description           = "nomis data hub rhel 7.9 ems image"
 
@@ -36,7 +36,8 @@ infrastructure_configuration = {
 
 image_pipeline = {
   schedule = {
-    schedule_expression = "cron(0 0 2 * ? *)"
+    schedule_expression                = "cron(0 0 2 * ? *)"
+    pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
   }
 }
 
diff --git a/teams/nomis/rhel_6_10_weblogic_appserver_10_3/terraform.tfvars b/teams/nomis/rhel_6_10_weblogic_appserver_10_3/terraform.tfvars
index 36557c37..bbdd7f01 100644
--- a/teams/nomis/rhel_6_10_weblogic_appserver_10_3/terraform.tfvars
+++ b/teams/nomis/rhel_6_10_weblogic_appserver_10_3/terraform.tfvars
@@ -5,7 +5,7 @@
 region                = "eu-west-2"
 ami_name_prefix       = "nomis"
 ami_base_name         = "rhel_6_10_weblogic_appserver_10_3"
-configuration_version = "0.2.4"
+configuration_version = "0.2.5"
 release_or_patch      = "release" # or "patch", see nomis AMI image building strategy doc
 description           = "nomis rhel 6.10 weblogic appserver image"
 
@@ -48,7 +48,8 @@ infrastructure_configuration = {
 
 image_pipeline = {
   schedule = {
-    schedule_expression = "cron(0 0 2 * ? *)"
+    schedule_expression                = "cron(0 0 2 * ? *)"
+    pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
   }
 }
 
diff --git a/teams/nomis/rhel_7_9_oracledb_11_2/terraform.tfvars b/teams/nomis/rhel_7_9_oracledb_11_2/terraform.tfvars
index 4148ee6b..9d070a17 100644
--- a/teams/nomis/rhel_7_9_oracledb_11_2/terraform.tfvars
+++ b/teams/nomis/rhel_7_9_oracledb_11_2/terraform.tfvars
@@ -5,7 +5,7 @@
 region                = "eu-west-2"
 ami_name_prefix       = "nomis"
 ami_base_name         = "rhel_7_9_oracledb_11_2"
-configuration_version = "0.4.5"
+configuration_version = "0.4.6"
 release_or_patch      = "release" # or "patch", see nomis AMI image building strategy doc
 description           = "nomis rhel 7.9 oracleDB 11.2 image"
 
@@ -92,7 +92,8 @@ infrastructure_configuration = {
 
 image_pipeline = {
   schedule = {
-    schedule_expression = "cron(0 0 2 * ? *)"
+    schedule_expression                = "cron(0 0 2 * ? *)"
+    pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
   }
 }
 
diff --git a/teams/nomis/rhel_7_9_weblogic_xtag_10_3/terraform.tfvars b/teams/nomis/rhel_7_9_weblogic_xtag_10_3/terraform.tfvars
index 5fdf8633..9a50f471 100644
--- a/teams/nomis/rhel_7_9_weblogic_xtag_10_3/terraform.tfvars
+++ b/teams/nomis/rhel_7_9_weblogic_xtag_10_3/terraform.tfvars
@@ -5,7 +5,7 @@
 region                = "eu-west-2"
 ami_name_prefix       = "nomis"
 ami_base_name         = "rhel_7_9_weblogic_xtag_10_3"
-configuration_version = "0.0.4"
+configuration_version = "0.0.5"
 release_or_patch      = "release" # or "patch", see nomis AMI image building strategy doc
 description           = "nomis rhel 7.9 weblogic XTAG image"
 
@@ -48,7 +48,8 @@ infrastructure_configuration = {
 
 image_pipeline = {
   schedule = {
-    schedule_expression = "cron(0 0 2 * ? *)"
+    schedule_expression                = "cron(0 0 2 * ? *)"
+    pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
   }
 }
 
diff --git a/teams/oasys/bip/terraform.tfvars b/teams/oasys/bip/terraform.tfvars
index 2a89d8e6..1193c390 100644
--- a/teams/oasys/bip/terraform.tfvars
+++ b/teams/oasys/bip/terraform.tfvars
@@ -5,7 +5,7 @@
 region                = "eu-west-2"
 ami_name_prefix       = "oasys"
 ami_base_name         = "bip"
-configuration_version = "0.0.1"
+configuration_version = "0.0.2"
 release_or_patch      = "release"
 description           = "oasys bip image"
 
@@ -58,7 +58,8 @@ infrastructure_configuration = {
 
 image_pipeline = {
   schedule = {
-    schedule_expression = "cron(0 0 2 * ? *)"
+    schedule_expression                = "cron(0 0 2 * ? *)"
+    pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
   }
 }
 
diff --git a/teams/oasys/oracle_db/terraform.tfvars b/teams/oasys/oracle_db/terraform.tfvars
index 08d395ae..1a341b5b 100644
--- a/teams/oasys/oracle_db/terraform.tfvars
+++ b/teams/oasys/oracle_db/terraform.tfvars
@@ -5,7 +5,7 @@
 region                = "eu-west-2"
 ami_name_prefix       = "oasys"
 ami_base_name         = "oracle_db"
-configuration_version = "0.1.0"
+configuration_version = "0.1.1"
 release_or_patch      = "release"
 description           = "oasys oracle db image"
 
@@ -70,7 +70,8 @@ infrastructure_configuration = {
 
 image_pipeline = {
   schedule = {
-    schedule_expression = "cron(0 0 2 * ? *)"
+    schedule_expression                = "cron(0 0 2 * ? *)"
+    pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
   }
 }
 
diff --git a/teams/oasys/weblogic/terraform.tfvars b/teams/oasys/weblogic/terraform.tfvars
index c9cf741d..468a12fd 100644
--- a/teams/oasys/weblogic/terraform.tfvars
+++ b/teams/oasys/weblogic/terraform.tfvars
@@ -5,7 +5,7 @@
 region                = "eu-west-2"
 ami_name_prefix       = "oasys"
 ami_base_name         = "weblogic"
-configuration_version = "0.0.1"
+configuration_version = "0.0.2"
 release_or_patch      = "release" # or "patch", see nomis AMI image building strategy doc
 description           = "oasys weblogic app server image"
 
@@ -44,7 +44,8 @@ infrastructure_configuration = {
 
 image_pipeline = {
   schedule = {
-    schedule_expression = "cron(0 0 2 * ? *)"
+    schedule_expression                = "cron(0 0 2 * ? *)"
+    pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
   }
 }
 
diff --git a/teams/oasys/webserver/terraform.tfvars b/teams/oasys/webserver/terraform.tfvars
index 4839d44a..1fb9975a 100644
--- a/teams/oasys/webserver/terraform.tfvars
+++ b/teams/oasys/webserver/terraform.tfvars
@@ -5,7 +5,7 @@
 region                = "eu-west-2"
 ami_name_prefix       = "oasys"
 ami_base_name         = "webserver"
-configuration_version = "0.0.9"
+configuration_version = "0.0.10"
 release_or_patch      = "release"
 description           = "oasys webserver image"
 
@@ -58,7 +58,8 @@ infrastructure_configuration = {
 
 image_pipeline = {
   schedule = {
-    schedule_expression = "cron(0 0 2 * ? *)"
+    schedule_expression                = "cron(0 0 2 * ? *)"
+    pipeline_execution_start_condition = "EXPRESSION_MATCH_ONLY"
   }
 }