diff --git a/config/services.yaml b/config/services.yaml
index d1179e9..09809ab 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -5,6 +5,7 @@
 parameters:
   mto.root: '%kernel.project_dir%'
   mto.kernel.dir: '%mto.root%'
+  mto.locks.dir: '%mto.knowledge.root%/locks'
 
   mto.knowledge.root: '%mto.root%/var/knowledge'
 
@@ -24,7 +25,7 @@ parameters:
   mto.vector.ingest_tags_script: '%mto.vector.script_dir%/vector_ingest_tags.py'
   mto.vector.search_tags_script: '%mto.vector.script_dir%/vector_search_tags.py'
 
-  mto.tags.rebuild_lock: '%mto.knowledge.root%/locks/tag_rebuild.lock'
+  mto.tags.rebuild_lock: '%mto.locks.dir%/tag_rebuild.lock'
 
   mto.vector.data.upload.path: '%mto.knowledge.upload%'
 
diff --git a/src/Controller/Admin/DocumentController.php b/src/Controller/Admin/DocumentController.php
index fe5e3c2..80aedee 100644
--- a/src/Controller/Admin/DocumentController.php
+++ b/src/Controller/Admin/DocumentController.php
@@ -323,21 +323,44 @@ class DocumentController extends AbstractController
         @unlink((string)$params->get('mto.knowledge.index_meta'));
         @unlink((string)$params->get('mto.runtime.meta'));
 
+        @unlink((string)$params->get('mto.knowledge.tags_ndjson'));
+        @unlink((string)$params->get('mto.knowledge.vector_tags_index'));
+        @unlink((string)$params->get('mto.knowledge.vector_tags_index_meta'));
+
         $uploadDir = (string)$params->get('mto.knowledge.upload');
         if ($uploadDir !== '' && is_dir($uploadDir)) {
             exec('rm -rf ' . escapeshellarg($uploadDir));
         }
 
+        $lockDir = (string)$params->get('mto.locks.dir');
+        if ($lockDir !== '' && is_dir($lockDir)) {
+            exec('rm -rf ' . escapeshellarg($lockDir));
+        }
+
         $sql = '
             SET FOREIGN_KEY_CHECKS = 0;
             TRUNCATE TABLE db.document;
             SET FOREIGN_KEY_CHECKS = 1;
+            
             SET FOREIGN_KEY_CHECKS = 0;
             TRUNCATE TABLE db.document_version;
             SET FOREIGN_KEY_CHECKS = 1;
+            
             SET FOREIGN_KEY_CHECKS = 0;
             TRUNCATE TABLE db.ingest_job;
             SET FOREIGN_KEY_CHECKS = 1;
+            
+            SET FOREIGN_KEY_CHECKS = 0;
+            TRUNCATE TABLE db.knowledge_tag;
+            SET FOREIGN_KEY_CHECKS = 1;
+            
+            SET FOREIGN_KEY_CHECKS = 0;
+            TRUNCATE TABLE db.tag_rebuild_job;
+            SET FOREIGN_KEY_CHECKS = 1;
+            
+            SET FOREIGN_KEY_CHECKS = 0;
+            TRUNCATE TABLE db.document_tag;
+            SET FOREIGN_KEY_CHECKS = 1;
         ';
         $connection->executeQuery($sql);
 
diff --git a/templates/admin/dashboard/index.html.twig b/templates/admin/dashboard/index.html.twig
index 813a7fb..ec899ff 100644
--- a/templates/admin/dashboard/index.html.twig
+++ b/templates/admin/dashboard/index.html.twig
@@ -171,9 +171,11 @@
                                 Ein vollständiger System-Reset entfernt:
                                 <ul>
                                     <li>Alle Dokumente und Versionen</li>
-                                    <li>Den NDJSON-Index</li>
-                                    <li>Den FAISS-Vektorindex</li>
+                                    <li>Den gesamten var/knowledge Inhalt</li>
+                                    <li>Den FAISS-Vektorindex für Chunks und Tags</li>
                                     <li>Alle Ingest-Jobs</li>
+                                    <li>Alle Tags-Jobs</li>
+                                    <li>Alle Tags / Dokument Tags</li>
                                 </ul>
                                 <strong>Diese Aktion ist nicht rückgängig zu machen.</strong>
                             </div>