diff --git a/pyproject.toml b/pyproject.toml
index 809ac31..849f9b8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "govoplan-templates"
-version = "0.1.20"
+version = "0.1.21"
 description = "GovOPlaN typed template library and deterministic printable rendering."
 readme = "README.md"
 requires-python = ">=3.12"
diff --git a/src/govoplan_templates/__init__.py b/src/govoplan_templates/__init__.py
index 5c7f3e2..c45888b 100644
--- a/src/govoplan_templates/__init__.py
+++ b/src/govoplan_templates/__init__.py
@@ -1,3 +1,3 @@
 """GovOPlaN Templates module."""
 
-__version__ = "0.1.20"
+__version__ = "0.1.21"
diff --git a/src/govoplan_templates/backend/manifest.py b/src/govoplan_templates/backend/manifest.py
index 9aab7d7..3a8cdd1 100644
--- a/src/govoplan_templates/backend/manifest.py
+++ b/src/govoplan_templates/backend/manifest.py
@@ -43,7 +43,7 @@ from govoplan_templates.backend.dsar_provider import (
 
 MODULE_ID = "templates"
 MODULE_NAME = "Templates"
-MODULE_VERSION = "0.1.20"
+MODULE_VERSION = "0.1.21"
 
 READ_SCOPE = "templates:template:read"
 WRITE_SCOPE = "templates:template:write"
diff --git a/webui/package.json b/webui/package.json
index b36c63e..6a30152 100644
--- a/webui/package.json
+++ b/webui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@govoplan/templates-webui",
-  "version": "0.1.20",
+  "version": "0.1.21",
   "private": true,
   "type": "module",
   "main": "src/index.ts",
diff --git a/webui/src/features/templates/TemplatesPage.tsx b/webui/src/features/templates/TemplatesPage.tsx
index 4bb7424..15c6c14 100644
--- a/webui/src/features/templates/TemplatesPage.tsx
+++ b/webui/src/features/templates/TemplatesPage.tsx
@@ -353,7 +353,7 @@ export default function TemplatesPage({ settings, auth }: Props) {
             </span>}
             helpAction={<DocumentationHelpLink reference={TEMPLATES_DOCUMENTATION} />}
             primaryActions={<>
-              <Button disabled={!selected || !canPublish || dirty || busy} disabledReason={busy ? TEMPLATES_I18N.busy : !selected ? TEMPLATES_I18N.noSelection : !canPublish ? TEMPLATES_I18N.publishReason : dirty ? TEMPLATES_I18N.saveBeforeAction : undefined} onClick={() => setPublishOpen(true)}><FileCheck2 size={16} /> Publish</Button>
+              <Button helpContextId="templates.action.publish" helpModuleId="templates" disabled={!selected || !canPublish || dirty || busy} disabledReason={busy ? TEMPLATES_I18N.busy : !selected ? TEMPLATES_I18N.noSelection : !canPublish ? TEMPLATES_I18N.publishReason : dirty ? TEMPLATES_I18N.saveBeforeAction : undefined} onClick={() => setPublishOpen(true)}><FileCheck2 size={16} /> Publish</Button>
               <SegmentedControl
                 value={view}
                 onChange={setView}
@@ -361,7 +361,7 @@ export default function TemplatesPage({ settings, auth }: Props) {
                 ariaLabel="Template workspace"
               />
             </>}
-            destructiveActions={<IconButton label="Delete template" icon={<Trash2 size={17} />} variant="danger" disabled={!selected || readOnly} disabledReason={!selected ? TEMPLATES_I18N.noSelection : readOnly ? (canWrite ? TEMPLATES_I18N.readOnlyReason : TEMPLATES_I18N.writeReason) : undefined} onClick={() => setDeleteOpen(true)} />}
+            destructiveActions={<IconButton label="Delete template" helpContextId="templates.action.delete" helpModuleId="templates" icon={<Trash2 size={17} />} variant="danger" disabled={!selected || readOnly} disabledReason={!selected ? TEMPLATES_I18N.noSelection : readOnly ? (canWrite ? TEMPLATES_I18N.readOnlyReason : TEMPLATES_I18N.writeReason) : undefined} onClick={() => setDeleteOpen(true)} />}
             discardAction={{ label: "Discard and reload", onClick: () => requestDiscard(() => void reload(selectedId)), disabled: !selected }}
             saveAction={{
               label: <><Save size={16} /> Save revision</>,