diff --git a/imageroot/systemd/user/pgadmin-app.service b/imageroot/systemd/user/pgadmin-app.service
index a4f7eba..fb66df6 100644
--- a/imageroot/systemd/user/pgadmin-app.service
+++ b/imageroot/systemd/user/pgadmin-app.service
@@ -10,9 +10,9 @@ After=postgresql.service pgadmin-app.service
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
-EnvironmentFile=%S/state/environment
-EnvironmentFile=-%S/state/smarthost.env
-WorkingDirectory=%S/state
+EnvironmentFile=%E/state/environment
+EnvironmentFile=-%E/state/smarthost.env
+WorkingDirectory=%E/state
 Restart=always
 TimeoutStopSec=70
 ExecStartPre=/bin/mkdir -p config
@@ -30,7 +30,7 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/pgadmin-app.pid \
     --env 'PGADMIN_CONFIG_UPGRADE_CHECK_ENABLED=False' \
     --env 'PGADMIN_CONFIG_LOGIN_BANNER="Authorised users only!"' \
     --env 'PGADMIN_CONFIG_CONSOLE_LOG_LEVEL=40' \
-    --env-file=%S/state/smarthost.env \
+    --env-file=%E/state/smarthost.env \
     ${PGADMIN4_IMAGE}
 ExecStartPost=/usr/bin/bash -c "while ! podman exec pgadmin-app /venv/bin/python3 setup.py get-users ;  do sleep 5 ; done"
 ExecStartPost=/usr/bin/podman cp pgpass pgadmin-app:/var/lib/pgadmin/pgpass
diff --git a/imageroot/systemd/user/postgresql-app.service b/imageroot/systemd/user/postgresql-app.service
index c90c9d5..3a6df4a 100644
--- a/imageroot/systemd/user/postgresql-app.service
+++ b/imageroot/systemd/user/postgresql-app.service
@@ -10,15 +10,15 @@ After=postgresql.service
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
-EnvironmentFile=%S/state/environment
-EnvironmentFile=%S/state/secrets/passwords.env
+EnvironmentFile=%E/state/environment
+EnvironmentFile=%E/state/secrets/passwords.env
 Restart=always
 TimeoutStopSec=70
 ExecStartPre=/bin/rm -f %t/postgresql-app.pid %t/postgresql-app.ctr-id
 ExecStart=/usr/bin/podman run --conmon-pidfile %t/postgresql-app.pid \
     --cidfile %t/postgresql-app.ctr-id --cgroups=no-conmon \
     --pod-id-file %t/postgresql.pod-id --replace -d --name postgresql-app \
-    --env-file=%S/state/environment \
+    --env-file=%E/state/environment \
     --volume pgdata:/var/lib/postgresql/data:Z \
     --volume socket:/var/run/postgresql:z \
     --env POSTGRES_USER=postgres \
diff --git a/imageroot/systemd/user/postgresql.service b/imageroot/systemd/user/postgresql.service
index 0df9808..45ea83f 100644
--- a/imageroot/systemd/user/postgresql.service
+++ b/imageroot/systemd/user/postgresql.service
@@ -15,7 +15,7 @@ Before=pgadmin-app.service postgresql-app.service
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
-EnvironmentFile=-%S/state/environment
+EnvironmentFile=-%E/state/environment
 Restart=always
 TimeoutStopSec=70
 ExecStartPre=/bin/rm -f %t/postgresql.pid %t/postgresql.pod-id