diff --git a/apps/dragon-foods/pages/product.tsx b/apps/dragon-foods/pages/product.tsx
index 13c594b7..62c22990 100644
--- a/apps/dragon-foods/pages/product.tsx
+++ b/apps/dragon-foods/pages/product.tsx
@@ -196,7 +196,7 @@ const Product = () => {
           mr="20px"
         >
           <Button
-            text="proceed"
+            text="Proceed"
             dataTest={testIds.Proceed_to_product}
             disabled={!checkIsDisabled()}
             handleClick={handleOnProceed}
diff --git a/apps/harmoni-aids/pages/product.tsx b/apps/harmoni-aids/pages/product.tsx
index f62b70dd..da525111 100644
--- a/apps/harmoni-aids/pages/product.tsx
+++ b/apps/harmoni-aids/pages/product.tsx
@@ -206,7 +206,7 @@ const Product = () => {
             handleClick={handleOnProceed}
           />
         </Box>
-        ** Contains non-personal data only dataTest={testIds.disclaimer_text}
+        ** Contains non-personal data only
       </Flex>
     </Box>
   )
diff --git a/apps/sky-analytics/pages/product.tsx b/apps/sky-analytics/pages/product.tsx
index 05977686..e08aaef4 100644
--- a/apps/sky-analytics/pages/product.tsx
+++ b/apps/sky-analytics/pages/product.tsx
@@ -204,7 +204,7 @@ const Product = () => {
             handleClick={handleOnProceed}
           />
         </Box>
-        ** Contains non-personal data only dataTest={testIds.disclaimer_text}
+        ** Contains non-personal data only
       </Flex>
     </Box>
   )
diff --git a/cypress/e2e/climate-resilience/dragonFood_e2eTests.cy.ts b/cypress/e2e/climate-resilience/dragonFood_e2eTests.cy.ts
index 6685702b..8bcc1d7a 100644
--- a/cypress/e2e/climate-resilience/dragonFood_e2eTests.cy.ts
+++ b/cypress/e2e/climate-resilience/dragonFood_e2eTests.cy.ts
@@ -203,11 +203,9 @@ describe('End to End test cases for Dragon Food app', () => {
       cy.getByData(testIds.product_radio_text).eq(4).should('contain.text', '3 months').click()
 
       cy.getByData(testIds.product_checkbox).eq(25).should('contain.text', 'Accept').click()
-      cy.get('.chakra-button').click()
-      //cy.getByData(testIds.Proceed_to_product).click()
+      cy.getByData(testIds.Proceed_to_product).click()
       cy.wait(3000)
-      cy.get('.chakra-button').click()
-      //cy.getByData(testIds.Proceed).click()
+      cy.getByData(testIds.Proceed).click()
     })
     it('should validate Billing Details', () => {
       cy.getByData(testIds.open_form).click()
diff --git a/cypress/e2e/climate-resilience/harmoniAid.cy.ts b/cypress/e2e/climate-resilience/harmoniAid.cy.ts
index e93709c3..774cf4f5 100644
--- a/cypress/e2e/climate-resilience/harmoniAid.cy.ts
+++ b/cypress/e2e/climate-resilience/harmoniAid.cy.ts
@@ -188,11 +188,9 @@ describe('End to End test cases for Harmoni Aid app', () => {
       cy.getByData(testIds.product_radio_text).eq(3).should('contain.text', 'One time').click()
 
       cy.getByData(testIds.product_checkbox).eq(11).should('contain.text', 'Accept').click()
-      cy.get('.chakra-button').click()
-      //cy.getByData(testIds.Proceed_to_product).click()
+      cy.getByData(testIds.Proceed_to_product).click()
       cy.wait(3000)
-      cy.get('.chakra-button').click()
-      //cy.getByData(testIds.Proceed).click()
+      cy.getByData(testIds.Proceed).click()
     })
   })
   context('Billing Details', () => {
diff --git a/cypress/e2e/climate-resilience/skyAnalytics_e2eTests.cy.ts b/cypress/e2e/climate-resilience/skyAnalytics_e2eTests.cy.ts
index 9bc6835f..2270114e 100644
--- a/cypress/e2e/climate-resilience/skyAnalytics_e2eTests.cy.ts
+++ b/cypress/e2e/climate-resilience/skyAnalytics_e2eTests.cy.ts
@@ -197,11 +197,9 @@ describe('End to End test cases for Dragon Food app', () => {
       cy.getByData(testIds.product_radio_text).eq(4).should('contain.text', '3 months').click()
 
       cy.getByData(testIds.product_checkbox).eq(17).should('contain.text', 'Accept').click()
-      cy.get('.chakra-button').click()
-      //cy.getByData(testIds.Proceed_to_product).click()
+      cy.getByData(testIds.Proceed_to_product).click()
       cy.wait(3000)
-      cy.get('.chakra-button').click()
-      //cy.getByData(testIds.Proceed).click()
+      cy.getByData(testIds.Proceed).click()
     })
   })
   context('Billing Details', () => {