diff --git a/docker/hound/start-container.sh b/docker/hound/start-container.sh
index 33be187aa9..d02d973a92 100755
--- a/docker/hound/start-container.sh
+++ b/docker/hound/start-container.sh
@@ -5,5 +5,8 @@ else
     if [ ! -f /var/run/config.json ]; then
         update-hound-config;
     fi
+    # Unclean shutdown can leave lockfiles that stop processing,
+    # cleanup.
+    find . -type f \( -wholename "*/.git/index.lock" -o -wholename "*/.git/shallow.lock" \) -delete -print
     /usr/local/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf
 fi
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index 5350126715..7c866f5911 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -488,7 +488,7 @@
       - playbooks/roles/codesearch/
       - playbooks/roles/install-docker/
       - playbooks/roles/pip3/
-      - docker/codesearch/
+      - docker/hound/
       - testinfra/test_codesearch.py
 
 - job: