diff --git a/.gitea/workflows/deploy-and-restart-service.yml b/.gitea/workflows/deploy-and-restart-service.yml
index a49a636..a4ab60d 100644
--- a/.gitea/workflows/deploy-and-restart-service.yml
+++ b/.gitea/workflows/deploy-and-restart-service.yml
@@ -62,6 +62,6 @@ jobs:
           # 3. Fire the playbook passing variables down
           ansible-playbook playbooks/deploy-and-restart-modified-services.yml \
             -i hosts.yml \
-            -e "changed_services_raw=$CHANGED_SVC" \
+            -e 'changed_services_raw="$CHANGED_SVC"' \
             -e "agebd_env=$AGEBD_ENV" \
             -vvv
diff --git a/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py b/services/dbpm3curr/current/app/src/agebd_dbpm3curr/main.py
index 64b4404..afba98b 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 2
+# TODO: remove: cicd test 3
 
 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 00adcbf..9a7cd91 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 2
+# TODO: remove: cicd test 3
 
 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 1b70e8b..db5be9d 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 2
+# TODO: remove: cicd test 3
 
 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 c94a256..ec0daf3 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 2
+# TODO: remove: cicd test 3
 
 def main(
     log_level: LogLevel = typer.Option(