diff --git a/infrastructure/modules/container-apps/jobs.tf b/infrastructure/modules/container-apps/jobs.tf
index c2a979d7e..556a0ad7f 100644
--- a/infrastructure/modules/container-apps/jobs.tf
+++ b/infrastructure/modules/container-apps/jobs.tf
@@ -110,7 +110,7 @@ module "scheduled_jobs" {
   source = "../dtos-devops-templates/infrastructure/modules/container-app-job"
   for_each = {
     for k, v in local.scheduled_jobs : k => v
-    if var.run_notifications_smoke_test
+    if(var.run_notifications_smoke_test || k != "smoke_test")
   }
 
   name                         = "${var.app_short_name}-${each.value.job_short_name}-${var.environment}"
diff --git a/scripts/terraform/terraform.mk b/scripts/terraform/terraform.mk
index 0bea99ee4..bb390086b 100644
--- a/scripts/terraform/terraform.mk
+++ b/scripts/terraform/terraform.mk
@@ -76,8 +76,9 @@ terraform-validate: terraform-init-no-backend # Validate Terraform changes - mak
 	terraform -chdir=infrastructure/terraform validate
 
 notifications-smoke-test:
-	$(if ${TF_VAR_run_notifications_smoke_test}, \
-		pip install pytest mesh-client \
-		pytest -vv scripts/python/smoke_test/notifications_smoke_test.py, \
-		echo "Notifications smoke test skipped." \
-	)
+	if test "${RUN_NOTIFICATIONS_SMOKE_TEST}" == "true"; then
+		pip install pytest mesh-client
+		pytest -vv scripts/python/smoke_test/notifications_smoke_test.py
+	else
+		echo "Skipping notifications smoke test"
+	fi