diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60240e5..5f419ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## 0.64.1 (2024-05-29)
+
+
+### Bug Fixes
+
+* Support container reuse when --cmd not specified
+* Use find to identify bazel symlinks
+
 ## 0.64.0 (2024-05-27)
 
 
diff --git a/tools/cbuild b/tools/cbuild
index f6c80b1..2a53236 100755
--- a/tools/cbuild
+++ b/tools/cbuild
@@ -299,12 +299,12 @@ if [[ ${KEEP_CONTAINER_RUNNING} -eq 1 ]]; then
       docker exec \
         "${DOCKER_EXEC_RUN_ARGS[@]}" \
         "${DOCKER_RUNNING_CONTAINER}" \
-        /bin/bash -c "'${TOOLS_RELDIR}'/normalize-bazel-symlinks; env \${CMD_PROFILER} ${CMD}"
+        /bin/bash -c "'${TOOLS_RELDIR}'/normalize-bazel-symlinks; env \${CMD_PROFILER} ${CMD:-/bin/sh}"
     else
       docker exec \
         "${DOCKER_EXEC_RUN_ARGS[@]}" \
         "${DOCKER_RUNNING_CONTAINER}" \
-        /bin/bash -c "${CMD}"
+        /bin/bash -c "${CMD:-/bin/sh}"
     fi
   fi
 else
@@ -328,6 +328,6 @@ else
       ${DOCKER_RUN_ARGS[@]} \
       "${DOCKER_EXEC_RUN_ARGS[@]}" \
       "${IMAGE_TAGGED}" \
-      --login -c "$CMD"
+      --login -c "${CMD}"
   fi
 fi
diff --git a/tools/normalize-bazel-symlinks b/tools/normalize-bazel-symlinks
index 502efe1..05e3e7e 100755
--- a/tools/normalize-bazel-symlinks
+++ b/tools/normalize-bazel-symlinks
@@ -46,14 +46,8 @@ fi
 source "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"/builder.sh
 cd "${WORKSPACE}" || true
 
-declare -a -r LINK_DIRS=(
-  bazel-bin
-  bazel-out
-  bazel-testlogs
-  bazel-workspace
-)
-for link in "${LINK_DIRS[@]}"; do
-  if [[ -L ${link} ]]; then
-    ${_normalize_fn} "${link}"
-  fi
+declare -a links
+mapfile -t links < <(find . -maxdepth 1 -type l -name "bazel-*" -exec basename {} \;)
+for link in "${links[@]}"; do
+  ${_normalize_fn} "${link}"
 done
diff --git a/version.txt b/version.txt
index 1dd1c71..fd03c76 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.64.0
\ No newline at end of file
+0.64.1
\ No newline at end of file