diff --git a/package.json b/package.json
index dfff4a9bc0..f652c73b0f 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
     "@angular/ssr": "^17.3.6",
     "@cucumber/cucumber": "^10.8.0",
     "@edium/fsm": "^2.1.2",
-    "@hmcts/ccd-case-ui-toolkit": "7.0.71",
+    "@hmcts/ccd-case-ui-toolkit": "7.0.71-ungrey-back-button",
     "@hmcts/ccpay-web-component": "6.2.1",
     "@hmcts/frontend": "0.0.50-alpha",
     "@hmcts/media-viewer": "4.0.8",
diff --git a/playwright_tests/E2E/createFlag-scenario.test.ts b/playwright_tests/E2E/createFlag-scenario.test.ts
index af6a4d4ff8..301ff785de 100644
--- a/playwright_tests/E2E/createFlag-scenario.test.ts
+++ b/playwright_tests/E2E/createFlag-scenario.test.ts
@@ -51,14 +51,14 @@ test('Create case flag Add/Update Reasonable adjustment', async ({ page }) => {
   await expect(page.getByText('Applicant (Party 1)')).toBeVisible();
   await expect(page.getByText('Respondent (Party 2)')).toBeVisible();
   await page.getByLabel('Applicant (Party 1)').check();
-  await page.getByRole('button', { name: 'Next' }).click();
+  await page.getByRole('button', { name: 'Continue' }).click();
   await axeTest(page);
 
   console.log("Select flag type");
   await expect(page.getByRole('heading', { name: 'Select flag type' })).toBeVisible();
   await expect(page.getByText('Reasonable adjustment')).toBeVisible();
   await page.getByLabel('Reasonable adjustment').check();
-  await page.getByRole('button', { name: 'Next' }).click();
+  await page.getByRole('button', { name: 'Continue' }).click();
   await expect(page.getByText(caseId)).toBeVisible();
   await axeTest(page);
 
@@ -71,18 +71,18 @@ test('Create case flag Add/Update Reasonable adjustment', async ({ page }) => {
   await expect(page.getByText('I need to request a certain')).toBeVisible();
   await expect(page.getByText('I need help communicating and')).toBeVisible();
   await expect(page.getByText('Other')).toBeVisible();
-  await page.getByRole('button', { name: 'Next' }).click();
+  await page.getByRole('button', { name: 'Continue' }).click();
   await expect(page.getByRole('heading', { name: 'I need documents in an' })).toBeVisible();
   await expect(page.getByText('Documents in a specified')).toBeVisible();
   await page.getByLabel('Documents in a specified').check();
-  await page.getByRole('button', { name: 'Next' }).click();
+  await page.getByRole('button', { name: 'Continue' }).click();
   await axeTest(page);
 
   console.log("Add comments for this flag");
   await expect(page.getByText('Add comments for this flag')).toBeVisible();
   await page.getByLabel('Add comments for this flag').click();
   await page.getByLabel('Add comments for this flag').fill('Test auto comment');
-  await page.getByRole('button', { name: 'Next' }).click();
+  await page.getByRole('button', { name: 'Continue' }).click();
   await expect(page.getByText(caseId)).toBeVisible();
   await axeTest(page);
 
diff --git a/test_codecept/e2e/features/pageObjects/caseFlags/caseFlagsWorkflow.js b/test_codecept/e2e/features/pageObjects/caseFlags/caseFlagsWorkflow.js
index f8e3debfdb..187136063d 100644
--- a/test_codecept/e2e/features/pageObjects/caseFlags/caseFlagsWorkflow.js
+++ b/test_codecept/e2e/features/pageObjects/caseFlags/caseFlagsWorkflow.js
@@ -17,7 +17,7 @@ const UpdateFlagAddTranslationPage = require('./updateFlagAddTranslationPage')
 class CaseFlagsWorkflow{
 
     constructor(){
-        this.nextButton = element(by.xpath(`//button[contains(text(),'Next')]`))
+        this.nextButton = element(by.xpath(`//button[contains(text(),'Continue')]`))
         this.pages = {
             "Where should this flag be added?" : new SelectFlagLocationPage(),
             "Select flag type" : new SelectFlagTypePage(),
diff --git a/test_codecept/e2e/features/pageObjects/caseFlags/selectFlagTypePage.js b/test_codecept/e2e/features/pageObjects/caseFlags/selectFlagTypePage.js
index c862e4c561..e9c194fe5f 100644
--- a/test_codecept/e2e/features/pageObjects/caseFlags/selectFlagTypePage.js
+++ b/test_codecept/e2e/features/pageObjects/caseFlags/selectFlagTypePage.js
@@ -2,7 +2,7 @@
 
 class SelectFlagTypePage {
     constructor(flagType) {
-        this.container = $('ccd-select-flag-type')
+        this.container = element(by.xpath('//ccd-select-flag-type/div/fieldset'))
 
         this.flagType = flagType;
         this.fieldMapping = {
diff --git a/yarn.lock b/yarn.lock
index 78561287cc..5d5df63958 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3374,12 +3374,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@hmcts/ccd-case-ui-toolkit@npm:7.0.71":
-  version: 7.0.71
-  resolution: "@hmcts/ccd-case-ui-toolkit@npm:7.0.71"
+"@hmcts/ccd-case-ui-toolkit@npm:7.0.71-ungrey-back-button":
+  version: 7.0.71-ungrey-back-button
+  resolution: "@hmcts/ccd-case-ui-toolkit@npm:7.0.71-ungrey-back-button"
   dependencies:
     tslib: ^2.3.0
-  checksum: dc9d1ea703da24993df96424f8b615c86d67c09b55821c057f2c6cbf6002f2583032cbe16ce73234d1bd450602596fef66647eb5e6375c132a8a0be7ce883ab8
+  checksum: 23b74fe7754d4038221a6e9c48c8184f2453becf513b93c73de63004f1fcdfdc3a14a155b4d1daf53a22bf86fb0391fdaa8a3a50a75bab119d163c47e549d0d4
   languageName: node
   linkType: hard
 
@@ -22008,7 +22008,7 @@ __metadata:
     "@axe-core/playwright": ^4.9.1
     "@cucumber/cucumber": ^10.8.0
     "@edium/fsm": ^2.1.2
-    "@hmcts/ccd-case-ui-toolkit": 7.0.71
+    "@hmcts/ccd-case-ui-toolkit": 7.0.71-ungrey-back-button
     "@hmcts/ccpay-web-component": 6.2.1
     "@hmcts/frontend": 0.0.50-alpha
     "@hmcts/media-viewer": 4.0.8