diff --git a/ykpersonalize/Dockerfile b/ykpersonalize/Dockerfile
index c40516e..2521b51 100644
--- a/ykpersonalize/Dockerfile
+++ b/ykpersonalize/Dockerfile
@@ -38,4 +38,6 @@ RUN buildDeps=' \
 	&& rm -rf /usr/src/ykpersonalize \
 	&& apt-get purge -y --auto-remove $buildDeps
 
+WORKDIR /root/
+
 CMD [ "ykpersonalize", "--help" ]
diff --git a/yubico-piv-tool/Dockerfile b/yubico-piv-tool/Dockerfile
index 3626133..90cbd48 100644
--- a/yubico-piv-tool/Dockerfile
+++ b/yubico-piv-tool/Dockerfile
@@ -14,4 +14,6 @@ RUN apt-get update && apt-get install -y \
 	yubico-piv-tool \
 	&& rm -rf /var/lib/apt/lists/*
 
+WORKDIR /root/
+
 CMD [ "yubico-piv-tool", "--help" ]