diff --git a/store/blocks/pdp/product.jsonc b/store/blocks/pdp/product.jsonc
index fcfc31b..22f300e 100644
--- a/store/blocks/pdp/product.jsonc
+++ b/store/blocks/pdp/product.jsonc
@@ -53,7 +53,7 @@
       "paddingTop": 7,
       "paddingBottom": 7
     },
-    "children": ["flex-layout.col#stack", "flex-layout.col#right-col"]
+    "children": ["flex-layout.col#stack", "html#right-col"]
   },
 
   "stack-layout": {
@@ -100,7 +100,7 @@
       "thumbnailsOrientation": "horizontal"
     }
   },
-  "flex-layout.col#right-col": {
+  "html#right-col": {
     "props": {
       "preventVerticalStretch": true,
       "rowGap": 0
@@ -108,21 +108,40 @@
     "children": [
       "flex-layout.row#product-name",
       "product-identifier.product",
-      "product-rating-summary",
+      // "product-rating-summary",
       "flex-layout.row#selling-price",
       "installment-product-component",
       "html#pix-component",
-      "product-separator",
+      // "product-separator",
       "html#sku-selector",
-      "product-quantity",
+      // "product-quantity",
+      "html#cart-content",
       "product-assembly-options",
       "product-gifts",
-      "flex-layout.row#buy-button",
+      // "flex-layout.row#buy-button",
       "availability-subscriber",
       "shipping-simulator",
       "share#default"
     ]
   },
+  "html#cart-content": {
+    "props": {
+      "blockClass": "cart-content"
+    },
+    "children": ["html#product-quantity", "html#flex-layout.row#buy-button"]
+  },
+  "html#product-quantity": {
+    "props": {
+      "testId": "product-quantity"
+    },
+    "children": ["product-quantity"]
+  },
+  "html#flex-layout.row#buy-button": {
+    "props": {
+      "testId": "add-to-cart-button"
+    },
+    "children": ["flex-layout.row#buy-button"]
+  },
   "html#pix-component": {
     "props": {
       "testId": "pix-price"
@@ -135,7 +154,7 @@
     },
     "children": ["vtex.store-components:product-name"]
   },
-  "html#sku-selector":{
+  "html#sku-selector": {
     "props": {
       "testId": "sku-selector"
     },
@@ -164,12 +183,9 @@
       "marginBottom": 7,
       "paddingTop": 7
     },
-    "children": [
-      "flex-layout.col#stack",
-      "flex-layout.col#right-col-availability"
-    ]
+    "children": ["flex-layout.col#stack", "html#right-col-availability"]
   },
-  "flex-layout.col#right-col-availability": {
+  "html#right-col-availability": {
     "props": {
       "preventVerticalStretch": true,
       "rowGap": 0,