diff --git a/package-lock.json b/package-lock.json
index dde8e458b8..b183b92bcf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -30,7 +30,7 @@
         "dialog-polyfill": "^0.5.6",
         "dotenv": "^16.0.3",
         "find-versions-cli": "^4.0.0",
-        "html-validate": "^7.12.2",
+        "html-validate": "^7.13.1",
         "html5-boilerplate": "^8.0.0",
         "husky": "^8.0.3",
         "iframe-resizer": "^4.3.2",
@@ -8159,9 +8159,9 @@
       }
     },
     "node_modules/html-validate": {
-      "version": "7.12.2",
-      "resolved": "https://registry.npmjs.org/html-validate/-/html-validate-7.12.2.tgz",
-      "integrity": "sha512-CE0c7Iin3bx2LNRoqPpB4AaNiMo2ckDSW8Z57/dVc39gvrwBDFnSEObKV9Xz6L170gJyRK6EHAsfxlDOJ4Da3g==",
+      "version": "7.13.1",
+      "resolved": "https://registry.npmjs.org/html-validate/-/html-validate-7.13.1.tgz",
+      "integrity": "sha512-AtLPBf9hZD/ynMCYfTWs0a71sTvsKps5cQxsTtyZaJ0w7G+UNDmN2F6oYCBoWmRtWm+4M2o+CwOGx8EVuubRTQ==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "^7.10.0",
@@ -23189,9 +23189,9 @@
       "dev": true
     },
     "html-validate": {
-      "version": "7.12.2",
-      "resolved": "https://registry.npmjs.org/html-validate/-/html-validate-7.12.2.tgz",
-      "integrity": "sha512-CE0c7Iin3bx2LNRoqPpB4AaNiMo2ckDSW8Z57/dVc39gvrwBDFnSEObKV9Xz6L170gJyRK6EHAsfxlDOJ4Da3g==",
+      "version": "7.13.1",
+      "resolved": "https://registry.npmjs.org/html-validate/-/html-validate-7.13.1.tgz",
+      "integrity": "sha512-AtLPBf9hZD/ynMCYfTWs0a71sTvsKps5cQxsTtyZaJ0w7G+UNDmN2F6oYCBoWmRtWm+4M2o+CwOGx8EVuubRTQ==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.10.0",
diff --git a/package.json b/package.json
index 2f893f2236..0b23a4b9e8 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "dialog-polyfill": "^0.5.6",
     "dotenv": "^16.0.3",
     "find-versions-cli": "^4.0.0",
-    "html-validate": "^7.12.2",
+    "html-validate": "^7.13.1",
     "html5-boilerplate": "^8.0.0",
     "husky": "^8.0.3",
     "iframe-resizer": "^4.3.2",
diff --git a/source/_patterns/00-base/icons/illustration-icons.hbs b/source/_patterns/00-base/icons/illustration-icons.hbs
index f28efe228b..bb78675df4 100644
--- a/source/_patterns/00-base/icons/illustration-icons.hbs
+++ b/source/_patterns/00-base/icons/illustration-icons.hbs
@@ -1,5 +1,5 @@
 {{#each icons }}
-	<!-- [html-validate-disable-next heading-level] -->
+	{{#if @first }}<!-- [html-validate-disable-next heading-level] -->{{/if }}
 	<h5>{{ @key }}</h5>
 	<ul class="DO-NOT-COPY-THIS-CLASS-example-icon-list icons-illustration">
 		{{#each this }}<li>
diff --git a/source/_patterns/01-elements/buttons/09-button-sizes.hbs b/source/_patterns/01-elements/buttons/09-button-sizes.hbs
index ff6f0d5ec3..8ba8aa4655 100644
--- a/source/_patterns/01-elements/buttons/09-button-sizes.hbs
+++ b/source/_patterns/01-elements/buttons/09-button-sizes.hbs
@@ -1,5 +1,5 @@
 {{#each sizes }}
-	<!-- [html-validate-disable-next heading-level] -->
+	{{#if @first }}<!-- [html-validate-disable-next heading-level -- we're doing some simple demonstration simplification here] -->{{/if }}
 	<h2>{{ label }}</h2>
 	<p>
 		{{> elements-button variant='brand-primary' value='Brand Primary' icon='add' size=size }}
diff --git a/source/_patterns/01-elements/headline/headline-pulse.hbs b/source/_patterns/01-elements/headline/headline-pulse.hbs
index 502b3d2206..37946ccd31 100644
--- a/source/_patterns/01-elements/headline/headline-pulse.hbs
+++ b/source/_patterns/01-elements/headline/headline-pulse.hbs
@@ -1,3 +1,2 @@
 {{> elements-logo }}
-<!-- [html-validate-disable-next heading-level -- we're doing some simple demonstration simplification here] -->
 {{> elements-headline }}
diff --git a/source/_patterns/01-elements/headline/headline.hbs b/source/_patterns/01-elements/headline/headline.hbs
index f3c4ee7878..04a09d58d4 100644
--- a/source/_patterns/01-elements/headline/headline.hbs
+++ b/source/_patterns/01-elements/headline/headline.hbs
@@ -1,2 +1,2 @@
-<!-- [html-validate-disable-next heading-level -- we're doing some simple demonstration simplification here] -->
+<!-- [html-validate-disable-next heading-level, no-unused-disable -- we're doing some simple demonstration simplification here] -->
 <h{{ type }} class="elm-headline {{ styleModifier }}"{{#if id}} id="{{id}}"{{/if }}{{#if pulse}} data-pulse{{/if }}>{{ text }}</h{{ type }}>
diff --git a/source/_patterns/01-elements/input/input.hbs b/source/_patterns/01-elements/input/input.hbs
index 31428138a1..6d8dc1f184 100644
--- a/source/_patterns/01-elements/input/input.hbs
+++ b/source/_patterns/01-elements/input/input.hbs
@@ -1,5 +1,4 @@
 <!-- The aria-labelledby attribute on the input and related id on the label as well as aria-hidden="true" are being set for correct support within assistive tools like screenreaders //-->
-<!-- [html-validate-disable-next input-missing-label] -->
 <input type="{{ type }}"
 	class="elm-input {{ styleModifier }}"
 	placeholder="{{ placeholder }}"
diff --git a/source/_patterns/01-elements/progress/progress.hbs b/source/_patterns/01-elements/progress/progress.hbs
index 680548a625..22a2b0101f 100644
--- a/source/_patterns/01-elements/progress/progress.hbs
+++ b/source/_patterns/01-elements/progress/progress.hbs
@@ -1,5 +1,5 @@
 <div class="elm-progress">
-	<!-- [html-validate-disable-next no-inline-style] -->
+	{{#if conic}}<!-- [html-validate-disable-next no-inline-style] -->{{/if}}
 	<progress
 		{{#if value}}
 			value="{{ value }}"
diff --git a/source/_patterns/02-components/accordion/accordion-sizes.hbs b/source/_patterns/02-components/accordion/accordion-sizes.hbs
index 7a50312018..1d497a8880 100644
--- a/source/_patterns/02-components/accordion/accordion-sizes.hbs
+++ b/source/_patterns/02-components/accordion/accordion-sizes.hbs
@@ -1,5 +1,5 @@
 {{#each sizes }}
-	<!-- [html-validate-disable-next heading-level] -->
+	{{#if @first }}<!-- [html-validate-disable-next heading-level] -->{{/if }}
 	<h2>{{ label }}</h2>
 	{{> components-accordion size=size summary=@root.summary details=@root.details }}
 {{/each }}
diff --git a/source/_patterns/02-components/cards/_card.hbs b/source/_patterns/02-components/cards/_card.hbs
index c49c4fb0e3..2eda8044a7 100755
--- a/source/_patterns/02-components/cards/_card.hbs
+++ b/source/_patterns/02-components/cards/_card.hbs
@@ -1,4 +1,3 @@
-<!-- [html-validate-disable-next element-permitted-content, element-permitted-parent -- we're only providing a partial here] -->
 <li class="cmp-card" data-variant="{{ variant }}">
 	{{#if link }}<a href="#">{{/if }}
 		<figure>
@@ -10,7 +9,7 @@
 				{{> elements-image src="../../icons/functional/images/navigation/db_ic_list_20.svg" alt="" role="presentation" }}
 			{{/if_eq }}
 			<figcaption>
-				<!-- [html-validate-disable-next heading-level] -->
+				<!-- [html-validate-disable-next heading-level, no-unused-disable] -->
 				<h3 class="elm-headline">{{ title }}</h3>
 				{{#if text }}<p>{{{ text }}}</p>{{/if }}
 			</figcaption>
diff --git a/source/_patterns/02-components/overflow-menu/overflow-menu.hbs b/source/_patterns/02-components/overflow-menu/overflow-menu.hbs
index ad6ca7c06f..43de0cc80d 100644
--- a/source/_patterns/02-components/overflow-menu/overflow-menu.hbs
+++ b/source/_patterns/02-components/overflow-menu/overflow-menu.hbs
@@ -1,4 +1,4 @@
-<!-- [html-validate-disable-next prefer-native-element -- TODO: Evaluate again on this HTML] -->
+{{#if linkEntries }}<!-- [html-validate-disable-next prefer-native-element -- TODO: Evaluate again on this HTML] -->{{/if }}
 <details class="{{#if patternName }}{{ patternName }}{{else}}cmp-overflow-menu{{/if }}{{ styleModifier }}"{{#if linkEntries }} role="navigation"{{/if }}{{#if oppositePosition}} data-horizontal-position="opposite"{{/if }}>
 	<summary>{{ summary }}</summary>
 	{{#if linkEntries }}<ul role="group">{{else}}<menu type="toolbar">{{/if }}
diff --git a/source/_patterns/02-components/table/table.hbs b/source/_patterns/02-components/table/table.hbs
index 7ea74e9694..933bec496f 100644
--- a/source/_patterns/02-components/table/table.hbs
+++ b/source/_patterns/02-components/table/table.hbs
@@ -1,5 +1,5 @@
 {{! TODO: evaluate on the correct role and aria-label in here }}
-<!-- [html-validate-disable-next no-inline-style -- we're doing inline-styling for simplification here] -->
+{{#if font-size }}<!-- [html-validate-disable-next no-inline-style -- we're doing inline-styling for simplification here] -->{{/if }}
 <table class="cmp-table {{ styleModifier }}"
 	{{#if border }} data-border="{{ border }}"{{/if }}
 	{{#if rows }} data-rows="{{ rows }}"{{/if }}