diff --git a/usr/local/share/bastille/bootstrap.sh b/usr/local/share/bastille/bootstrap.sh
index 89e1a2a9..e2205ab8 100644
--- a/usr/local/share/bastille/bootstrap.sh
+++ b/usr/local/share/bastille/bootstrap.sh
@@ -430,14 +430,16 @@ bootstrap_template() {
             cp -fR "${_project}" "${bastille_templatesdir}/${_template}"
             bastille verify "${_complete_template}"
         done
+        
+        # Remove the cloned repo
+        if [ -n "${_user}" ]; then
+            rm -r "${bastille_templatesdir}/${_user}"
+        fi
+        
     else
+        # Verify a single template
         bastille verify "${_user}/${_repo}"
     fi
-
-    # Remove the cloned repo
-    if [ -n "${_user}" ]; then
-        rm -r "${bastille_templatesdir}/${_user}"
-    fi
 }
 
 # Handle options.