diff --git a/app/config/templates/site.php b/app/config/templates/site.php
index f5ffab0dad..5aae737843 100644
--- a/app/config/templates/site.php
+++ b/app/config/templates/site.php
@@ -154,6 +154,25 @@ function getFramework(string $frameworkEnum, array $overrides)
 }
 
 return [
+    [
+        'key' => 'template-for-documentation',
+        'name' => 'Documentation template',
+        'tagline' => 'Modern site to store your knowledge with a clean design, full-text search, dark mode, and more.',
+        'score' => 6, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
+        'useCases' => [UseCases::DOCUMENTATION],
+        'screenshotDark' => $url . '/images/sites/templates/template-for-documentation-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/template-for-documentation-light.png',
+        'frameworks' => [
+            getFramework('ASTRO', [
+                'providerRootDirectory' => './',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'template-for-documentation',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.1.*',
+        'variables' => []
+    ],
     [
         'key' => 'lynx-starter',
         'name' => 'Lynx Starter',
diff --git a/public/images/sites/templates/template-for-documentation-dark.png b/public/images/sites/templates/template-for-documentation-dark.png
new file mode 100644
index 0000000000..77e9aa61e4
Binary files /dev/null and b/public/images/sites/templates/template-for-documentation-dark.png differ
diff --git a/public/images/sites/templates/template-for-documentation-light.png b/public/images/sites/templates/template-for-documentation-light.png
new file mode 100644
index 0000000000..77e9aa61e4
Binary files /dev/null and b/public/images/sites/templates/template-for-documentation-light.png differ
diff --git a/src/Appwrite/Platform/Workers/Deletes.php b/src/Appwrite/Platform/Workers/Deletes.php
index 4b5b11bce7..d22cdaee3b 100644
--- a/src/Appwrite/Platform/Workers/Deletes.php
+++ b/src/Appwrite/Platform/Workers/Deletes.php
@@ -831,7 +831,6 @@ class Deletes extends Action
             $this->deleteBuildFiles($deviceForBuilds, $document);
             $this->deleteDeploymentFiles($deviceForSites, $document);
             $this->deleteDeploymentScreenshots($deviceForFiles, $dbForPlatform, $document);
-            $this->deleteDeploymentRules($dbForPlatform, $document, $project, $certificates);
         });
 
         /**
@@ -846,20 +845,6 @@ class Deletes extends Action
             });
         }
 
-        /**
-         * Delete rules for all deployments of the site
-         */
-        foreach ($deploymentIds as $deploymentId) {
-            Console::info("Deleting rules for site " . $siteId .  "'s deployment " . $deploymentId);
-            $this->deleteByGroup('rules', [
-                Query::equal('type', ['deployment']),
-                Query::equal('value', [$deploymentId]),
-                Query::equal('projectInternalId', [$project->getInternalId()])
-            ], $dbForPlatform, function (Document $document) use ($dbForPlatform, $certificates) {
-                $this->deleteRule($dbForPlatform, $document, $certificates);
-            });
-        }
-
         /**
          * Delete VCS Repositories and VCS Comments
          */
@@ -900,7 +885,7 @@ class Deletes extends Action
         Console::info("Deleting rules for function " . $functionId);
         $this->deleteByGroup('rules', [
             Query::equal('type', ['deployment']),
-            Query::equal('deploymentResourceType', ['site']),
+            Query::equal('deploymentResourceType', ['function']),
             Query::equal('deploymentResourceInternalId', [$functionInternalId]),
             Query::equal('projectInternalId', [$project->getInternalId()])
         ], $dbForPlatform, function (Document $document) use ($project, $dbForPlatform, $certificates) {
@@ -928,7 +913,6 @@ class Deletes extends Action
             $deploymentInternalIds[] = $document->getInternalId();
             $this->deleteDeploymentFiles($deviceForFunctions, $document);
             $this->deleteBuildFiles($deviceForBuilds, $document);
-            $this->deleteDeploymentRules($dbForPlatform, $document, $project, $certificates);
         });
 
         /**
@@ -963,18 +947,6 @@ class Deletes extends Action
         $this->deleteRuntimes($getProjectDB, $document, $project);
     }
 
-    private function deleteDeploymentRules(Database $dbForPlatform, Document $deployment, Document $project, CertificatesAdapter $certificates): void
-    {
-        Console::info("Deleting rules for site " . $deployment->getId());
-        $this->deleteByGroup('rules', [
-            Query::equal('type', ['deployment']),
-            Query::equal('deploymentInternalId', [$deployment->getInternalId()]),
-            Query::equal('projectInternalId', [$project->getInternalId()])
-        ], $dbForPlatform, function (Document $document) use ($dbForPlatform, $certificates) {
-            $this->deleteRule($dbForPlatform, $document, $certificates);
-        });
-    }
-
     private function deleteDeploymentScreenshots(Device $deviceForFiles, Database $dbForPlatform, Document $deployment): void
     {
         $screenshotIds = [];
@@ -1125,9 +1097,9 @@ class Deletes extends Action
          */
         Console::info("Deleting rules for deployment " . $deploymentId);
         $this->deleteByGroup('rules', [
-            Query::equal('trigger', ['manual']),
+            Query::equal('trigger', ['deployment']),
             Query::equal('type', ['deployment']),
-            Query::equal('deploymentResourceInternalId', [$deploymentInternalId]),
+            Query::equal('deploymentInternalId', [$deploymentInternalId]),
             Query::equal('projectInternalId', [$project->getInternalId()])
         ], $dbForPlatform, function (Document $document) use ($dbForPlatform, $certificates) {
             $this->deleteRule($dbForPlatform, $document, $certificates);