diff --git a/ansible/plays/service-deploy.yml b/ansible/plays/service-deploy.yml
index ccc198b..b6bf7f6 100644
--- a/ansible/plays/service-deploy.yml
+++ b/ansible/plays/service-deploy.yml
@@ -13,7 +13,7 @@
 
 - name: "[{{ service_dir_name }}] Sync service deployment files"
   ansible.builtin.copy:
-    src: "{{ playbook_dir }}/../services/{{ service_dir_name }}/"
+    src: "{{ playbook_dir }}/../services/{{ service_dir_name }}/current/"
     dest: "{{ svc_current_dir }}/"
     mode: 'preserve'
 
diff --git a/services/000-master/app/config/hla_names.yml b/services/000-master/current/app/config/hla_names.yml
similarity index 100%
rename from services/000-master/app/config/hla_names.yml
rename to services/000-master/current/app/config/hla_names.yml
diff --git a/services/000-master/app/pyproject.toml b/services/000-master/current/app/pyproject.toml
similarity index 59%
rename from services/000-master/app/pyproject.toml
rename to services/000-master/current/app/pyproject.toml
index 53fc030..5f39d89 100644
--- a/services/000-master/app/pyproject.toml
+++ b/services/000-master/current/app/pyproject.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 description = "AGEBD-MASTER Service"
 requires-python = ">=3.9"
 dependencies = [
-    "agebd==1.2.0",  # TODO: how to push package to gitea? 
+    "agebd", # TODO: package in gitea?
     "pyyaml>=6.0.3",
 ]
 
@@ -14,11 +14,8 @@ dev = [
     "ruff>=0.15.20",
 ]
 
-# This tells uv where to look for 'agebd' during LOCAL dev work
 [tool.uv.sources]
