diff --git a/docker/osmclient/Dockerfile b/docker/osmclient/Dockerfile
index 643ff3e..b412a95 100644
--- a/docker/osmclient/Dockerfile
+++ b/docker/osmclient/Dockerfile
@@ -76,7 +76,11 @@
 RUN rm -f /etc/apt/apt.conf.d/proxy.conf
 
 COPY --from=INSTALL /usr/bin/osm /usr/bin/osm
-COPY charm.sh /usr/sbin/charm
+COPY scripts/charm.sh /usr/sbin/charm
+
+# Add additional client tools
+COPY scripts/install-client-tools.sh /tmp/install-client-tools.sh
+RUN bash /tmp/install-client-tools.sh && rm /tmp/install-client-tools.sh
 
 # Creating the user for the app
 RUN groupadd -g 1000 appuser && \