diff --git a/store/blocks/pdp/product.jsonc b/store/blocks/pdp/product.jsonc
index da349ad..6e5f4cd 100644
--- a/store/blocks/pdp/product.jsonc
+++ b/store/blocks/pdp/product.jsonc
@@ -12,7 +12,7 @@
     "children": [
       "html#breadcrumb",
       "condition-layout.product#availability",
-      "tab-layout#product",
+      "html#tab-layout",
       
       // "flex-layout.row#description",
       // "flex-layout.row#specifications-title",
@@ -95,12 +95,16 @@
 
   "flex-layout.row#product-image": {
     "props": {},
+    "children": ["html#product-images"]
+  },
+  "html#product-images": {
+    "props": {
+      "testId":"product-images"
+    },
     "children": ["product-images"]
   },
-
   "product-images": {
     "props": {
-      "testId":"product-images",
       "blockClass": "divImagens",
       "aspectRatio": {
         "desktop": "auto",
@@ -126,8 +130,8 @@
       "flex-layout.row#selling-price",
       // "flex-layout.row#list-price-savings",
       "product-installments#custom",
-      "pixCustom",
-      "sku-selector",
+      "html#pixCustom",
+      "html#sku-selector",
       "html#quantidadeEButtonCustom",
       // "product-separator",
       // "product-quantity",
@@ -136,19 +140,25 @@
       // "flex-layout.row#buy-button",
       // "availability-subscriber"
       "rich-text#titleCep",
-      "shipping-simulator"
+      "html#shipping-simulator"
       // "share#default"
     ]
   },
-  "pixCustom":{
+  "html#pixCustom":{
     "props":{
       "testId":"pix-price"
-    }
+    },
+    "children": ["pixCustom"]
+  },
+  "html#shipping-simulator":{
+    "props":{
+      "testId":"shipping-simulator"
+    },
+    "children": ["shipping-simulator"]
   },
   "shipping-simulator":{
     "props":{
       "blockClass":"divCep"
-      // "placeholder": "Digite seu CEP"
     }
   },
   "rich-text#titleCep": {
@@ -161,11 +171,16 @@
     "props": {
       "blockClass": "quantidadeEBuy"
     },
-    "children": ["product-quantity","flex-layout.row#buy-button"]
+    "children": ["html#product-quantity","flex-layout.row#buy-button"]
+  },
+  "html#product-quantity":{
+    "props": {
+      "testId":"product-quantity"
+    },
+    "children": ["product-quantity"]
   },
   "product-quantity":{
     "props":{
-      "testId":"product-quantity",
       "blockClass":"divQuantidade",
       "size":"regular"
     }
@@ -192,10 +207,14 @@
     },
     "children": ["vtex.store-components:product-name"]
   },
-
+  "html#sku-selector": {
+    "props": {
+      "testId":"sku-selector"
+    },
+    "children": ["sku-selector"]
+  },
   "sku-selector": {
     "props": {
-      "testId":"sku-selector",
       "blockClass":"divSku",
       "variationsSpacing": 3,
       "showValueNameForImageVariation": true
@@ -208,12 +227,13 @@
       "marginTop": 4,
       "marginBottom": 7
     },
-    "children": ["add-to-cart-button"]
+    "children": ["html#add-to-cart-button"]
   },
-  "add-to-cart-button":{
+  "html#add-to-cart-button": {
     "props":{
       "testId":"add-to-cart-button"
-    }
+    },
+    "children": ["add-to-cart-button"]
   },
   "flex-layout.row#product-availability": {
     "props": {
@@ -238,7 +258,7 @@
       "flex-layout.row#product-name",
       "product-identifier.product",
       "flex-layout.col#availability",
-      "sku-selector"
+      "html#sku-selector"
     ]
   },
   "flex-layout.col#availability": {
@@ -263,7 +283,12 @@
       }
     }
   },
