diff --git a/client/Dockerfiles/finance/Dockerfile.archlinux.in b/client/Dockerfiles/finance/Dockerfile.archlinux.in
index 11d1548..d975991 100644
--- a/client/Dockerfiles/finance/Dockerfile.archlinux.in
+++ b/client/Dockerfiles/finance/Dockerfile.archlinux.in
@@ -37,12 +37,12 @@ RUN chown root:wheel /usr/local/* && chmod g+rwx /usr/local/*
 #
 
 RUN pacman -Syu \
+  csvkit \
   git \
   hledger \
   hledger-iadd \
   hledger-ui \
   hledger-web \
-  python-pipx \
   timew \
   vim \
   visidata \
@@ -50,10 +50,6 @@ RUN pacman -Syu \
   yq \
   --noconfirm --disable-download-timeout
 
-USER @DOCKER_FINANCE_USER@
-WORKDIR /home/@DOCKER_FINANCE_USER@
-RUN pipx install csvkit
-
 #
 # `fetch` APIs
 #
diff --git a/client/Dockerfiles/finance/Dockerfile.ubuntu.in b/client/Dockerfiles/finance/Dockerfile.ubuntu.in
index fab1cd1..066bf54 100644
--- a/client/Dockerfiles/finance/Dockerfile.ubuntu.in
+++ b/client/Dockerfiles/finance/Dockerfile.ubuntu.in
@@ -43,12 +43,12 @@ RUN chown root:wheel /usr/local/* && chmod g+rwx /usr/local/*
 RUN apt-get update -y
 
 RUN apt-get install -y \
+  csvkit \
   gawk \
   git \
   hledger \
   hledger-ui \
   hledger-web \
-  pipx \
   timewarrior \
   vim \
   visidata \
@@ -58,10 +58,6 @@ RUN apt-get install -y \
 RUN apt-get install -y cargo
 RUN cargo install xsv --root /usr
 
-USER @DOCKER_FINANCE_USER@
-WORKDIR /home/@DOCKER_FINANCE_USER@
-RUN pipx install csvkit
-
 #
 # `fetch` APIs
 #
diff --git a/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.archlinux.in b/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.archlinux.in
index ef1bd95..787ae20 100644
--- a/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.archlinux.in
+++ b/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.archlinux.in
@@ -23,22 +23,29 @@
 # Optional userspace
 #
 
-USER root
+#USER root
 
-RUN pacman -Syu \
-  calc \
-  emacs-nox \
-  less \
-  nano \
-  --noconfirm --disable-download-timeout
+#RUN pacman -Syu \
+#  calc \
+#  less \
+#  --noconfirm --disable-download-timeout
+
+#RUN pacman -Syu \
+#  emacs-nox \
+#  nano \
+#  --noconfirm --disable-download-timeout
 
 #
 # Optional userspace (python / ROOT.cern custom metadata analysis)
 #
 
-USER @DOCKER_FINANCE_USER@
-WORKDIR /home/@DOCKER_FINANCE_USER@
+#RUN pacman -Syu \
+#  python-pipx \
+#  --noconfirm --disable-download-timeout
 
-RUN pipx install xlsx2csv
+#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
index 0b18004..aa2fdc2 100644
--- a/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.ubuntu.in
+++ b/client/docker-finance.d/client/Dockerfiles/finance/Dockerfile.ubuntu.in
@@ -23,23 +23,23 @@
 # Optional userspace
 #
 
-USER root
-
-RUN apt-get update -y
-
-RUN apt-get install -y \
-  calc \
-  emacs-nox \
-  mc \
-  nano
+#USER root
+#RUN apt-get update -y
+#RUN apt-get install -y \
+#  calc \
+#  emacs-nox \
+#  nano
 
 #
 # Optional userspace (python)
 #
 
-USER @DOCKER_FINANCE_USER@
-WORKDIR /home/@DOCKER_FINANCE_USER@
+#RUN apt-get install -y \
+#  pipx
 
-RUN pipx install xlsx2csv
+#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.yaml b/client/docker-finance.yaml
index a2bdcab..4563d4f 100644
--- a/client/docker-finance.yaml
+++ b/client/docker-finance.yaml
@@ -37,13 +37,13 @@ container:
       base:
         packages:
           - "bc"
+          - "csvkit"
           - "git"
           - "hledger"
           - "hledger-iadd"
           - "hledger-ui"
           - "hledger-web"
           - "proxychains-ng"
-          - "python-pipx"
           - "stack"
           - "timew"
           - "vim"
@@ -53,7 +53,6 @@ container:
           # For experimental build
           #- "unuran"
         commands:
-          - "csvstat --version"
           - "ghc-pkg --version"
           - "hledger-flow --version"
       fetch:
@@ -84,13 +83,13 @@ container:
         packages:
           - "bc"
           - "cargo"
+          - "csvkit"
           - "g++"
           - "git"
           - "haskell-stack"
           - "hledger"
           - "hledger-ui"
           - "hledger-web"
-          - "pipx"
           - "proxychains4"
           - "timewarrior"
           - "vim"
@@ -100,7 +99,6 @@ container:
           # For experimental build
           #- "libunuran-dev"
         commands:
-          - "csvstat --version"
           - "ghc-pkg --version"
           - "hledger-flow --version"
           - "xsv --version"