diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e441be270..80dfbe7f57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Draft
+- Translation Gap: Checkbox Option selection on Product. [#2063](https://github.com/bigcommerce/cornerstone/pull/2063)
 
 ## 6.1.1 (10-01-2021)
 - Fix product images on PDP has clipped outline. [#2124](https://github.com/bigcommerce/cornerstone/pull/2124)
diff --git a/templates/components/account/order-contents.html b/templates/components/account/order-contents.html
index dcde21d207..f2b452365f 100644
--- a/templates/components/account/order-contents.html
+++ b/templates/components/account/order-contents.html
@@ -58,7 +58,7 @@ <h6>{{brand.name}}</h6>
                 <dl class="definitionList">
                     {{#each options}}
                         <dt class="definitionList-key">{{name}}:</dt>
-                        <dd class="definitionList-value">{{{sanitize value}}}</dd>
+                        <dd class="definitionList-value">{{> components/common/product-options}}</dd>
                     {{/each}}
                 </dl>
                 {{/if}}
diff --git a/templates/components/account/returns-list.html b/templates/components/account/returns-list.html
index d2ab2dedec..145d1cd952 100644
--- a/templates/components/account/returns-list.html
+++ b/templates/components/account/returns-list.html
@@ -37,7 +37,7 @@ <h5 class="account-product-title">{{lang 'account.returns.list.return_number' id
                     <dl class="definitionList">
                         {{#each product.options}}
                             <dt class="definitionList-key">{{name}}:</dt>
-                            <dd class="definitionList-value">{{{sanitize value}}}</dd>
+                            <dd class="definitionList-value">{{> components/common/product-options}}</dd>
                         {{/each}}
                     </dl>
                 {{/if}}
diff --git a/templates/components/cart/content.html b/templates/components/cart/content.html
index 976708a3e1..e41bd377bb 100644
--- a/templates/components/cart/content.html
+++ b/templates/components/cart/content.html
@@ -47,7 +47,7 @@ <h2 class="cart-item-name">
                                     {{#if is_file}}
                                         <a href="/viewfile.php?attributeId={{id}}&cartitem={{../id}}">{{value}}</a>
                                     {{else}}
-                                        {{{ sanitize value}}}
+                                        {{> components/common/product-options}}
                                     {{/if}}
                                 </dd>
                             {{/each}}
diff --git a/templates/components/cart/preview.html b/templates/components/cart/preview.html
index 5fd19560e8..82430c6435 100644
--- a/templates/components/cart/preview.html
+++ b/templates/components/cart/preview.html
@@ -88,7 +88,7 @@ <h2 class="productView-title">
                                 {{name}}
                             </dt>
                             <dd class="productView-info-value">
-                                {{{ sanitize value}}}
+                                {{> components/common/product-options}}
                             </dd>
                         </dl>
                     {{/each}}
diff --git a/templates/components/common/product-options.html b/templates/components/common/product-options.html
new file mode 100644
index 0000000000..24ac131c63
--- /dev/null
+++ b/templates/components/common/product-options.html
@@ -0,0 +1,7 @@
+{{#if value '==' 'Yes'}}
+{{lang 'common.yes'}}
+{{else if value '==' 'No'}}
+{{lang 'common.no'}}
+{{else}}
+{{{sanitize value}}}
+{{/if}}