-
+  "html#tab-layout": {
+    "props": {
+      "testId": "tab-layout"
+    },
+    "children": ["tab-layout#product"]
+  },
   "tab-layout#product": {
     "children": ["tab-list#product", "tab-content#product"],
     "props": {
@@ -388,6 +413,11 @@
     },
     "children": ["flex-layout.col#divImgDescription", "product-description"]
   },
+  "product-description":{
+    "props":{
+      "blockClass":"description"
+    }
+  },
   "rich-text#titleSlick": {
     "props": {
       "textAlignment": "CENTER",
@@ -398,11 +428,15 @@
   },
   "list-context.product-list#demo": {
     "blocks": ["product-summary.shelf#demo"],
-    "children": ["slider-layout#demo-product"]
+    "children": ["html#slider-layout"]
   },
 
   "product-summary.shelf#demo": {
-    "props":{
+    "children": ["html#product-summary"]
+  },
+  
+  "html#product-summary": {
+    "props": {
       "testId":"vtex-product-summary"
     },
     "children": [
@@ -414,10 +448,15 @@
       // "product-summary-buy-button"
     ]
   },
-  
+
+  "html#slider-layout":{
+    "props": {
+      "testId":"product-summary-list"
+    },
+    "children": ["slider-layout#demo-product"]
+  },
   "slider-layout#demo-product": {
     "props": {
-      "testId":"product-summary-list",
       "itemsPerPage": {
         "desktop": 4,
         "tablet": 3,
diff --git a/styles/css/vtex.flex-layout.css b/styles/css/vtex.flex-layout.css
index a99f5c8..e3d8b33 100644
--- a/styles/css/vtex.flex-layout.css
+++ b/styles/css/vtex.flex-layout.css
@@ -81,6 +81,13 @@
 
 .flexRowContent--divProduct {
   gap: 32px;
+  margin: 0;
+  margin-top: 16px !important;
+  padding: 0px !important;
+  padding-left: 40px !important;
+  margin-bottom: 16px !important;
+  padding-right: 40px !important;
+  max-width: 100%;
 }
 @media (max-width: 1024px) {
   .flexRowContent--divProduct {
diff --git a/styles/css/vtex.store-components.css b/styles/css/vtex.store-components.css
index 5159d6f..07ea823 100644
--- a/styles/css/vtex.store-components.css
+++ b/styles/css/vtex.store-components.css
@@ -13,11 +13,7 @@
 
 .container {
   margin: 0;
-  margin-top: 16px !important;
   padding: 0px !important;
-  padding-left: 40px !important;
-  margin-bottom: 16px !important;
-  padding-right: 40px !important;
   max-width: 100%;
 }
 .container .productImagesContainer--divImagens {
diff --git a/styles/sass/pages/product/vtex.flex-layout.scss b/styles/sass/pages/product/vtex.flex-layout.scss
index 1bc6e7e..5408e1b 100644
--- a/styles/sass/pages/product/vtex.flex-layout.scss
+++ b/styles/sass/pages/product/vtex.flex-layout.scss
@@ -66,6 +66,13 @@
 
 .flexRowContent--divProduct {
   gap: 32px;
+  margin: 0;
+  margin-top: 16px !important;
+  padding: 0px !important;
+  padding-left: 40px !important;
+  margin-bottom: 16px !important;
+  padding-right: 40px !important;
+  max-width: 100%;
   @media (max-width: 1024px) {
     flex-direction: column;
   }
diff --git a/styles/sass/pages/product/vtex.store-components.scss b/styles/sass/pages/product/vtex.store-components.scss
index 8993116..907c0fa 100644
--- a/styles/sass/pages/product/vtex.store-components.scss
+++ b/styles/sass/pages/product/vtex.store-components.scss
@@ -3,11 +3,7 @@
 }
 .container {
   margin: 0;
-  margin-top: 16px !important;
   padding: 0px !important;
-  padding-left: 40px !important;
-  margin-bottom: 16px !important;
-  padding-right: 40px !important;
   max-width: 100%;
   .productImagesContainer--divImagens {
     width: 100%;