diff --git a/bin/start_service.sh b/bin/start_service.sh
index a143804..972cc33 100755
--- a/bin/start_service.sh
+++ b/bin/start_service.sh
@@ -37,3 +37,5 @@ 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
diff --git a/packages/agebd/src/agebd/service/pvs.py b/packages/agebd/src/agebd/service/pvs.py
index f76448e..3b9970d 100644
--- a/packages/agebd/src/agebd/service/pvs.py
+++ b/packages/agebd/src/agebd/service/pvs.py
@@ -1,5 +1,8 @@
 from agebd.pv import PVLink
 
+# TODO: remove: cicd test 5
+
+
 class BasePVs:
     def __init__(self, svc: str, pv_factory=PVLink):
         # fmt: off
@@ -12,4 +15,5 @@ class BasePVs:
         self.running  = pv_factory(f'AGEBD-ALH:{svc}-ONOFF-RB.VAL')
         self.abort    = pv_factory(f'AGEBD-MASTER:{svc}-ABORT.VAL')
         self.abortreq = pv_factory(f'AGEBD-MASTER:{svc}-ABORT-REQ.VAL')
-        # fmt: on
\ No newline at end of file
+        # fmt: on
+
diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py
index 5a132fd..b40fc38 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 4
+# TODO: remove: cicd test 5
 
 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 e453f17..4d005a7 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 4
+# TODO: remove: cicd test 5
 
 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 131f070..6f2b2c2 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 4
+# TODO: remove: cicd test 5
 
 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 244f743..2e839e2 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 4
+# TODO: remove: cicd test 5
 
 def main(
     log_level: LogLevel = typer.Option(