diff --git a/packages/web-components/src/components/cbp-app/cbp-app.scss b/packages/web-components/src/components/cbp-app/cbp-app.scss
index 08eca12a..758dc945 100644
--- a/packages/web-components/src/components/cbp-app/cbp-app.scss
+++ b/packages/web-components/src/components/cbp-app/cbp-app.scss
@@ -1 +1,2 @@
+/* Temporary workaround for verified Stencil bug; can use @use due to compilation error */
 @import 'reset', 'roboto', 'css-variables', 'core';
\ No newline at end of file
diff --git a/packages/web-components/src/components/cbp-button/cbp-button.stories.tsx b/packages/web-components/src/components/cbp-button/cbp-button.stories.tsx
index ad7375d5..c8dcdb14 100644
--- a/packages/web-components/src/components/cbp-button/cbp-button.stories.tsx
+++ b/packages/web-components/src/components/cbp-button/cbp-button.stories.tsx
@@ -91,18 +91,18 @@ const Template = ({ label, tag, type, href, rel, target, download, fill, color,
   return ` 
       <cbp-app>
       <cbp-button
-        ${tag !== 'button' ? 'tag="'+tag+'"' : ''}
+        ${tag !== 'button' ? `tag=${tag}` : ''}
         type="${type}"
-        ${href ? 'href="'+href+'"' : ''}
-        ${rel ? 'rel="'+rel+'"' : ''}
-        ${target ? 'target="'+target+'"' : ''}
-        ${download ? 'download="'+download+'"' : ''}
+        ${href ? `href=${href}` : ''}
+        ${rel ? `rel=${rel}` : ''}
+        ${target ? `target=${target}` : ''}
+        ${download ? `download=${download}` : ''}
         fill="${fill}"
         color="${color}"
-        ${variant !== 'default' ? 'variant="'+variant+'"' : ''}
-        ${accessibilityText ? 'accessibility-text="'+accessibilityText+'"' : ''}
-        ${disabled ? 'disabled="'+disabled+'"' : ''}
-        ${sx ? 'sx='+JSON.stringify(sx) : ''}
+        ${variant !== 'default' ? `variant=${variant}` : ''}
+        ${accessibilityText ? `accessibility-text=${accessibilityText}` : ''}
+        ${disabled ? `disabled=${disabled}` : ''}
+        ${sx ? `sx=${JSON.stringify(sx)}` : ''}
       >
         ${label}
       </cbp-button>
diff --git a/packages/web-components/src/components/cbp-container/cbp-container.stories.tsx b/packages/web-components/src/components/cbp-container/cbp-container.stories.tsx
index 128a63eb..41f4cff1 100644
--- a/packages/web-components/src/components/cbp-container/cbp-container.stories.tsx
+++ b/packages/web-components/src/components/cbp-container/cbp-container.stories.tsx
@@ -37,11 +37,11 @@ export default {
     return ` 
         <cbp-app>
         <cbp-container
-          ${background ? 'background="'+background+'"' : ''}
-          ${textColor ? 'text-color="'+textColor+'"' : ''}
-          ${width ? 'width="'+width+'"' : ''}
-          ${margins ? 'margins="'+margins+'"' : ''}
-          ${sx ? 'sx='+JSON.stringify(sx) : ''}
+          ${background ? `background=${background}` : ''}
+          ${textColor ? `text-color=${textColor}` : ''}
+          ${width ? `width=${width}` : ''}
+          ${margins ? `margins=${margins}` : ''}
+          ${sx ? `sx=${JSON.stringify(sx)}` : ''}
         >
           ${content}
         </cbp-container>