diff --git a/Dockerfile b/Dockerfile
index 023ab24..a22cddf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,5 +5,8 @@ COPY . /usr/local/hk/hk-ToolApp
 RUN --mount=type=ssh mkdir -p -m 0600 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
 
 WORKDIR /usr/local/hk
+# Install hkToopApp, then enable all tools, then reinstall for proper linkage
 RUN --mount=type=ssh . /usr/local/hk/hk-pilot/setup.sh &&\
-    hkp install -r -e hk-ToolApp
+    hkp install -r -e hk-ToolApp &&\
+    hkp select --all &&\
+    hkp install hk-ToolApp