diff --git a/client/Dockerfiles/finance/Dockerfile.archlinux.in b/client/Dockerfiles/finance/Dockerfile.archlinux.in
index a33b757..da2dd7e 100644
--- a/client/Dockerfiles/finance/Dockerfile.archlinux.in
+++ b/client/Dockerfiles/finance/Dockerfile.archlinux.in
@@ -59,14 +59,6 @@ RUN pacman -Syu \
   root \
   --noconfirm --disable-download-timeout
 
-# Optional userspace
-RUN pacman -Syu \
-  calc \
-  emacs-nox \
-  less \
-  nano \
-  --noconfirm --disable-download-timeout
-
 # PHP mandatory requirements
 RUN sed -i \
   -e 's:^;extension=bcmath:extension=bcmath:' \
@@ -108,9 +100,6 @@ WORKDIR /home/@DOCKER_FINANCE_USER@
 RUN pipx install shyaml
 RUN pipx install csvkit
 
-# Optional userspace (python / ROOT.cern custom metadata analysis)
-RUN pipx install xlsx2csv
-
 # Superscript
 RUN echo "source \"\${DOCKER_FINANCE_CONTAINER_CONF}/shell/superscript.bash\"" | tee -a ~/.bashrc
 
diff --git a/client/Dockerfiles/finance/Dockerfile.ubuntu.in b/client/Dockerfiles/finance/Dockerfile.ubuntu.in
index 9b0b493..5683077 100644
--- a/client/Dockerfiles/finance/Dockerfile.ubuntu.in
+++ b/client/Dockerfiles/finance/Dockerfile.ubuntu.in
@@ -66,13 +66,6 @@ RUN cargo install xsv --root /usr
 #RUN apt install -y root
 #RUN apt install -y botan libcrypto++-dev libsodium-dev googletest libbenchmark-dev
 
-# Optional userspace
-RUN apt install -y \
-  calc \
-  emacs-nox \
-  mc \
-  nano
-
 # Give access to builder
 RUN gpasswd -a builder wheel
 RUN chown root:wheel /usr/local/* && chmod g+rwx /usr/local/*
@@ -101,9 +94,6 @@ WORKDIR /home/@DOCKER_FINANCE_USER@
 RUN pipx install shyaml
 RUN pipx install csvkit
 
-# Optional userspace (python)
-#RUN pipx install xlsx2csv
-
 # Superscript
 RUN echo "source \"\${DOCKER_FINANCE_CONTAINER_CONF}/shell/superscript.bash\"" | tee -a ~/.bash_aliases
 
diff --git a/client/docker-finance.d/client/Dockerfiles/dev-tools/Dockerfile.dev-tools.in b/client/docker-finance.d/client/Dockerfiles/dev-tools/Dockerfile.dev-tools.in
new file mode 100644
index 0000000..f68e032
--- /dev/null
+++ b/client/docker-finance.d/client/Dockerfiles/dev-tools/Dockerfile.dev-tools.in
@@ -0,0 +1,33 @@
+# docker-finance | modern accounting for the power-user
+#
+# Copyright (C) 2021-2024 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Custom (optional) Dockerfile - appends to existing Dockerfile
+#
+
+USER root
+
+RUN apt update -y
+
+RUN apt install -y \
+  curl \
+  yq
+
+USER @DOCKER_FINANCE_USER@
+WORKDIR /home/@DOCKER_FINANCE_USER@
+
+# vim: sw=2 sts=2 si ai et
diff --git a/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.archlinux.in b/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.archlinux.in
new file mode 100644
index 0000000..ef1bd95
--- /dev/null
+++ b/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.archlinux.in
@@ -0,0 +1,44 @@
+# docker-finance | modern accounting for the power-user
+#
+# Copyright (C) 2021-2024 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Custom (optional) Dockerfile - appends to existing Dockerfile
+#
+
+#
+# Optional userspace
+#
+
+USER root
+
+RUN pacman -Syu \
+  calc \
+  emacs-nox \
+  less \
+  nano \
+  --noconfirm --disable-download-timeout
+
+#
+# Optional userspace (python / ROOT.cern custom metadata analysis)
+#
+
+USER @DOCKER_FINANCE_USER@
+WORKDIR /home/@DOCKER_FINANCE_USER@
+
+RUN pipx install xlsx2csv
+
+# vim: sw=2 sts=2 si ai et
diff --git a/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.ubuntu.in b/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.ubuntu.in
new file mode 100644
index 0000000..490d1d3
--- /dev/null
+++ b/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.ubuntu.in
@@ -0,0 +1,45 @@
+# docker-finance | modern accounting for the power-user
+#
+# Copyright (C) 2021-2024 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Custom (optional) Dockerfile - appends to existing Dockerfile
+#
+
+#
+# Optional userspace
+#
+
+USER root
+
+RUN apt update -y
+
+RUN apt install -y \
+  calc \
+  emacs-nox \
+  mc \
+  nano
+
+#
+# Optional userspace (python)
+#
+
+USER @DOCKER_FINANCE_USER@
+WORKDIR /home/@DOCKER_FINANCE_USER@
+
+RUN pipx install xlsx2csv
+
+# vim: sw=2 sts=2 si ai et