diff --git a/client/docker-finance.d/client/env/gen.bash b/client/docker-finance.d/client/env/gen.bash
index 8841e99..12f39bb 100644
--- a/client/docker-finance.d/client/env/gen.bash
+++ b/client/docker-finance.d/client/env/gen.bash
@@ -2,7 +2,7 @@
 
 # docker-finance | modern accounting for the power-user
 #
-# Copyright (C) 2021-2024 Aaron Fiore (Founder, Evergreen Crypto LLC)
+# Copyright (C) 2021-2024,2026 Aaron Fiore (Founder, Evergreen Crypto LLC)
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -66,26 +66,29 @@ fi
 
 # Client-specific environment, including bind mounts (client view)
 
+if [ -z "$global_client_base_path" ]; then
+  global_client_base_path="$(dirname "$(realpath -s $0)" | rev | cut -d'/' -f3- | rev)"
+fi
+
 if [ -z "$DOCKER_FINANCE_CLIENT_CONF" ]; then
-  export DOCKER_FINANCE_CLIENT_CONF="${HOME}/.config/docker-finance.d"
+  export DOCKER_FINANCE_CLIENT_CONF="${global_client_base_path}/conf.d"
 fi
 
 if [ -z "$DOCKER_FINANCE_CLIENT_REPO" ]; then
-  DOCKER_FINANCE_CLIENT_REPO="$(dirname "$(realpath -s $0)" | rev | cut -d'/' -f2- | rev)"
-  export DOCKER_FINANCE_CLIENT_REPO
+  export DOCKER_FINANCE_CLIENT_REPO="${global_client_base_path}/repo"
 fi
 
 if [[ -z "$DOCKER_FINANCE_CLIENT_PLUGINS" ]]; then
-  export DOCKER_FINANCE_CLIENT_PLUGINS="${HOME}/plugins"
+  export DOCKER_FINANCE_CLIENT_PLUGINS="${global_client_base_path}/plugins"
 fi
 
 if [[ "$global_platform" != "dev-tools" ]]; then
   if [[ -z "$DOCKER_FINANCE_CLIENT_FLOW" ]]; then
-    export DOCKER_FINANCE_CLIENT_FLOW="${HOME}/finance-flow"
+    export DOCKER_FINANCE_CLIENT_FLOW="${global_client_base_path}/flow"
   fi
 
   if [[ -z "$DOCKER_FINANCE_CLIENT_SHARED" ]]; then
-    export DOCKER_FINANCE_CLIENT_SHARED="${HOME}/share.d"
+    export DOCKER_FINANCE_CLIENT_SHARED="${global_client_base_path}/share.d"
   fi
 
   # hledger-web
@@ -103,23 +106,23 @@ fi
 
 if [[ "$global_platform" != "dev-tools" ]]; then
   if [ -z "$DOCKER_FINANCE_CONTAINER_CONF" ]; then
-    export DOCKER_FINANCE_CONTAINER_CONF="/home/${DOCKER_FINANCE_USER}/.config/docker-finance.d"
+    export DOCKER_FINANCE_CONTAINER_CONF="/home/${DOCKER_FINANCE_USER}/docker-finance/conf.d"
   fi
 
   if [ -z "$DOCKER_FINANCE_CONTAINER_REPO" ]; then
-    export DOCKER_FINANCE_CONTAINER_REPO="/home/${DOCKER_FINANCE_USER}/docker-finance"
+    export DOCKER_FINANCE_CONTAINER_REPO="/home/${DOCKER_FINANCE_USER}/docker-finance/repo"
   fi
 
   if [[ -z "$DOCKER_FINANCE_CONTAINER_FLOW" ]]; then
-    export DOCKER_FINANCE_CONTAINER_FLOW="/home/${DOCKER_FINANCE_USER}/finance-flow"
+    export DOCKER_FINANCE_CONTAINER_FLOW="/home/${DOCKER_FINANCE_USER}/docker-finance/flow"
   fi
 
   if [[ -z "$DOCKER_FINANCE_CONTAINER_SHARED" ]]; then
-    export DOCKER_FINANCE_CONTAINER_SHARED="/home/${DOCKER_FINANCE_USER}/share.d"
+    export DOCKER_FINANCE_CONTAINER_SHARED="/home/${DOCKER_FINANCE_USER}/docker-finance/share.d"
   fi
 
   if [[ -z "$DOCKER_FINANCE_CONTAINER_PLUGINS" ]]; then
-    export DOCKER_FINANCE_CONTAINER_PLUGINS="/home/${DOCKER_FINANCE_USER}/plugins"
+    export DOCKER_FINANCE_CONTAINER_PLUGINS="/home/${DOCKER_FINANCE_USER}/docker-finance/plugins"
   fi
 
   if [[ -z "$DOCKER_FINANCE_CONTAINER_CMD" ]]; then