-# Path is relative to where agebd package is deployed on hla 
-# machines (see CI/CD in .gitea/workflows)
-agebd = { path = "../../../../packages/agebd", editable = true }
+agebd = { workspace = true }
 
 [tool.ruff]
 include = [
diff --git a/services/000-master/app/src/AGEBD-SERVICE-MASTER.py b/services/000-master/current/app/src/AGEBD-SERVICE-MASTER.py
similarity index 100%
rename from services/000-master/app/src/AGEBD-SERVICE-MASTER.py
rename to services/000-master/current/app/src/AGEBD-SERVICE-MASTER.py
diff --git a/services/000-master/app/src/__init__.py b/services/000-master/current/app/src/__init__.py
similarity index 100%
rename from services/000-master/app/src/__init__.py
rename to services/000-master/current/app/src/__init__.py
diff --git a/services/000-master/app/uv.lock b/services/000-master/current/app/uv.lock
similarity index 100%
rename from services/000-master/app/uv.lock
rename to services/000-master/current/app/uv.lock
diff --git a/services/000-master/ioc/AGEBD-CPCL-MASTER-DEV_main.subs b/services/000-master/current/ioc/AGEBD-CPCL-MASTER-DEV_main.subs
similarity index 100%
rename from services/000-master/ioc/AGEBD-CPCL-MASTER-DEV_main.subs
rename to services/000-master/current/ioc/AGEBD-CPCL-MASTER-DEV_main.subs
diff --git a/services/000-master/ioc/AGEBD-CPCL-MASTER-DEV_parameters.yaml b/services/000-master/current/ioc/AGEBD-CPCL-MASTER-DEV_parameters.yaml
similarity index 100%
rename from services/000-master/ioc/AGEBD-CPCL-MASTER-DEV_parameters.yaml
rename to services/000-master/current/ioc/AGEBD-CPCL-MASTER-DEV_parameters.yaml
diff --git a/services/000-master/ioc/AGEBD-CPCL-MASTER_main.subs b/services/000-master/current/ioc/AGEBD-CPCL-MASTER_main.subs
similarity index 100%
rename from services/000-master/ioc/AGEBD-CPCL-MASTER_main.subs
rename to services/000-master/current/ioc/AGEBD-CPCL-MASTER_main.subs
diff --git a/services/000-master/ioc/AGEBD-CPCL-MASTER_parameters.yaml b/services/000-master/current/ioc/AGEBD-CPCL-MASTER_parameters.yaml
similarity index 100%
rename from services/000-master/ioc/AGEBD-CPCL-MASTER_parameters.yaml
rename to services/000-master/current/ioc/AGEBD-CPCL-MASTER_parameters.yaml
diff --git a/services/000-master/ioc/MASTER.template b/services/000-master/current/ioc/MASTER.template
similarity index 100%
rename from services/000-master/ioc/MASTER.template
rename to services/000-master/current/ioc/MASTER.template
diff --git a/services/000-master/ioc/startup.script b/services/000-master/current/ioc/startup.script
similarity index 100%
rename from services/000-master/ioc/startup.script
rename to services/000-master/current/ioc/startup.script
diff --git a/services/000-master/qt/A_BD_Master.ui b/services/000-master/current/qt/A_BD_Master.ui
similarity index 100%
rename from services/000-master/qt/A_BD_Master.ui
rename to services/000-master/current/qt/A_BD_Master.ui
diff --git a/services/000-master/systemd/AGEBD-SERVICE-MASTER.service b/services/000-master/current/systemd/AGEBD-SERVICE-MASTER.service
similarity index 100%
rename from services/000-master/systemd/AGEBD-SERVICE-MASTER.service
rename to services/000-master/current/systemd/AGEBD-SERVICE-MASTER.service
diff --git a/templates/service/{{service_id}}-{{service_name_lower}}/app/pyproject.toml.jinja b/templates/service/{{service_id}}-{{service_name_lower}}/current/app/pyproject.toml.jinja
similarity index 100%
rename from templates/service/{{service_id}}-{{service_name_lower}}/app/pyproject.toml.jinja
rename to templates/service/{{service_id}}-{{service_name_lower}}/current/app/pyproject.toml.jinja
diff --git a/templates/service/{{service_id}}-{{service_name_lower}}/app/src/AGEBD-SERVICE-{{service_name_upper}}.py.jinja b/templates/service/{{service_id}}-{{service_name_lower}}/current/app/src/AGEBD-SERVICE-{{service_name_upper}}.py.jinja
similarity index 100%
rename from templates/service/{{service_id}}-{{service_name_lower}}/app/src/AGEBD-SERVICE-{{service_name_upper}}.py.jinja
rename to templates/service/{{service_id}}-{{service_name_lower}}/current/app/src/AGEBD-SERVICE-{{service_name_upper}}.py.jinja
diff --git a/templates/service/{{service_id}}-{{service_name_lower}}/app/src/__init__.py b/templates/service/{{service_id}}-{{service_name_lower}}/current/app/src/__init__.py
similarity index 100%
rename from templates/service/{{service_id}}-{{service_name_lower}}/app/src/__init__.py
rename to templates/service/{{service_id}}-{{service_name_lower}}/current/app/src/__init__.py
diff --git a/templates/service/{{service_id}}-{{service_name_lower}}/ioc/AGEBD-CPCL-{{service_name_upper}}_main.subs.jinja b/templates/service/{{service_id}}-{{service_name_lower}}/current/ioc/AGEBD-CPCL-{{service_name_upper}}_main.subs.jinja
similarity index 100%
rename from templates/service/{{service_id}}-{{service_name_lower}}/ioc/AGEBD-CPCL-{{service_name_upper}}_main.subs.jinja
rename to templates/service/{{service_id}}-{{service_name_lower}}/current/ioc/AGEBD-CPCL-{{service_name_upper}}_main.subs.jinja
diff --git a/templates/service/{{service_id}}-{{service_name_lower}}/ioc/AGEBD-CPCL-{{service_name_upper}}_parameters.yaml.jinja b/templates/service/{{service_id}}-{{service_name_lower}}/current/ioc/AGEBD-CPCL-{{service_name_upper}}_parameters.yaml.jinja
similarity index 100%
rename from templates/service/{{service_id}}-{{service_name_lower}}/ioc/AGEBD-CPCL-{{service_name_upper}}_parameters.yaml.jinja
rename to templates/service/{{service_id}}-{{service_name_lower}}/current/ioc/AGEBD-CPCL-{{service_name_upper}}_parameters.yaml.jinja
diff --git a/templates/service/{{service_id}}-{{service_name_lower}}/ioc/startup.script.jinja b/templates/service/{{service_id}}-{{service_name_lower}}/current/ioc/startup.script.jinja
similarity index 100%
rename from templates/service/{{service_id}}-{{service_name_lower}}/ioc/startup.script.jinja
rename to templates/service/{{service_id}}-{{service_name_lower}}/current/ioc/startup.script.jinja
diff --git a/templates/service/{{service_id}}-{{service_name_lower}}/ioc/{{service_name_upper}}.template b/templates/service/{{service_id}}-{{service_name_lower}}/current/ioc/{{service_name_upper}}.template
similarity index 100%
rename from templates/service/{{service_id}}-{{service_name_lower}}/ioc/{{service_name_upper}}.template
rename to templates/service/{{service_id}}-{{service_name_lower}}/current/ioc/{{service_name_upper}}.template
diff --git a/templates/service/{{service_id}}-{{service_name_lower}}/qt/{{service_name_upper}}.ui.jinja b/templates/service/{{service_id}}-{{service_name_lower}}/current/qt/{{service_name_upper}}.ui.jinja
similarity index 100%
rename from templates/service/{{service_id}}-{{service_name_lower}}/qt/{{service_name_upper}}.ui.jinja
rename to templates/service/{{service_id}}-{{service_name_lower}}/current/qt/{{service_name_upper}}.ui.jinja
diff --git a/templates/service/{{service_id}}-{{service_name_lower}}/systemd/AGEBD-SERVICE-{{service_name_upper}}.service.jinja b/templates/service/{{service_id}}-{{service_name_lower}}/current/systemd/AGEBD-SERVICE-{{service_name_upper}}.service.jinja
similarity index 100%
rename from templates/service/{{service_id}}-{{service_name_lower}}/systemd/AGEBD-SERVICE-{{service_name_upper}}.service.jinja
rename to templates/service/{{service_id}}-{{service_name_lower}}/current/systemd/AGEBD-SERVICE-{{service_name_upper}}.service.jinja