diff --git a/usr/local/share/bastille/bootstrap.sh b/usr/local/share/bastille/bootstrap.sh
index beeac79f..c8fe2b5d 100644
--- a/usr/local/share/bastille/bootstrap.sh
+++ b/usr/local/share/bastille/bootstrap.sh
@@ -495,10 +495,7 @@ bootstrap_template() {
         done
 
         # Remove the cloned repo
-        if [ -n "${user}" ]; then
-            rm -r "${bastille_templatesdir:?}/${user:?}"
-        fi
-
+        rm -r "${raw_template_dir:?}"
     else
         # Verify a single template
         bastille verify "${user}/${repo}"