diff --git a/bin/start_service.sh b/bin/start_service.sh
index 972cc33..4d3a1e3 100755
--- a/bin/start_service.sh
+++ b/bin/start_service.sh
@@ -38,4 +38,4 @@ source ${APP_DIR}/.venv/bin/activate
 # TODO: use `exec python3 ...` here?
 python -u -B -m agebd_${SVC_NAME_LOWER_UNDERSCORES}.main
 
-# TODO: remove: cicd test 5
+# TODO: remove: cicd test 6
diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py
index 3b9970d..1ce1843 100644
--- a/packages/agebd/src/agebd/service/pvs.py
+++ b/packages/agebd/src/agebd/service/pvs.py
@@ -1,6 +1,6 @@
 from agebd.pv import PVLink
 
-# TODO: remove: cicd test 5
+# TODO: remove: cicd test 6
 
 
 class BasePVs:
diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py
index b40fc38..4a7f61a 100644
--- a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py
+++ b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py
@@ -6,7 +6,7 @@ from agebd.utils import init_logging
 from agebd_dbpm3curr import PVs, Service
 
 
-# TODO: remove: cicd test 5
+# TODO: remove: cicd test 6
 
 def main(
     log_level: LogLevel = typer.Option(
diff --git a/services/master/current/app/src/agebd_master/main.py b/services/master/current/app/src/agebd_master/main.py
index 4d005a7..e20f3f4 100644
--- a/services/master/current/app/src/agebd_master/main.py
+++ b/services/master/current/app/src/agebd_master/main.py
@@ -6,7 +6,7 @@ from agebd.utils import init_logging
 from agebd_master import PVs, Service
 
 
-# TODO: remove: cicd test 5
+# TODO: remove: cicd test 6
 
 def main(
     log_level: LogLevel = typer.Option(
diff --git a/services/nturns/current/app/src/agebd_nturns/main.py b/services/nturns/current/app/src/agebd_nturns/main.py
index 6f2b2c2..c7aa60f 100644
--- a/services/nturns/current/app/src/agebd_nturns/main.py
+++ b/services/nturns/current/app/src/agebd_nturns/main.py
@@ -6,7 +6,7 @@ from agebd.utils import init_logging
 from agebd_nturns import PVs, Service
 
 
-# TODO: remove: cicd test 5
+# TODO: remove: cicd test 6
 
 def main(
     log_level: LogLevel = typer.Option(
diff --git a/templates/service/{{service_name_lower}}/current/app/src/agebd_{{service_name_lower_underscores}}/main.py.jinja b/templates/service/{{service_name_lower}}/current/app/src/agebd_{{service_name_lower_underscores}}/main.py.jinja
index 2e839e2..d2502e9 100644
--- a/templates/service/{{service_name_lower}}/current/app/src/agebd_{{service_name_lower_underscores}}/main.py.jinja
+++ b/templates/service/{{service_name_lower}}/current/app/src/agebd_{{service_name_lower_underscores}}/main.py.jinja
@@ -6,7 +6,7 @@ from agebd.utils import init_logging
 from agebd_{{service_name_lower_underscores}} import PVs, Service
 
 
-# TODO: remove: cicd test 5
+# TODO: remove: cicd test 6
 
 def main(
     log_level: LogLevel = typer.Option(