diff --git a/src/patternfly/components/Check/check-input.hbs b/src/patternfly/components/Check/check-input.hbs
index ce1136a804..ee4d7a2876 100644
--- a/src/patternfly/components/Check/check-input.hbs
+++ b/src/patternfly/components/Check/check-input.hbs
@@ -3,9 +3,9 @@
   {{#if check-input--IsChecked}}
     checked
   {{/if}}
+  {{#if check-input--IsDisabled}}
+    disabled
+  {{/if}}
   {{#if check-input--attribute}}
     {{{check-input--attribute}}}
-  {{/if}}
-  {{#if check--IsDisabled}}
-    disabled
   {{/if}}>
diff --git a/src/patternfly/components/Check/check.hbs b/src/patternfly/components/Check/check.hbs
index 6722057591..76ca2e417b 100644
--- a/src/patternfly/components/Check/check.hbs
+++ b/src/patternfly/components/Check/check.hbs
@@ -2,5 +2,8 @@
   {{#if check--attribute}}
     {{{check--attribute}}}
   {{/if}}>
-  {{> @partial-block}}
+  {{> @partial-block
+    check-input--IsDisabled=check--IsDisabled
+    check-label--IsDisabled=check--IsDisabled
+  }}
 </{{#if check--type}}{{check--type}}{{else}}div{{/if}}>
diff --git a/src/patternfly/components/Check/examples/Check.md b/src/patternfly/components/Check/examples/Check.md
index f53d6074ba..be45d0adfb 100644
--- a/src/patternfly/components/Check/examples/Check.md
+++ b/src/patternfly/components/Check/examples/Check.md
@@ -47,13 +47,13 @@ cssPrefix: pf-c-check
 
 ### Disabled
 ```hbs
-{{#> check}}
-  {{#> check-input check-input--attribute='id="check-disabled" name="check-disabled" disabled'}}{{/check-input}}
-  {{#> check-label check-label--modifier="pf-m-disabled" check-label--attribute='for="check-disabled"'}}Check disabled{{/check-label}}
+{{#> check check--isDisabled="true"}}
+  {{#> check-input check-input--attribute='id="check-disabled" name="check-disabled"'}}{{/check-input}}
+  {{#> check-label check-label--attribute='for="check-disabled"'}}Check disabled{{/check-label}}
 {{/check}}
-{{#> check}}
-  {{#> check-input check-input--attribute='id="check-disabled-2" name="check-disabled-2" checked disabled'}}{{/check-input}}
-  {{#> check-label check-label--modifier="pf-m-disabled" check-label--attribute='for="check-disabled-2"'}}Check disabled checked{{/check-label}}
+{{#> check check--IsDisabled="true"}}
+  {{#> check-input check-input--attribute='id="check-disabled-2" name="check-disabled-2" checked'}}{{/check-input}}
+  {{#> check-label check-label--attribute='for="check-disabled-2"'}}Check disabled checked{{/check-label}}
 {{/check}}
 ```
 
diff --git a/src/patternfly/components/DataList/data-list-check.hbs b/src/patternfly/components/DataList/data-list-check.hbs
index 44b0e7159f..9707760242 100644
--- a/src/patternfly/components/DataList/data-list-check.hbs
+++ b/src/patternfly/components/DataList/data-list-check.hbs
@@ -2,10 +2,7 @@
   {{#if data-list-check--attribute}}
     {{{data-list-check--attribute}}}
   {{/if}}>
-  <input type="checkbox"
-    name="{{data-list--id}}-{{data-list-item--id}}-checkbox"
-    aria-labelledby="{{data-list--id}}-{{data-list-item--id}}"
-    {{#if checkbox--attribute}}
-      {{{checkbox--attribute}}}
-    {{/if}}>
+  {{#> check check--modifier="pf-m-standalone"}}
+    {{#> check-input check-input--attribute=(concat 'name="' data-list--id '-' data-list-item--id '-checkbox" aria-labelledby="' data-list--id '-' data-list-item--id '"' data-list-check-checkbox--attribute)}}{{/check-input}}
+  {{/check}}
 </div>
diff --git a/src/patternfly/components/Dropdown/dropdown-toggle-check.hbs b/src/patternfly/components/Dropdown/dropdown-toggle-check.hbs
index 9d993470a1..f418639de0 100644
--- a/src/patternfly/components/Dropdown/dropdown-toggle-check.hbs
+++ b/src/patternfly/components/Dropdown/dropdown-toggle-check.hbs
@@ -5,21 +5,13 @@
   {{#if dropdown-toggle-check--attribute}}
     {{{dropdown-toggle-check--attribute}}}
   {{/if}}>
-  <input type="checkbox" id="{{dropdown--id}}-toggle-check"
-    {{#if (concat dropdown-toggle--IsDisabled dropdown-toggle-check--IsInProgress)}}
-      disabled
-    {{/if}}
-    {{#if dropdown-toggle-check--aria-label}}
-      aria-label="{{dropdown-toggle-check--aria-label}}"
-    {{else}}
-      aria-label="Check"
-    {{/if}}
-    {{#if dropdown-toggle-check--CheckboxIsChecked}}
-      checked
-    {{/if}}
-    {{#if dropdown-toggle--split-button--text}}
-      aria-labelledby="{{dropdown--id}}-toggle-check {{dropdown--id}}-toggle-check-text"
-    {{/if}}>
+  {{#> check check--modifier="pf-m-standalone"}}
+    {{#> check-input 
+      check-input--IsChecked=(concat dropdown-toggle-check--CheckboxIsChecked)
+      check-input--IsDisabled=(concat dropdown-toggle--IsDisabled dropdown-toggle-check--IsInProgress)
+      check-input--attribute=(concat 'id="' dropdown--id '-toggle-check" aria-label="' (ternary dropdown-toggle-check--aria-label dropdown-toggle-check--aria-label 'check')'"' (ternary dropdown-toggle--split-button--text (concat 'aria-labelledby="' dropdown--id '-toggle-check ' dropdown--id '-toggle-check-text"') ''))
+    }}{{/check-input}}
+  {{/check}}
   {{#if dropdown-toggle-check--IsProgress}}
     {{> dropdown-toggle-progress}}
   {{/if}}
diff --git a/src/patternfly/components/Table/Tree-table/table-tr--tree.hbs b/src/patternfly/components/Table/Tree-table/table-tr--tree.hbs
index df339ddd50..a60ac4bb7f 100644
--- a/src/patternfly/components/Table/Tree-table/table-tr--tree.hbs
+++ b/src/patternfly/components/Table/Tree-table/table-tr--tree.hbs
@@ -8,7 +8,9 @@
         {{#if tree-view--HasCheckboxes}}
           {{#> table-td table-td--type="span" table-td--check="true"}}
             <label>
-              <input type="checkbox" name="{{table--id}}-checkrow-{{table-tr--tree--index}}" aria-labelledby="{{table--id}}-node-{{table-tr--tree--index}}">
+              {{#> check check--modifier="pf-m-standalone"}}
+                {{#> check-input check-input--attribute=(concat 'name="' table--id '-checkrow-' table-tr--tree--index '" aria-labelledby="' table--id '-node-' table-tr--tree--index '"')}}{{/check-input}}
+              {{/check}}
             </label>
           {{/table-td}}
         {{/if}}
diff --git a/src/patternfly/components/Table/table-check.hbs b/src/patternfly/components/Table/table-check.hbs
index 0b81db5ff0..d3ce18865d 100644
--- a/src/patternfly/components/Table/table-check.hbs
+++ b/src/patternfly/components/Table/table-check.hbs
@@ -1,12 +1,7 @@
 <label>
-  <input type="checkbox"
-  {{#if table-check--name}}
-    name="{{table-check--name}}"
-  {{/if}}
-  {{#if table-check--aria-labelledby}}
-    aria-labelledby="{{table-check--aria-labelledby}}"
-  {{/if}}
-  {{#if table-check--aria-label}}
-    aria-label="{{table-check--aria-label}}"
-  {{/if}}>
+  {{#> check check--modifier="pf-m-standalone"}}
+    {{#> check-input 
+      check-input--attribute=(concat (ternary table-check--name (concat 'name="' table-check--name '"') '') (ternary table-check--aria-labelledby (concat ' aria-labelledby="' table-check--aria-labelledby '"') '') (ternary table-check--aria-label (concat ' aria-label="' table-check--aria-label '"') ''))
+    }}{{/check-input}}
+  {{/check}}
 </label>
diff --git a/src/patternfly/components/Table/templates/table--radio.hbs b/src/patternfly/components/Table/templates/table--radio.hbs
index e6acd7f721..697614c874 100644
--- a/src/patternfly/components/Table/templates/table--radio.hbs
+++ b/src/patternfly/components/Table/templates/table--radio.hbs
@@ -1,5 +1,7 @@
 {{#> table-td table-td--check="true"}}
   <label>
-    <input type="radio" name="{{table--id}}-radio" aria-labelledby="{{table--id}}-node{{table-tr--index}}">
+    {{#> radio radio--modifier="pf-m-standalone"}}
+      {{#> radio-input radio-input--attribute=(concat 'name="' table--id '-radio" aria-labelledby="' table--id '-node' table-tr--index '"')}}{{/radio-input}}
+    {{/radio}}
   </label>
 {{/table-td}}
diff --git a/src/patternfly/demos/DataList/data-list-actionable-data-list.hbs b/src/patternfly/demos/DataList/data-list-actionable-data-list.hbs
index 0d67acc940..012d3e151b 100644
--- a/src/patternfly/demos/DataList/data-list-actionable-data-list.hbs
+++ b/src/patternfly/demos/DataList/data-list-actionable-data-list.hbs
@@ -2,7 +2,7 @@
   {{#> data-list-item data-list-item--id="item-1"}}
     {{#> data-list-item-row}}
       {{#> data-list-item-control}}
-        {{#> data-list-check checkbox--attribute=(concat 'type="checkbox" name="check-action-check1" aria-labelledby="' data-list--id '-item-1"')}}{{/data-list-check}}
+        {{#> data-list-check data-list-check-checkbox--attribute=(concat 'type="checkbox" name="check-action-check1" aria-labelledby="' data-list--id '-item-1"')}}{{/data-list-check}}
       {{/data-list-item-control}}
       {{#> data-list-item-content}}
         {{#> data-list-cell data-list-cell--modifier="pf-m-align-left"}}
@@ -16,7 +16,7 @@
   {{#> data-list-item data-list-item--id="item-2"}}
     {{#> data-list-item-row}}
       {{#> data-list-item-control}}
-        {{#> data-list-check checkbox--attribute=(concat 'type="checkbox" name="check-action-check2" aria-labelledby="' data-list--id '-item-2"')}}{{/data-list-check}}
+        {{#> data-list-check data-list-check-checkbox--attribute=(concat 'type="checkbox" name="check-action-check2" aria-labelledby="' data-list--id '-item-2"')}}{{/data-list-check}}
       {{/data-list-item-control}}
       {{#> data-list-item-content}}
         {{#> data-list-cell data-list-cell--modifier="pf-m-align-left"}}
@@ -30,7 +30,7 @@
   {{#> data-list-item data-list-item--id="item-3"}}
     {{#> data-list-item-row}}
       {{#> data-list-item-control}}
-        {{#> data-list-check checkbox--attribute=(concat 'type="checkbox" name="check-action-check3" aria-labelledby="' data-list--id '-item-3"')}}{{/data-list-check}}
+        {{#> data-list-check data-list-check-checkbox--attribute=(concat 'type="checkbox" name="check-action-check3" aria-labelledby="' data-list--id '-item-3"')}}{{/data-list-check}}
       {{/data-list-item-control}}
       {{#> data-list-item-content}}
         {{#> data-list-cell data-list-cell--modifier="pf-m-align-left pf-m-flex-2"}}
@@ -44,7 +44,7 @@
   {{#> data-list-item data-list-item--id="item-4"}}
     {{#> data-list-item-row}}
       {{#> data-list-item-control}}
-        {{#> data-list-check checkbox--attribute=(concat 'type="checkbox" name="check-action-check4" aria-labelledby="' data-list--id '-item-4"')}}{{/data-list-check}}
+        {{#> data-list-check data-list-check-checkbox--attribute=(concat 'type="checkbox" name="check-action-check4" aria-labelledby="' data-list--id '-item-4"')}}{{/data-list-check}}
       {{/data-list-item-control}}
       {{#> data-list-item-content}}
         {{#> data-list-cell data-list-cell--modifier="pf-m-align-left pf-m-flex-2"}}
diff --git a/src/patternfly/demos/DataList/data-list-expandable-compact-table.hbs b/src/patternfly/demos/DataList/data-list-expandable-compact-table.hbs
index 642aeccbfd..0ccc0c93b7 100644
--- a/src/patternfly/demos/DataList/data-list-expandable-compact-table.hbs
+++ b/src/patternfly/demos/DataList/data-list-expandable-compact-table.hbs
@@ -2,7 +2,9 @@
   {{#> table-thead}}
     {{#> table-tr}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="check-all" aria-label="Select all rows">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute='name="check-all" aria-label="Select all rows"'}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-th table-th--attribute='scope="col"'}}
         Contributor
@@ -29,7 +31,9 @@
   {{#> table-tbody}}
     {{#> table-tr}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="checkrow1" aria-labelledby="{{table--id}}-name1">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute=(concat 'name="checkrow1" aria-labelledby="' table--id '-name1"')}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-td table-td--data-label="Contributor"}}
         <span id="{{table--id}}-name1">Sam Jones</span>
@@ -58,7 +62,9 @@
     {{/table-tr}}
     {{#> table-tr}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="checkrow2" aria-labelledby="{{table--id}}-name2">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute=(concat 'name="checkrow2" aria-labelledby="' table--id '-name2"')}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-th table-th--data-label="Contributor"}}
         <span id="{{table--id}}-name2">Amy Miller</span>
@@ -87,7 +93,9 @@
     {{/table-tr}}
     {{#> table-tr}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="checkrow3" aria-labelledby="{{table--id}}-name3">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute=(concat 'name="checkrow3" aria-labelledby="' table--id '-name3"')}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-th table-th--data-label="Contributor"}}
         <span id="{{table--id}}-name3">Steve Wilson</span>
@@ -116,7 +124,9 @@
     {{/table-tr}}
     {{#> table-tr}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="checkrow4" aria-labelledby="{{table--id}}-name4">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute=(concat 'name="checkrow4" aria-labelledby="' table--id '-name4"')}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-td table-td--data-label="Contributor name"}}
         <span id="{{table--id}}-name4">Emma Jackson</span>
diff --git a/src/patternfly/demos/DataList/data-list-expandable-data-list.hbs b/src/patternfly/demos/DataList/data-list-expandable-data-list.hbs
index 4e071c0e24..a3bb48e485 100644
--- a/src/patternfly/demos/DataList/data-list-expandable-data-list.hbs
+++ b/src/patternfly/demos/DataList/data-list-expandable-data-list.hbs
@@ -3,7 +3,7 @@
     {{#> data-list-item-row}}
       {{#> data-list-item-control}}
         {{#> data-list-toggle button--attribute=(concat 'aria-labelledby="ex-toggle1 ' data-list--id '-item1" id="ex-toggle1" aria-label="Toggle details for" aria-expanded="false" aria-controls="content-1"')}}{{/data-list-toggle}}
-        {{#> data-list-check checkbox--attribute=(concat 'type="checkbox" name="check-expandable-check1" aria-labelledby="' data-list--id '-item-1"')}}{{/data-list-check}}
+        {{#> data-list-check data-list-check-checkbox--attribute=(concat 'type="checkbox" name="check-expandable-check1" aria-labelledby="' data-list--id '-item-1"')}}{{/data-list-check}}
       {{/data-list-item-control}}
       {{#> data-list-item-content}}
         {{#> data-list-cell data-list-cell--modifier="pf-m-align-left"}}
@@ -23,7 +23,7 @@
     {{#> data-list-item-row}}
       {{#> data-list-item-control}}
         {{#> data-list-toggle button--attribute=(concat 'aria-labelledby="ex-toggle2 ' data-list--id '-item2" id="ex-toggle2" aria-label="Toggle details for" aria-expanded="false" aria-controls="content-2"')}}{{/data-list-toggle}}
-        {{#> data-list-check checkbox--attribute=(concat 'type="checkbox" name="check-expandable-check2" aria-labelledby="' data-list--id '-item-2"')}}{{/data-list-check}}
+        {{#> data-list-check data-list-check-checkbox--attribute=(concat 'type="checkbox" name="check-expandable-check2" aria-labelledby="' data-list--id '-item-2"')}}{{/data-list-check}}
       {{/data-list-item-control}}
       {{#> data-list-item-content}}
         {{#> data-list-cell data-list-cell--modifier="pf-m-align-left"}}
@@ -42,7 +42,7 @@
     {{#> data-list-item-row}}
       {{#> data-list-item-control}}
         {{#> data-list-toggle button--attribute=(concat 'aria-labelledby="ex-toggle3 ' data-list--id '-item3" id="ex-toggle3" aria-label="Toggle details for" aria-expanded="false" aria-controls="content-3"')}}{{/data-list-toggle}}
-        {{#> data-list-check checkbox--attribute=(concat 'type="checkbox" name="check-expandable-check3" aria-labelledby="' data-list--id '-item-3"')}}{{/data-list-check}}
+        {{#> data-list-check data-list-check-checkbox--attribute=(concat 'type="checkbox" name="check-expandable-check3" aria-labelledby="' data-list--id '-item-3"')}}{{/data-list-check}}
       {{/data-list-item-control}}
       {{#> data-list-item-content}}
         {{#> data-list-cell data-list-cell--modifier="pf-m-align-left"}}
@@ -60,7 +60,7 @@
     {{#> data-list-item-row}}
       {{#> data-list-item-control}}
         {{#> data-list-toggle button--attribute=(concat 'aria-labelledby="ex-toggle4 ' data-list--id '-item4" id="ex-toggle4" aria-label="Toggle details for" aria-expanded="false" aria-controls="content-4"')}}{{/data-list-toggle}}
-        {{#> data-list-check checkbox--attribute=(concat 'type="checkbox" name="check-expandable-check4" aria-labelledby="' data-list--id '-item-4"')}}{{/data-list-check}}
+        {{#> data-list-check data-list-check-checkbox--attribute=(concat 'type="checkbox" name="check-expandable-check4" aria-labelledby="' data-list--id '-item-4"')}}{{/data-list-check}}
       {{/data-list-item-control}}
       {{#> data-list-item-content}}
         {{#> data-list-cell data-list-cell--modifier="pf-m-align-left"}}
@@ -79,7 +79,7 @@
     {{#> data-list-item-row}}
       {{#> data-list-item-control}}
         {{#> data-list-toggle button--attribute=(concat 'aria-labelledby="ex-toggle5 ' data-list--id '-item5" id="ex-toggle5" aria-label="Toggle details for" aria-expanded="false" aria-controls="content-5"')}}{{/data-list-toggle}}
-        {{#> data-list-check checkbox--attribute=(concat 'type="checkbox" name="check-expandable-check5" aria-labelledby="' data-list--id '-item-5"')}}{{/data-list-check}}
+        {{#> data-list-check data-list-check-checkbox--attribute=(concat 'type="checkbox" name="check-expandable-check5" aria-labelledby="' data-list--id '-item-5"')}}{{/data-list-check}}
       {{/data-list-item-control}}
       {{#> data-list-item-content}}
         {{#> data-list-cell data-list-cell--modifier="pf-m-align-left"}}
diff --git a/src/patternfly/demos/Skeleton/table-skeleton.hbs b/src/patternfly/demos/Skeleton/table-skeleton.hbs
index d31d237670..d0a381f942 100644
--- a/src/patternfly/demos/Skeleton/table-skeleton.hbs
+++ b/src/patternfly/demos/Skeleton/table-skeleton.hbs
@@ -2,7 +2,9 @@
   {{#> table-thead}}
     {{#> table-tr}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="check-all" aria-label="Select all rows">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute='name="check-all" aria-label="Select all rows"'}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-th table-th--attribute='scope="col"'}}
         Repositories
diff --git a/src/patternfly/demos/Table/table-compact-table.hbs b/src/patternfly/demos/Table/table-compact-table.hbs
index 9d5d27bfb8..3bf22c172c 100644
--- a/src/patternfly/demos/Table/table-compact-table.hbs
+++ b/src/patternfly/demos/Table/table-compact-table.hbs
@@ -28,7 +28,9 @@
   {{#> table-tbody}}
     {{#> table-tr}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="checkrow1" aria-labelledby="{{table--id}}-name1">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute=(concat 'name="checkrow1" aria-labelledby="' table--id '-name1"')}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-th table-th--data-label="Contributor"}}
         <span id="{{table--id}}-name1">Sam Jones</span>
@@ -58,7 +60,9 @@
 
     {{#> table-tr}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="checkrow2" aria-labelledby="{{table--id}}-name2">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute=(concat 'name="checkrow2" aria-labelledby="' table--id '-name2"')}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-th table-th--data-label="Contributor"}}
         <span id="{{table--id}}-name2">Amy Miller</span>
@@ -88,7 +92,9 @@
 
     {{#> table-tr}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="checkrow3" aria-labelledby="{{table--id}}-name3">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute=(concat 'name="checkrow3" aria-labelledby="' table--id '-name3"')}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-th table-th--data-label="Contributor"}}
         <span id="{{table--id}}-name3">Steve Wilson</span>
@@ -118,7 +124,9 @@
 
     {{#> table-tr}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="checkrow4" aria-labelledby="{{table--id}}-name4">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute=(concat 'name="checkrow4" aria-labelledby="' table--id '-name4"')}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-th table-th--data-label="Contributor name"}}
         <span id="{{table--id}}-name4">Emma Jackson</span>
diff --git a/src/patternfly/demos/Table/table-empty-state-table.hbs b/src/patternfly/demos/Table/table-empty-state-table.hbs
index 4b8f69c42e..bc0cb5fba0 100644
--- a/src/patternfly/demos/Table/table-empty-state-table.hbs
+++ b/src/patternfly/demos/Table/table-empty-state-table.hbs
@@ -2,7 +2,9 @@
   {{#> table-thead}}
     {{#> table-tr}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="check-all" aria-label="Select all rows">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute='name="check-all" aria-label="Select all rows"'}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-th table-th--attribute='scope="col"'}}
         Repositories
diff --git a/src/patternfly/demos/Table/table-expandable-table.hbs b/src/patternfly/demos/Table/table-expandable-table.hbs
index 84935c69ff..35d01d99b3 100644
--- a/src/patternfly/demos/Table/table-expandable-table.hbs
+++ b/src/patternfly/demos/Table/table-expandable-table.hbs
@@ -27,7 +27,9 @@
     {{#> table-tr}}
       {{#> table-td table-td--toggle="true" table-td--button--attribute=(concat 'aria-labelledby="' table--id '-node1 expandable-toggle1" id="expandable-toggle1" aria-label="Details" aria-controls="' table--id '-content1"')}}{{/table-td}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="checkrow1" aria-labelledby="{{table--id}}-node1">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute=(concat 'name="checkrow1" aria-labelledby="' table--id '-node1"')}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-th table-th--data-label="Repository name"}}
         <div>
@@ -77,7 +79,9 @@
     {{#> table-tr table-tr--expanded="true"}}
       {{#> table-td table-td--toggle="true" table-td--button--attribute=(concat 'aria-labelledby="' table--id '-node2 expandable-toggle2" id="expandable-toggle2" aria-label="Details" aria-controls="' table--id '-content2"')}}{{/table-td}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="checkrow2" aria-labelledby="{{table--id}}-node2">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute=(concat 'name="checkrow2" aria-labelledby="' table--id '-node2"')}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-td table-td--data-label="Repository name"}}
         <div>
@@ -129,7 +133,9 @@
     {{#> table-tr}}
       {{#> table-td table-td--toggle="true" table-td--button--attribute=(concat 'aria-labelledby="' table--id '-node3 expandable-toggle3" id="expandable-toggle3" aria-label="Details" aria-controls="' table--id '-content3"')}}{{/table-td}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="checkrow3" aria-labelledby="{{table--id}}-node3">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute=(concat 'name="checkrow3" aria-labelledby="' table--id '-node3"')}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-th table-th--data-label="Repository name"}}
         <div>
@@ -175,7 +181,9 @@
     {{#> table-tr}}
       {{#> table-td table-td--toggle="true" table-td--button--attribute=(concat 'aria-labelledby="' table--id '-node4 expandable-toggle4" id="expandable-toggle4" aria-label="Details" aria-controls="' table--id '-content4"')}}{{/table-td}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="checkrow4" aria-labelledby="{{table--id}}-node4">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute=(concat 'name="checkrow4" aria-labelledby="' table--id '-node4"')}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-th table-th--data-label="Repository name"}}
         <div>
@@ -221,7 +229,9 @@
     {{#> table-tr}}
       {{#> table-td table-td--toggle="true" table-td--button--attribute=(concat 'aria-labelledby="' table--id '-node5 expandable-toggle5" id="expandable-toggle5" aria-label="Details" aria-controls="' table--id '-content5"')}}{{/table-td}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="checkrow5" aria-labelledby="{{table--id}}-node5">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute=(concat 'name="checkrow5" aria-labelledby="' table--id '-node5"')}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-td table-td--data-label="Repository name"}}
         <div>
diff --git a/src/patternfly/demos/Table/table-loading-table.hbs b/src/patternfly/demos/Table/table-loading-table.hbs
index 54e52ab33e..cee1eb73c5 100644
--- a/src/patternfly/demos/Table/table-loading-table.hbs
+++ b/src/patternfly/demos/Table/table-loading-table.hbs
@@ -2,7 +2,9 @@
   {{#> table-thead}}
     {{#> table-tr}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="check-all" aria-label="Select all rows">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute='name="check-all" aria-label="Select all rows"'}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-th table-th--attribute='scope="col"'}}
         Repositories
diff --git a/src/patternfly/demos/Table/table-manage-cols-data-list.hbs b/src/patternfly/demos/Table/table-manage-cols-data-list.hbs
index 49ec82bddd..8c8db7dbf7 100644
--- a/src/patternfly/demos/Table/table-manage-cols-data-list.hbs
+++ b/src/patternfly/demos/Table/table-manage-cols-data-list.hbs
@@ -3,7 +3,7 @@
     {{#> data-list-item-row}}
       {{#> data-list-item-control}}
         {{> data-list-item-draggable-icon}}
-        {{#> data-list-check checkbox--attribute=(concat 'name="' data-list--id '-check-action-check1" aria-labelledby="' data-list--id '-item-1" checked')}}{{/data-list-check}}
+        {{#> data-list-check data-list-check-checkbox--attribute=(concat 'name="' data-list--id '-check-action-check1" aria-labelledby="' data-list--id '-item-1" checked')}}{{/data-list-check}}
       {{/data-list-item-control}}
       {{#> data-list-item-content}}
         {{#> data-list-cell}}
@@ -17,7 +17,7 @@
     {{#> data-list-item-row}}
       {{#> data-list-item-control}}
         {{> data-list-item-draggable-icon}}
-        {{#> data-list-check checkbox--attribute=(concat 'name="' data-list--id '-check-action-check2" aria-labelledby="' data-list--id '-item-2" checked')}}{{/data-list-check}}
+        {{#> data-list-check data-list-check-checkbox--attribute=(concat 'name="' data-list--id '-check-action-check2" aria-labelledby="' data-list--id '-item-2" checked')}}{{/data-list-check}}
       {{/data-list-item-control}}
       {{#> data-list-item-content}}
         {{#> data-list-cell}}
@@ -31,7 +31,7 @@
     {{#> data-list-item-row}}
       {{#> data-list-item-control}}
         {{> data-list-item-draggable-icon}}
-        {{#> data-list-check checkbox--attribute=(concat 'name="' data-list--id '-check-action-check3" aria-labelledby="' data-list--id '-item-3" checked')}}{{/data-list-check}}
+        {{#> data-list-check data-list-check-checkbox--attribute=(concat 'name="' data-list--id '-check-action-check3" aria-labelledby="' data-list--id '-item-3" checked')}}{{/data-list-check}}
       {{/data-list-item-control}}
       {{#> data-list-item-content}}
         {{#> data-list-cell}}
@@ -45,7 +45,7 @@
     {{#> data-list-item-row}}
       {{#> data-list-item-control}}
         {{> data-list-item-draggable-icon}}
-        {{#> data-list-check checkbox--attribute=(concat 'name="' data-list--id '-check-action-check4" aria-labelledby="' data-list--id '-item-4" checked')}}{{/data-list-check}}
+        {{#> data-list-check data-list-check-checkbox--attribute=(concat 'name="' data-list--id '-check-action-check4" aria-labelledby="' data-list--id '-item-4" checked')}}{{/data-list-check}}
       {{/data-list-item-control}}
       {{#> data-list-item-content}}
         {{#> data-list-cell}}
@@ -59,7 +59,7 @@
     {{#> data-list-item-row}}
       {{#> data-list-item-control}}
         {{> data-list-item-draggable-icon}}
-        {{#> data-list-check checkbox--attribute=(concat 'name="' data-list--id '-check-action-check5" aria-labelledby="' data-list--id '-item-5" checked')}}{{/data-list-check}}
+        {{#> data-list-check data-list-check-checkbox--attribute=(concat 'name="' data-list--id '-check-action-check5" aria-labelledby="' data-list--id '-item-5" checked')}}{{/data-list-check}}
       {{/data-list-item-control}}
       {{#> data-list-item-content}}
         {{#> data-list-cell}}
diff --git a/src/patternfly/demos/Table/table-simple-table.hbs b/src/patternfly/demos/Table/table-simple-table.hbs
index bd5608f1dd..2a4da8c2b5 100644
--- a/src/patternfly/demos/Table/table-simple-table.hbs
+++ b/src/patternfly/demos/Table/table-simple-table.hbs
@@ -25,7 +25,9 @@
   {{#> table-tbody}}
     {{#> table-tr}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="checkrow1" aria-labelledby="{{table--id}}-node1">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute=(concat 'name="checkrow1" aria-labelledby="' table--id '-node1"')}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-th table-th--data-label="Repository name"}}
         <div>
@@ -55,7 +57,9 @@
 
     {{#> table-tr}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="checkrow2" aria-labelledby="{{table--id}}-node2">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute=(concat 'name="checkrow2" aria-labelledby="' table--id '-node2"')}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-th table-th--data-label="Repository name"}}
         <div>
@@ -85,7 +89,9 @@
 
     {{#> table-tr}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="checkrow3" aria-labelledby="{{table--id}}-node3">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute=(concat 'name="checkrow3" aria-labelledby="' table--id '-node3"')}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-th table-th--data-label="Repository name"}}
         <div>
@@ -115,7 +121,9 @@
 
     {{#> table-tr}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="checkrow4" aria-labelledby="{{table--id}}-node4">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute=(concat 'name="checkrow4" aria-labelledby="' table--id '-node4"')}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-th table-th--data-label="Repository name"}}
         <div>
@@ -145,7 +153,9 @@
 
     {{#> table-tr}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="checkrow5" aria-labelledby="{{table--id}}-node5">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute=(concat 'name="checkrow5" aria-labelledby="' table--id '-node5"')}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-td table-td--data-label="Repository name"}}
         <div>
diff --git a/src/patternfly/demos/Table/table-sortable-table.hbs b/src/patternfly/demos/Table/table-sortable-table.hbs
index 1c60b97f5e..635c0fa343 100644
--- a/src/patternfly/demos/Table/table-sortable-table.hbs
+++ b/src/patternfly/demos/Table/table-sortable-table.hbs
@@ -25,7 +25,9 @@
   {{#> table-tbody}}
     {{#> table-tr}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="checkrow1" aria-labelledby="{{table--id}}-node1">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute=(concat 'name="checkrow1" aria-labelledby="' table--id '-node1"')}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-th table-th--data-label="Repository name"}}
         <div>
@@ -55,7 +57,9 @@
 
       {{#> table-tr}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="checkrow2" aria-labelledby="{{table--id}}-node2">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute=(concat 'name="checkrow2" aria-labelledby="' table--id '-node2"')}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-th table-th--data-label="Repository name"}}
         <div>
@@ -85,7 +89,9 @@
 
     {{#> table-tr}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="checkrow3" aria-labelledby="{{table--id}}-node3">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute=(concat 'name="checkrow3" aria-labelledby="' table--id '-node3"')}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-th table-th--data-label="Repository name"}}
         <div>
@@ -115,7 +121,9 @@
 
     {{#> table-tr}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="checkrow4" aria-labelledby="{{table--id}}-node4">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute=(concat 'name="checkrow4" aria-labelledby="' table--id '-node4"')}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-th table-th--data-label="Repository name"}}
         <div>
@@ -145,7 +153,9 @@
 
     {{#> table-tr}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="checkrow4" aria-labelledby="{{table--id}}-node5">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute=(concat 'name="checkrow5" aria-labelledby="' table--id '-node5"')}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-td table-td--data-label="Repository name"}}
         <div>
diff --git a/src/patternfly/demos/Tabs/tabs--table.hbs b/src/patternfly/demos/Tabs/tabs--table.hbs
index ee40792ff6..afeb8ec727 100644
--- a/src/patternfly/demos/Tabs/tabs--table.hbs
+++ b/src/patternfly/demos/Tabs/tabs--table.hbs
@@ -2,7 +2,9 @@
   {{#> table-thead}}
     {{#> table-tr}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="check-all" aria-label="Select all rows">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute='name="check-all" aria-label="Select all rows"'}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-th table-th--attribute='scope="col"'}}
         Repositories
@@ -26,7 +28,9 @@
   {{#> table-tbody}}
     {{#> table-tr}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="checkrow1" aria-labelledby="{{table--id}}-node1">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute=(concat 'name="checkrow1" aria-labelledby="' table--id '-node1"')}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-th table-th--data-label="Repository name"}}
         <div>
@@ -74,7 +78,9 @@
 
     {{#> table-tr table-tr--modifier="pf-m-selected"}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="checkrow2" aria-labelledby="{{table--id}}-node2">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute=(concat 'name="checkrow2" aria-labelledby="' table--id '-node2"')}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-th table-th--data-label="Repository name"}}
         <div>
@@ -122,7 +128,9 @@
 
     {{#> table-tr}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="checkrow3" aria-labelledby="{{table--id}}-node3">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute=(concat 'name="checkrow3" aria-labelledby="' table--id '-node3"')}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-th table-th--data-label="Repository name"}}
         <div>
@@ -170,7 +178,9 @@
 
     {{#> table-tr}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="checkrow4" aria-labelledby="{{table--id}}-node4">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute=(concat 'name="checkrow4" aria-labelledby="' table--id '-node4"')}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-th table-th--data-label="Repository name"}}
         <div>
@@ -218,7 +228,9 @@
 
     {{#> table-tr}}
       {{#> table-td table-td--check="true"}}
-        <input type="checkbox" name="checkrow5" aria-labelledby="{{table--id}}-node5">
+        {{#> check check--modifier="pf-m-standalone"}}
+          {{#> check-input check-input--attribute=(concat 'name="checkrow5" aria-labelledby="' table--id '-node5"')}}{{/check-input}}
+        {{/check}}
       {{/table-td}}
       {{#> table-td table-td--data-label="Repository name"}}
         <div>