diff --git a/root/etc/s6-overlay/s6-rc.d/cwa-init-remove-locks/dependencies.d/init-custom-files b/root/etc/s6-overlay/s6-rc.d/cwa-init-remove-locks/dependencies.d/init-custom-files
new file mode 100644
index 00000000..e69de29b
diff --git a/root/etc/s6-overlay/s6-rc.d/cwa-init-remove-locks/run b/root/etc/s6-overlay/s6-rc.d/cwa-init-remove-locks/run
new file mode 100644
index 00000000..adeebfe0
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/cwa-init-remove-locks/run
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+declare -a lockFiles=("new-book-processor.lock")
+
+echo "[cwa-init-remove-locks] Checking for leftover lock files from prvious instance..."
+
+counter=0
+
+for f in "${lockFiles[@]}"
+do
+    if [ -f "/tmp/$f" ]
+    then
+        echo "[cwa-init-remove-locks] Leftover $f exists, removing now..."
+        rm "/tmp/$f"
+        echo "[cwa-init-remove-locks] Leftover $f removed."
+        let counter++
+    fi
+done
+
+if [[ "$counter" -eq 0 ]]
+then
+    echo "[cwa-init-remove-locks] No leftover lock files to remove. Ending service..."
+else
+    echo "[cwa-init-remove-locks] $counter lock file(s) removed. Ending service..."
+fi
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/cwa-init-remove-locks/type b/root/etc/s6-overlay/s6-rc.d/cwa-init-remove-locks/type
new file mode 100644
index 00000000..bdd22a18
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/cwa-init-remove-locks/type
@@ -0,0 +1 @@
+oneshot
diff --git a/root/etc/s6-overlay/s6-rc.d/cwa-init-remove-locks/up b/root/etc/s6-overlay/s6-rc.d/cwa-init-remove-locks/up
new file mode 100644
index 00000000..8eb4745d
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/cwa-init-remove-locks/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/cwa-init-remove-locks/run
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/cwa-init-remove-locks b/root/etc/s6-overlay/s6-rc.d/user/contents.d/cwa-init-remove-locks
new file mode 100644
index 00000000..e69de29b