diff --git a/frontend/src/__tests__/app/choose-templates/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/choose-templates/__snapshots__/page.test.tsx.snap
index d240745d1..264bb12a4 100644
--- a/frontend/src/__tests__/app/choose-templates/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/choose-templates/__snapshots__/page.test.tsx.snap
@@ -111,7 +111,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
                     <a
                       class="nhsuk-link nhsuk-link--no-visited-state"
                       data-testid="change-template-link-NHSAPP"
-                      href="/message-plans/choose-nhs-app-template/fbb81055-79b9-4759-ac07-d191ae57be34"
+                      href="/message-plans/choose-nhs-app-template/fbb81055-79b9-4759-ac07-d191ae57be34?lockNumber=0"
                     >
                       Change
                       <span
@@ -127,14 +127,22 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
                     <form>
                       <input
                         name="channel"
+                        readonly=""
                         type="hidden"
                         value="NHSAPP"
                       />
                       <input
                         name="routingConfigId"
+                        readonly=""
                         type="hidden"
                         value="fbb81055-79b9-4759-ac07-d191ae57be34"
                       />
+                      <input
+                        name="lockNumber"
+                        readonly=""
+                        type="hidden"
+                        value="0"
+                      />
                       <button
                         class="channel-template-link--remove nhsuk-link"
                         data-testid="remove-template-link-NHSAPP"
@@ -284,7 +292,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
                     <a
                       class="nhsuk-link nhsuk-link--no-visited-state"
                       data-testid="change-template-link-SMS"
-                      href="/message-plans/choose-text-message-template/fbb81055-79b9-4759-ac07-d191ae57be34"
+                      href="/message-plans/choose-text-message-template/fbb81055-79b9-4759-ac07-d191ae57be34?lockNumber=0"
                     >
                       Change
                       <span
@@ -300,14 +308,22 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
                     <form>
                       <input
                         name="channel"
+                        readonly=""
                         type="hidden"
                         value="SMS"
                       />
                       <input
                         name="routingConfigId"
+                        readonly=""
                         type="hidden"
                         value="fbb81055-79b9-4759-ac07-d191ae57be34"
                       />
+                      <input
+                        name="lockNumber"
+                        readonly=""
+                        type="hidden"
+                        value="0"
+                      />
                       <button
                         class="channel-template-link--remove nhsuk-link"
                         data-testid="remove-template-link-SMS"
@@ -451,7 +467,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
                     <a
                       class="nhsuk-link nhsuk-link--no-visited-state"
                       data-testid="choose-template-link-EMAIL"
-                      href="/message-plans/choose-email-template/fbb81055-79b9-4759-ac07-d191ae57be34"
+                      href="/message-plans/choose-email-template/fbb81055-79b9-4759-ac07-d191ae57be34?lockNumber=0"
                     >
                       Choose
                       <span
@@ -595,7 +611,7 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
                     <a
                       class="nhsuk-link nhsuk-link--no-visited-state"
                       data-testid="change-template-link-LETTER"
-                      href="/message-plans/choose-standard-english-letter-template/fbb81055-79b9-4759-ac07-d191ae57be34"
+                      href="/message-plans/choose-standard-english-letter-template/fbb81055-79b9-4759-ac07-d191ae57be34?lockNumber=0"
                     >
                       Change
                       <span
@@ -611,14 +627,22 @@ exports[`ChooseTemplatesPage renders correctly for a message plan with multiple
                     <form>
                       <input
                         name="channel"
+                        readonly=""
                         type="hidden"
                         value="LETTER"
                       />
                       <input
                         name="routingConfigId"
+                        readonly=""
                         type="hidden"
                         value="fbb81055-79b9-4759-ac07-d191ae57be34"
                       />
+                      <input
+                        name="lockNumber"
+                        readonly=""
+                        type="hidden"
+                        value="0"
+                      />
                       <button
                         class="channel-template-link--remove nhsuk-link"
                         data-testid="remove-template-link-LETTER"
diff --git a/frontend/src/__tests__/app/choose-templates/page.test.tsx b/frontend/src/__tests__/app/choose-templates/page.test.tsx
index e69708789..d80b1acbd 100644
--- a/frontend/src/__tests__/app/choose-templates/page.test.tsx
+++ b/frontend/src/__tests__/app/choose-templates/page.test.tsx
@@ -38,6 +38,7 @@ const routingConfig: RoutingConfig = {
   updatedAt: '2025-01-13T10:19:25.579Z',
   cascadeGroupOverrides: [],
   cascade: [],
+  lockNumber: 0,
   defaultCascadeGroup: 'standard',
 };
 
diff --git a/frontend/src/__tests__/app/message-plans/choose-email-template/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/message-plans/choose-email-template/__snapshots__/page.test.tsx.snap
index 7a03f573f..2234890a1 100644
--- a/frontend/src/__tests__/app/message-plans/choose-email-template/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/message-plans/choose-email-template/__snapshots__/page.test.tsx.snap
@@ -38,6 +38,12 @@ exports[`ChooseEmailTemplate page renders Email template selection 1`] = `
             type="hidden"
             value="no_token"
           />
+          <input
+            name="lockNumber"
+            readonly=""
+            type="hidden"
+            value="42"
+          />
           <dl
             class="nhsuk-summary-list"
             data-testid="previous-selection-summary"
diff --git a/frontend/src/__tests__/app/message-plans/choose-email-template/page.test.tsx b/frontend/src/__tests__/app/message-plans/choose-email-template/page.test.tsx
index 41d2ed2ac..291824f49 100644
--- a/frontend/src/__tests__/app/message-plans/choose-email-template/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/choose-email-template/page.test.tsx
@@ -23,6 +23,9 @@ describe('ChooseEmailTemplate page', () => {
       params: Promise.resolve({
         routingConfigId: 'invalid-id',
       }),
+      searchParams: Promise.resolve({
+        lockNumber: '42',
+      }),
     });
 
     expect(getRoutingConfigMock).toHaveBeenCalledWith('invalid-id');
@@ -45,6 +48,9 @@ describe('ChooseEmailTemplate page', () => {
       params: Promise.resolve({
         routingConfigId: ROUTING_CONFIG.id,
       }),
+      searchParams: Promise.resolve({
+        lockNumber: '42',
+      }),
     });
 
     expect(getRoutingConfigMock).toHaveBeenCalledWith(ROUTING_CONFIG.id);
@@ -63,6 +69,9 @@ describe('ChooseEmailTemplate page', () => {
       params: Promise.resolve({
         routingConfigId: ROUTING_CONFIG.id,
       }),
+      searchParams: Promise.resolve({
+        lockNumber: '42',
+      }),
     });
 
     const container = render(page);
@@ -77,4 +86,17 @@ describe('ChooseEmailTemplate page', () => {
     });
     expect(container.asFragment()).toMatchSnapshot();
   });
+
+  it('redirects to choose templates page if the lockNumber is missing', async () => {
+    await ChooseEmailTemplate({
+      params: Promise.resolve({
+        routingConfigId: ROUTING_CONFIG.id,
+      }),
+    });
+
+    expect(redirectMock).toHaveBeenCalledWith(
+      `/message-plans/choose-templates/${ROUTING_CONFIG.id}`,
+      'replace'
+    );
+  });
 });
diff --git a/frontend/src/__tests__/app/message-plans/choose-nhs-app-template/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/message-plans/choose-nhs-app-template/__snapshots__/page.test.tsx.snap
index 812550c1b..c8548fc54 100644
--- a/frontend/src/__tests__/app/message-plans/choose-nhs-app-template/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/message-plans/choose-nhs-app-template/__snapshots__/page.test.tsx.snap
@@ -38,6 +38,12 @@ exports[`ChooseNHSAppTemplate page renders NHS App template selection 1`] = `
             type="hidden"
             value="no_token"
           />
+          <input
+            name="lockNumber"
+            readonly=""
+            type="hidden"
+            value="42"
+          />
           <dl
             class="nhsuk-summary-list"
             data-testid="previous-selection-summary"
diff --git a/frontend/src/__tests__/app/message-plans/choose-nhs-app-template/page.test.tsx b/frontend/src/__tests__/app/message-plans/choose-nhs-app-template/page.test.tsx
index 5a7407d29..202e2261a 100644
--- a/frontend/src/__tests__/app/message-plans/choose-nhs-app-template/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/choose-nhs-app-template/page.test.tsx
@@ -26,6 +26,9 @@ describe('ChooseNHSAppTemplate page', () => {
       params: Promise.resolve({
         routingConfigId: 'invalid-id',
       }),
+      searchParams: Promise.resolve({
+        lockNumber: '42',
+      }),
     });
 
     expect(getRoutingConfigMock).toHaveBeenCalledWith('invalid-id');
@@ -48,6 +51,9 @@ describe('ChooseNHSAppTemplate page', () => {
       params: Promise.resolve({
         routingConfigId: ROUTING_CONFIG.id,
       }),
+      searchParams: Promise.resolve({
+        lockNumber: '42',
+      }),
     });
 
     expect(getRoutingConfigMock).toHaveBeenCalledWith(ROUTING_CONFIG.id);
@@ -66,6 +72,9 @@ describe('ChooseNHSAppTemplate page', () => {
       params: Promise.resolve({
         routingConfigId: ROUTING_CONFIG.id,
       }),
+      searchParams: Promise.resolve({
+        lockNumber: '42',
+      }),
     });
 
     const container = render(page);
@@ -80,4 +89,17 @@ describe('ChooseNHSAppTemplate page', () => {
     });
     expect(container.asFragment()).toMatchSnapshot();
   });
+
+  it('redirects to choose templates page if the lockNumber is missing', async () => {
+    await ChooseNhsAppTemplate({
+      params: Promise.resolve({
+        routingConfigId: ROUTING_CONFIG.id,
+      }),
+    });
+
+    expect(redirectMock).toHaveBeenCalledWith(
+      `/message-plans/choose-templates/${ROUTING_CONFIG.id}`,
+      'replace'
+    );
+  });
 });
diff --git a/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/__snapshots__/page.test.tsx.snap
index 7c5f1d509..a3ace34e5 100644
--- a/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/__snapshots__/page.test.tsx.snap
@@ -38,6 +38,12 @@ exports[`ChooseStandardEnglishLetterTemplate page renders letter template select
             type="hidden"
             value="no_token"
           />
+          <input
+            name="lockNumber"
+            readonly=""
+            type="hidden"
+            value="42"
+          />
           <dl
             class="nhsuk-summary-list"
             data-testid="previous-selection-summary"
diff --git a/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/page.test.tsx b/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/page.test.tsx
index 1eb032e54..d146fc0af 100644
--- a/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/choose-standard-english-letter-template/page.test.tsx
@@ -23,6 +23,9 @@ describe('ChooseStandardEnglishLetterTemplate page', () => {
       params: Promise.resolve({
         routingConfigId: 'invalid-id',
       }),
+      searchParams: Promise.resolve({
+        lockNumber: '42',
+      }),
     });
 
     expect(getRoutingConfigMock).toHaveBeenCalledWith('invalid-id');
@@ -45,6 +48,9 @@ describe('ChooseStandardEnglishLetterTemplate page', () => {
       params: Promise.resolve({
         routingConfigId: ROUTING_CONFIG.id,
       }),
+      searchParams: Promise.resolve({
+        lockNumber: '42',
+      }),
     });
 
     expect(getRoutingConfigMock).toHaveBeenCalledWith(ROUTING_CONFIG.id);
@@ -63,6 +69,9 @@ describe('ChooseStandardEnglishLetterTemplate page', () => {
       params: Promise.resolve({
         routingConfigId: ROUTING_CONFIG.id,
       }),
+      searchParams: Promise.resolve({
+        lockNumber: '42',
+      }),
     });
 
     const container = render(page);
@@ -79,4 +88,17 @@ describe('ChooseStandardEnglishLetterTemplate page', () => {
     });
     expect(container.asFragment()).toMatchSnapshot();
   });
+
+  it('redirects to choose templates page if the lockNumber is missing', async () => {
+    await ChooseStandardEnglishLetterTemplate({
+      params: Promise.resolve({
+        routingConfigId: ROUTING_CONFIG.id,
+      }),
+    });
+
+    expect(redirectMock).toHaveBeenCalledWith(
+      `/message-plans/choose-templates/${ROUTING_CONFIG.id}`,
+      'replace'
+    );
+  });
 });
diff --git a/frontend/src/__tests__/app/message-plans/choose-text-message-template/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/message-plans/choose-text-message-template/__snapshots__/page.test.tsx.snap
index 9495c2928..4d5c91e34 100644
--- a/frontend/src/__tests__/app/message-plans/choose-text-message-template/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/message-plans/choose-text-message-template/__snapshots__/page.test.tsx.snap
@@ -38,6 +38,12 @@ exports[`ChooseTextMessageTemplate page renders sms template selection 1`] = `
             type="hidden"
             value="no_token"
           />
+          <input
+            name="lockNumber"
+            readonly=""
+            type="hidden"
+            value="42"
+          />
           <dl
             class="nhsuk-summary-list"
             data-testid="previous-selection-summary"
diff --git a/frontend/src/__tests__/app/message-plans/choose-text-message-template/page.test.tsx b/frontend/src/__tests__/app/message-plans/choose-text-message-template/page.test.tsx
index 601c18c45..f4fcc5bfb 100644
--- a/frontend/src/__tests__/app/message-plans/choose-text-message-template/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/choose-text-message-template/page.test.tsx
@@ -26,6 +26,7 @@ describe('ChooseTextMessageTemplate page', () => {
       params: Promise.resolve({
         routingConfigId: 'invalid-id',
       }),
+      searchParams: Promise.resolve({ lockNumber: '42' }),
     });
 
     expect(getRoutingConfigMock).toHaveBeenCalledWith('invalid-id');
@@ -46,6 +47,7 @@ describe('ChooseTextMessageTemplate page', () => {
       params: Promise.resolve({
         routingConfigId: ROUTING_CONFIG.id,
       }),
+      searchParams: Promise.resolve({ lockNumber: '42' }),
     });
 
     expect(getRoutingConfigMock).toHaveBeenCalledWith(ROUTING_CONFIG.id);
@@ -64,6 +66,7 @@ describe('ChooseTextMessageTemplate page', () => {
       params: Promise.resolve({
         routingConfigId: ROUTING_CONFIG.id,
       }),
+      searchParams: Promise.resolve({ lockNumber: '42' }),
     });
 
     const container = render(page);
@@ -78,4 +81,17 @@ describe('ChooseTextMessageTemplate page', () => {
     });
     expect(container.asFragment()).toMatchSnapshot();
   });
+
+  it('redirects to choose templates page if the lockNumber is missing', async () => {
+    await ChooseTextMessageTemplate({
+      params: Promise.resolve({
+        routingConfigId: ROUTING_CONFIG.id,
+      }),
+    });
+
+    expect(redirectMock).toHaveBeenCalledWith(
+      `/message-plans/choose-templates/${ROUTING_CONFIG.id}`,
+      'replace'
+    );
+  });
 });
diff --git a/frontend/src/__tests__/app/message-plans/edit-message-plan-settings/__snapshots__/page.test.tsx.snap b/frontend/src/__tests__/app/message-plans/edit-message-plan-settings/__snapshots__/page.test.tsx.snap
index 20855e7d4..91de8b53c 100644
--- a/frontend/src/__tests__/app/message-plans/edit-message-plan-settings/__snapshots__/page.test.tsx.snap
+++ b/frontend/src/__tests__/app/message-plans/edit-message-plan-settings/__snapshots__/page.test.tsx.snap
@@ -168,6 +168,12 @@ exports[`multiple campaigns matches snapshot 1`] = `
             type="hidden"
             value="d7afdc99-d55b-4f26-8442-2d10aea07346"
           />
+          <input
+            name="lockNumber"
+            readonly=""
+            type="hidden"
+            value="0"
+          />
         </form>
       </div>
     </div>
@@ -398,6 +404,12 @@ exports[`multiple campaigns renders errors when form is submitted in invalid sta
             type="hidden"
             value="d7afdc99-d55b-4f26-8442-2d10aea07346"
           />
+          <input
+            name="lockNumber"
+            readonly=""
+            type="hidden"
+            value="0"
+          />
         </form>
       </div>
     </div>
@@ -558,6 +570,12 @@ exports[`single campaign matches snapshot 1`] = `
             type="hidden"
             value="d7afdc99-d55b-4f26-8442-2d10aea07346"
           />
+          <input
+            name="lockNumber"
+            readonly=""
+            type="hidden"
+            value="0"
+          />
         </form>
       </div>
     </div>
@@ -755,6 +773,12 @@ exports[`single campaign renders errors when form is submitted in invalid state
             type="hidden"
             value="d7afdc99-d55b-4f26-8442-2d10aea07346"
           />
+          <input
+            name="lockNumber"
+            readonly=""
+            type="hidden"
+            value="0"
+          />
         </form>
       </div>
     </div>
diff --git a/frontend/src/__tests__/app/message-plans/edit-message-plan-settings/page.test.tsx b/frontend/src/__tests__/app/message-plans/edit-message-plan-settings/page.test.tsx
index 0bd2dffd3..83a280d10 100644
--- a/frontend/src/__tests__/app/message-plans/edit-message-plan-settings/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/edit-message-plan-settings/page.test.tsx
@@ -148,10 +148,14 @@ describe('single campaign', () => {
 
     await user.click(await screen.findByTestId('submit-button'));
 
-    expect(updateRoutingConfig).toHaveBeenCalledWith(routingConfig.id, {
-      name: 'New Name',
-      campaignId: routingConfig.campaignId,
-    });
+    expect(updateRoutingConfig).toHaveBeenCalledWith(
+      routingConfig.id,
+      {
+        name: 'New Name',
+        campaignId: routingConfig.campaignId,
+      },
+      routingConfig.lockNumber
+    );
 
     expect(redirect).toHaveBeenCalledWith(
       `/message-plans/choose-templates/${routingConfig.id}`,
@@ -251,10 +255,14 @@ describe('multiple campaigns', () => {
 
     await user.click(await screen.findByTestId('submit-button'));
 
-    expect(updateRoutingConfig).toHaveBeenCalledWith(routingConfig.id, {
-      name: 'New Name',
-      campaignId: alternateCampaignId,
-    });
+    expect(updateRoutingConfig).toHaveBeenCalledWith(
+      routingConfig.id,
+      {
+        name: 'New Name',
+        campaignId: alternateCampaignId,
+      },
+      routingConfig.lockNumber
+    );
 
     expect(redirect).toHaveBeenCalledWith(
       `/message-plans/choose-templates/${routingConfig.id}`,
diff --git a/frontend/src/__tests__/app/message-plans/page.test.tsx b/frontend/src/__tests__/app/message-plans/page.test.tsx
index 46775025a..09c710a3f 100644
--- a/frontend/src/__tests__/app/message-plans/page.test.tsx
+++ b/frontend/src/__tests__/app/message-plans/page.test.tsx
@@ -29,6 +29,7 @@ const buildRoutingConfig = (rc: Partial<RoutingConfig>): RoutingConfig => ({
   id: '',
   name: '',
   updatedAt: '',
+  lockNumber: 0,
   ...rc,
 });
 
diff --git a/frontend/src/__tests__/app/request-proof-of-template/page.test.tsx b/frontend/src/__tests__/app/request-proof-of-template/page.test.tsx
index 926a1ea61..7fcffbab9 100644
--- a/frontend/src/__tests__/app/request-proof-of-template/page.test.tsx
+++ b/frontend/src/__tests__/app/request-proof-of-template/page.test.tsx
@@ -50,7 +50,7 @@ describe('RequestProofPage', () => {
           fileName: 'a.pdf',
         },
       },
-      lockNumber: 1,
+      lockNumber: 0,
     } satisfies Partial<TemplateDto>;
 
     getTemplateMock.mockResolvedValue({
@@ -63,6 +63,9 @@ describe('RequestProofPage', () => {
       params: Promise.resolve({
         templateId: 'template-id',
       }),
+      searchParams: Promise.resolve({
+        lockNumber: '42',
+      }),
     });
 
     expect(await generateMetadata()).toEqual({
@@ -74,7 +77,7 @@ describe('RequestProofPage', () => {
         templateName={state.name}
         templateId={state.id}
         channel='LETTER'
-        lockNumber={state.lockNumber}
+        lockNumber={42}
       />
     );
   });
@@ -86,6 +89,7 @@ describe('RequestProofPage', () => {
       params: Promise.resolve({
         templateId: 'template-id',
       }),
+      searchParams: Promise.resolve({ lockNumber: '42' }),
     });
 
     expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
@@ -108,6 +112,9 @@ describe('RequestProofPage', () => {
         params: Promise.resolve({
           templateId: 'template-id',
         }),
+        searchParams: Promise.resolve({
+          lockNumber: '42',
+        }),
       });
 
       expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
@@ -122,6 +129,9 @@ describe('RequestProofPage', () => {
       params: Promise.resolve({
         templateId: 'template-id',
       }),
+      searchParams: Promise.resolve({
+        lockNumber: '42',
+      }),
     });
 
     expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
@@ -156,6 +166,9 @@ describe('RequestProofPage', () => {
       params: Promise.resolve({
         templateId: 'template-id',
       }),
+      searchParams: Promise.resolve({
+        lockNumber: '42',
+      }),
     });
 
     expect(await generateMetadata()).toEqual({
@@ -164,4 +177,18 @@ describe('RequestProofPage', () => {
 
     expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
   });
+
+  test('should redirect to template preview page when lockNumber search parameter is missing', async () => {
+    await RequestProofPage({
+      params: Promise.resolve({
+        templateId: 'template-id',
+      }),
+      searchParams: Promise.resolve({}),
+    });
+
+    expect(redirectMock).toHaveBeenCalledWith(
+      '/preview-letter-template/template-id',
+      'replace'
+    );
+  });
 });
diff --git a/frontend/src/__tests__/app/submit-email-template/page.test.tsx b/frontend/src/__tests__/app/submit-email-template/page.test.tsx
index 00ab2dd58..615f2242b 100644
--- a/frontend/src/__tests__/app/submit-email-template/page.test.tsx
+++ b/frontend/src/__tests__/app/submit-email-template/page.test.tsx
@@ -48,6 +48,7 @@ describe('SubmitEmailTemplatePage', () => {
       params: Promise.resolve({
         templateId: 'template-id',
       }),
+      searchParams: Promise.resolve({ lockNumber: '42' }),
     });
 
     expect(await generateMetadata()).toEqual({
@@ -58,7 +59,7 @@ describe('SubmitEmailTemplatePage', () => {
         templateName={state.name}
         templateId={state.id}
         channel='EMAIL'
-        lockNumber={state.lockNumber}
+        lockNumber={42}
       />
     );
   });
@@ -70,6 +71,7 @@ describe('SubmitEmailTemplatePage', () => {
       params: Promise.resolve({
         templateId: 'template-id',
       }),
+      searchParams: Promise.resolve({ lockNumber: '42' }),
     });
 
     expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
@@ -103,9 +105,24 @@ describe('SubmitEmailTemplatePage', () => {
         params: Promise.resolve({
           templateId: 'template-id',
         }),
+        searchParams: Promise.resolve({ lockNumber: '42' }),
       });
 
       expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
     }
   );
+
+  test('it should redirect to preview page if lockNumber search param is invalid', async () => {
+    await SubmitEmailTemplatePage({
+      params: Promise.resolve({
+        templateId: 'template-id',
+      }),
+      searchParams: Promise.resolve({}),
+    });
+
+    expect(redirectMock).toHaveBeenCalledWith(
+      '/preview-email-template/template-id',
+      'replace'
+    );
+  });
 });
diff --git a/frontend/src/__tests__/app/submit-letter-template/page.test.tsx b/frontend/src/__tests__/app/submit-letter-template/page.test.tsx
index b7ce8eaa9..3a5941c7e 100644
--- a/frontend/src/__tests__/app/submit-letter-template/page.test.tsx
+++ b/frontend/src/__tests__/app/submit-letter-template/page.test.tsx
@@ -39,13 +39,14 @@ describe('SubmitLetterTemplatePage', () => {
       params: Promise.resolve({
         templateId: 'template-id',
       }),
+      searchParams: Promise.resolve({ lockNumber: '42' }),
     });
 
     expect(page).toEqual(
       <SubmitLetterTemplate
         templateName={LETTER_TEMPLATE.name}
         templateId={LETTER_TEMPLATE.id}
-        lockNumber={LETTER_TEMPLATE.lockNumber}
+        lockNumber={42}
       />
     );
   });
@@ -57,6 +58,7 @@ describe('SubmitLetterTemplatePage', () => {
       params: Promise.resolve({
         templateId: 'invalid-template',
       }),
+      searchParams: Promise.resolve({ lockNumber: '42' }),
     });
 
     expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
@@ -89,12 +91,27 @@ describe('SubmitLetterTemplatePage', () => {
         params: Promise.resolve({
           templateId: 'template-id',
         }),
+        searchParams: Promise.resolve({ lockNumber: '42' }),
       });
 
       expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
     }
   );
 
+  test('should redirect to template preview when lock number search parameter is invalid', async () => {
+    await SubmitLetterTemplatePage({
+      params: Promise.resolve({
+        templateId: 'template-id',
+      }),
+      searchParams: Promise.resolve({}),
+    });
+
+    expect(redirectMock).toHaveBeenCalledWith(
+      '/preview-letter-template/template-id',
+      'replace'
+    );
+  });
+
   test('should generate metadata', async () => {
     const metadata = await generateMetadata();
 
diff --git a/frontend/src/__tests__/app/submit-nhs-app-template/page.test.tsx b/frontend/src/__tests__/app/submit-nhs-app-template/page.test.tsx
index 48eccd8a6..9dfc4fe07 100644
--- a/frontend/src/__tests__/app/submit-nhs-app-template/page.test.tsx
+++ b/frontend/src/__tests__/app/submit-nhs-app-template/page.test.tsx
@@ -48,6 +48,9 @@ describe('SubmitNhsAppTemplatePage', () => {
       params: Promise.resolve({
         templateId: 'template-id',
       }),
+      searchParams: Promise.resolve({
+        lockNumber: '42',
+      }),
     });
 
     expect(await generateMetadata()).toEqual({
@@ -58,7 +61,7 @@ describe('SubmitNhsAppTemplatePage', () => {
         templateName={state.name}
         templateId={state.id}
         channel='NHS_APP'
-        lockNumber={state.lockNumber}
+        lockNumber={42}
       />
     );
   });
@@ -70,6 +73,9 @@ describe('SubmitNhsAppTemplatePage', () => {
       params: Promise.resolve({
         templateId: 'template-id',
       }),
+      searchParams: Promise.resolve({
+        lockNumber: '42',
+      }),
     });
 
     expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
@@ -101,9 +107,26 @@ describe('SubmitNhsAppTemplatePage', () => {
         params: Promise.resolve({
           templateId: 'template-id',
         }),
+        searchParams: Promise.resolve({
+          lockNumber: '42',
+        }),
       });
 
       expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
     }
   );
+
+  test('it should redirect to preview page if lockNumber search param is invalid', async () => {
+    await SubmitNhsAppTemplatePage({
+      params: Promise.resolve({
+        templateId: 'template-id',
+      }),
+      searchParams: Promise.resolve({}),
+    });
+
+    expect(redirectMock).toHaveBeenCalledWith(
+      '/preview-nhs-app-template/template-id',
+      'replace'
+    );
+  });
 });
diff --git a/frontend/src/__tests__/app/submit-text-message-template/page.test.tsx b/frontend/src/__tests__/app/submit-text-message-template/page.test.tsx
index 872df527e..5fd942098 100644
--- a/frontend/src/__tests__/app/submit-text-message-template/page.test.tsx
+++ b/frontend/src/__tests__/app/submit-text-message-template/page.test.tsx
@@ -48,6 +48,7 @@ describe('SubmitSmsTemplatePage', () => {
       params: Promise.resolve({
         templateId: 'template-id',
       }),
+      searchParams: Promise.resolve({ lockNumber: '42' }),
     });
 
     expect(await generateMetadata()).toEqual({
@@ -58,7 +59,7 @@ describe('SubmitSmsTemplatePage', () => {
         templateName={state.name}
         templateId={state.id}
         channel='SMS'
-        lockNumber={state.lockNumber}
+        lockNumber={42}
       />
     );
   });
@@ -70,6 +71,7 @@ describe('SubmitSmsTemplatePage', () => {
       params: Promise.resolve({
         templateId: 'invalid-template',
       }),
+      searchParams: Promise.resolve({ lockNumber: '42' }),
     });
 
     expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
@@ -101,9 +103,24 @@ describe('SubmitSmsTemplatePage', () => {
         params: Promise.resolve({
           templateId: 'template-id',
         }),
+        searchParams: Promise.resolve({ lockNumber: '42' }),
       });
 
       expect(redirectMock).toHaveBeenCalledWith('/invalid-template', 'replace');
     }
   );
+
+  test('it should redirect to preview page if lockNumber search param is invalid', async () => {
+    await SubmitSmsTemplatePage({
+      params: Promise.resolve({
+        templateId: 'template-id',
+      }),
+      searchParams: Promise.resolve({}),
+    });
+
+    expect(redirectMock).toHaveBeenCalledWith(
+      '/preview-text-message-template/template-id',
+      'replace'
+    );
+  });
 });
diff --git a/frontend/src/__tests__/components/forms/ChooseChannelTemplate/ChooseChannelTemplate.test.tsx b/frontend/src/__tests__/components/forms/ChooseChannelTemplate/ChooseChannelTemplate.test.tsx
index f8e9dee16..c20f1ff9a 100644
--- a/frontend/src/__tests__/components/forms/ChooseChannelTemplate/ChooseChannelTemplate.test.tsx
+++ b/frontend/src/__tests__/components/forms/ChooseChannelTemplate/ChooseChannelTemplate.test.tsx
@@ -44,6 +44,7 @@ describe('ChooseChannelTemplate', () => {
         pageHeading='Choose an NHS App template'
         templateList={[NHS_APP_TEMPLATE]}
         cascadeIndex={0}
+        lockNumber={42}
       />
     );
     expect(container.asFragment()).toMatchSnapshot();
@@ -56,6 +57,7 @@ describe('ChooseChannelTemplate', () => {
         pageHeading='Choose an email template'
         templateList={[EMAIL_TEMPLATE]}
         cascadeIndex={1}
+        lockNumber={42}
       />
     );
     expect(container.asFragment()).toMatchSnapshot();
@@ -68,6 +70,7 @@ describe('ChooseChannelTemplate', () => {
         pageHeading='Choose a text message (SMS) template'
         templateList={[SMS_TEMPLATE]}
         cascadeIndex={2}
+        lockNumber={42}
       />
     );
     expect(container.asFragment()).toMatchSnapshot();
@@ -80,6 +83,7 @@ describe('ChooseChannelTemplate', () => {
         pageHeading='Choose a letter template'
         templateList={[LETTER_TEMPLATE]}
         cascadeIndex={3}
+        lockNumber={42}
       />
     );
     expect(container.asFragment()).toMatchSnapshot();
@@ -95,6 +99,7 @@ describe('ChooseChannelTemplate', () => {
           { ...NHS_APP_TEMPLATE, id: 'another-id', name: 'Another template' },
         ]}
         cascadeIndex={0}
+        lockNumber={42}
       />
     );
     expect(container.asFragment()).toMatchSnapshot();
@@ -117,6 +122,7 @@ describe('ChooseChannelTemplate', () => {
         pageHeading='Choose an NHS App template'
         templateList={[NHS_APP_TEMPLATE]}
         cascadeIndex={0}
+        lockNumber={42}
       />
     );
     expect(container.asFragment()).toMatchSnapshot();
@@ -139,6 +145,7 @@ describe('ChooseChannelTemplate', () => {
         pageHeading='Choose an NHS App template'
         templateList={[]}
         cascadeIndex={0}
+        lockNumber={42}
       />
     );
     expect(container.asFragment()).toMatchSnapshot();
@@ -165,6 +172,7 @@ describe('ChooseChannelTemplate', () => {
         pageHeading='Choose an NHS App template'
         templateList={[NHS_APP_TEMPLATE]}
         cascadeIndex={0}
+        lockNumber={42}
       />
     );
     expect(container.asFragment()).toMatchSnapshot();
@@ -187,6 +195,7 @@ describe('ChooseChannelTemplate', () => {
         pageHeading='Choose an NHS App template'
         templateList={[NHS_APP_TEMPLATE]}
         cascadeIndex={0}
+        lockNumber={42}
       />
     );
     const submitButton = screen.getByTestId('submit-button');
diff --git a/frontend/src/__tests__/components/forms/ChooseChannelTemplate/__snapshots__/ChooseChannelTemplate.test.tsx.snap b/frontend/src/__tests__/components/forms/ChooseChannelTemplate/__snapshots__/ChooseChannelTemplate.test.tsx.snap
index d4494e9b6..12a549101 100644
--- a/frontend/src/__tests__/components/forms/ChooseChannelTemplate/__snapshots__/ChooseChannelTemplate.test.tsx.snap
+++ b/frontend/src/__tests__/components/forms/ChooseChannelTemplate/__snapshots__/ChooseChannelTemplate.test.tsx.snap
@@ -68,6 +68,12 @@ exports[`ChooseChannelTemplate Client-side validation triggers 1`] = `
             type="hidden"
             value="no_token"
           />
+          <input
+            name="lockNumber"
+            readonly=""
+            type="hidden"
+            value="42"
+          />
           <div
             class="nhsuk-grid-row"
           >
@@ -314,6 +320,12 @@ exports[`ChooseChannelTemplate renders correctly when no templates are available
             type="hidden"
             value="no_token"
           />
+          <input
+            name="lockNumber"
+            readonly=""
+            type="hidden"
+            value="42"
+          />
           <p>
             You do not have any templates yet.
           </p>
@@ -381,6 +393,12 @@ exports[`ChooseChannelTemplate renders correctly when template is unselected 1`]
             type="hidden"
             value="no_token"
           />
+          <input
+            name="lockNumber"
+            readonly=""
+            type="hidden"
+            value="42"
+          />
           <div
             class="nhsuk-grid-row"
           >
@@ -615,6 +633,12 @@ exports[`ChooseChannelTemplate renders email form 1`] = `
             type="hidden"
             value="no_token"
           />
+          <input
+            name="lockNumber"
+            readonly=""
+            type="hidden"
+            value="42"
+          />
           <dl
             class="nhsuk-summary-list"
             data-testid="previous-selection-summary"
@@ -899,6 +923,12 @@ exports[`ChooseChannelTemplate renders error component 1`] = `
             type="hidden"
             value="no_token"
           />
+          <input
+            name="lockNumber"
+            readonly=""
+            type="hidden"
+            value="42"
+          />
           <dl
             class="nhsuk-summary-list"
             data-testid="previous-selection-summary"
@@ -1165,6 +1195,12 @@ exports[`ChooseChannelTemplate renders letter form 1`] = `
             type="hidden"
             value="no_token"
           />
+          <input
+            name="lockNumber"
+            readonly=""
+            type="hidden"
+            value="42"
+          />
           <dl
             class="nhsuk-summary-list"
             data-testid="previous-selection-summary"
@@ -1419,6 +1455,12 @@ exports[`ChooseChannelTemplate renders multiple options 1`] = `
             type="hidden"
             value="no_token"
           />
+          <input
+            name="lockNumber"
+            readonly=""
+            type="hidden"
+            value="42"
+          />
           <dl
             class="nhsuk-summary-list"
             data-testid="previous-selection-summary"
@@ -1768,6 +1810,12 @@ exports[`ChooseChannelTemplate renders nhs app form 1`] = `
             type="hidden"
             value="no_token"
           />
+          <input
+            name="lockNumber"
+            readonly=""
+            type="hidden"
+            value="42"
+          />
           <dl
             class="nhsuk-summary-list"
             data-testid="previous-selection-summary"
@@ -2022,6 +2070,12 @@ exports[`ChooseChannelTemplate renders sms form 1`] = `
             type="hidden"
             value="no_token"
           />
+          <input
+            name="lockNumber"
+            readonly=""
+            type="hidden"
+            value="42"
+          />
           <dl
             class="nhsuk-summary-list"
             data-testid="previous-selection-summary"
diff --git a/frontend/src/__tests__/components/forms/ChooseChannelTemplate/server-action.test.ts b/frontend/src/__tests__/components/forms/ChooseChannelTemplate/server-action.test.ts
index 21c00b419..f1d495cd1 100644
--- a/frontend/src/__tests__/components/forms/ChooseChannelTemplate/server-action.test.ts
+++ b/frontend/src/__tests__/components/forms/ChooseChannelTemplate/server-action.test.ts
@@ -20,8 +20,8 @@ test('submit form - validation error', async () => {
     {
       messagePlan: ROUTING_CONFIG,
       pageHeading: 'Choose an NHS App template',
-      templateList: [NHS_APP_TEMPLATE],
       cascadeIndex: 0,
+      templateList: [NHS_APP_TEMPLATE],
     },
     getMockFormData({})
   );
@@ -29,7 +29,9 @@ test('submit form - validation error', async () => {
   expect(response).toEqual(
     expect.objectContaining({
       errorState: {
-        fieldErrors: { channelTemplate: ['Choose an NHS App template'] },
+        fieldErrors: expect.objectContaining({
+          channelTemplate: ['Choose an NHS App template'],
+        }),
         formErrors: [],
       },
     })
@@ -37,9 +39,6 @@ test('submit form - validation error', async () => {
 });
 
 test('submit form - success updates config and redirects to choose templates', async () => {
-  const mockRedirect = jest.mocked(redirect);
-  const mockUpdateRoutingConfig = jest.mocked(updateRoutingConfig);
-
   await chooseChannelTemplateAction(
     {
       messagePlan: {
@@ -66,48 +65,50 @@ test('submit form - success updates config and redirects to choose templates', a
         ],
       },
       pageHeading: 'Choose an email template',
-      templateList: [EMAIL_TEMPLATE],
       cascadeIndex: 1,
+      templateList: [EMAIL_TEMPLATE],
     },
     getMockFormData({
       channelTemplate: EMAIL_TEMPLATE.id,
+      lockNumber: String(EMAIL_TEMPLATE.lockNumber),
     })
   );
 
-  expect(mockUpdateRoutingConfig).toHaveBeenCalledWith(ROUTING_CONFIG.id, {
-    cascade: [
-      {
-        cascadeGroups: ['standard'],
-        channel: 'NHSAPP',
-        channelType: 'primary',
-        defaultTemplateId: NHS_APP_TEMPLATE.id,
-      },
-      {
-        cascadeGroups: ['standard'],
-        channel: 'EMAIL',
-        channelType: 'primary',
-        defaultTemplateId: EMAIL_TEMPLATE.id,
-      },
-      {
-        cascadeGroups: ['standard'],
-        channel: 'SMS',
-        channelType: 'primary',
-        defaultTemplateId: SMS_TEMPLATE.id,
-      },
-    ],
-    cascadeGroupOverrides: ROUTING_CONFIG.cascadeGroupOverrides,
-  });
+  expect(updateRoutingConfig).toHaveBeenCalledWith(
+    ROUTING_CONFIG.id,
+    {
+      cascade: [
+        {
+          cascadeGroups: ['standard'],
+          channel: 'NHSAPP',
+          channelType: 'primary',
+          defaultTemplateId: NHS_APP_TEMPLATE.id,
+        },
+        {
+          cascadeGroups: ['standard'],
+          channel: 'EMAIL',
+          channelType: 'primary',
+          defaultTemplateId: EMAIL_TEMPLATE.id,
+        },
+        {
+          cascadeGroups: ['standard'],
+          channel: 'SMS',
+          channelType: 'primary',
+          defaultTemplateId: SMS_TEMPLATE.id,
+        },
+      ],
+      cascadeGroupOverrides: ROUTING_CONFIG.cascadeGroupOverrides,
+    },
+    EMAIL_TEMPLATE.lockNumber
+  );
 
-  expect(mockRedirect).toHaveBeenCalledWith(
+  expect(redirect).toHaveBeenCalledWith(
     `/message-plans/choose-templates/${ROUTING_CONFIG.id}`,
     RedirectType.push
   );
 });
 
 test('submit form - success updates config and redirects to choose templates for letter template with supplier references', async () => {
-  const mockRedirect = jest.mocked(redirect);
-  const mockUpdateRoutingConfig = jest.mocked(updateRoutingConfig);
-
   await chooseChannelTemplateAction(
     {
       messagePlan: {
@@ -134,23 +135,28 @@ test('submit form - success updates config and redirects to choose templates for
     },
     getMockFormData({
       channelTemplate: LETTER_TEMPLATE.id,
+      lockNumber: String(LETTER_TEMPLATE.lockNumber),
     })
   );
 
-  expect(mockUpdateRoutingConfig).toHaveBeenCalledWith(ROUTING_CONFIG.id, {
-    cascade: [
-      {
-        cascadeGroups: ['standard'],
-        channel: 'LETTER',
-        channelType: 'primary',
-        defaultTemplateId: LETTER_TEMPLATE.id,
-        supplierReferences: { MBA: 'mba-supplier-reference' },
-      },
-    ],
-    cascadeGroupOverrides: [],
-  });
+  expect(updateRoutingConfig).toHaveBeenCalledWith(
+    ROUTING_CONFIG.id,
+    {
+      cascade: [
+        {
+          cascadeGroups: ['standard'],
+          channel: 'LETTER',
+          channelType: 'primary',
+          defaultTemplateId: LETTER_TEMPLATE.id,
+          supplierReferences: { MBA: 'mba-supplier-reference' },
+        },
+      ],
+      cascadeGroupOverrides: [],
+    },
+    LETTER_TEMPLATE.lockNumber
+  );
 
-  expect(mockRedirect).toHaveBeenCalledWith(
+  expect(redirect).toHaveBeenCalledWith(
     `/message-plans/choose-templates/${ROUTING_CONFIG.id}`,
     RedirectType.push
   );
diff --git a/frontend/src/__tests__/components/forms/PreviewEmailTemplate/server-action.test.ts b/frontend/src/__tests__/components/forms/PreviewEmailTemplate/server-action.test.ts
index e406d6845..8869a8914 100644
--- a/frontend/src/__tests__/components/forms/PreviewEmailTemplate/server-action.test.ts
+++ b/frontend/src/__tests__/components/forms/PreviewEmailTemplate/server-action.test.ts
@@ -65,7 +65,7 @@ describe('previewEmailTemplateAction server action', () => {
     );
 
     expect(redirectMock).toHaveBeenCalledWith(
-      '/submit-email-template/template-id',
+      '/submit-email-template/template-id?lockNumber=1',
       'push'
     );
   });
diff --git a/frontend/src/__tests__/components/forms/PreviewNHSAppTemplate/server-action.test.ts b/frontend/src/__tests__/components/forms/PreviewNHSAppTemplate/server-action.test.ts
index e91ba230f..d9d2aa8a9 100644
--- a/frontend/src/__tests__/components/forms/PreviewNHSAppTemplate/server-action.test.ts
+++ b/frontend/src/__tests__/components/forms/PreviewNHSAppTemplate/server-action.test.ts
@@ -49,7 +49,7 @@ describe('previewNhsAppTemplateAction', () => {
     previewNhsAppTemplateAction(currentState, formData);
 
     expect(redirectMock).toHaveBeenCalledWith(
-      '/submit-nhs-app-template/template-id',
+      '/submit-nhs-app-template/template-id?lockNumber=1',
       'push'
     );
   });
diff --git a/frontend/src/__tests__/components/forms/PreviewSMSTemplate/server-action.test.ts b/frontend/src/__tests__/components/forms/PreviewSMSTemplate/server-action.test.ts
index 7b9fcd411..df3bbb4a1 100644
--- a/frontend/src/__tests__/components/forms/PreviewSMSTemplate/server-action.test.ts
+++ b/frontend/src/__tests__/components/forms/PreviewSMSTemplate/server-action.test.ts
@@ -64,7 +64,7 @@ describe('previewSmsTemplateAction server action', () => {
     );
 
     expect(redirectMock).toHaveBeenCalledWith(
-      '/submit-text-message-template/template-id',
+      '/submit-text-message-template/template-id?lockNumber=1',
       'push'
     );
   });
diff --git a/frontend/src/__tests__/components/molecules/MessagePlanBlock.test.tsx b/frontend/src/__tests__/components/molecules/MessagePlanBlock.test.tsx
index f6e5b643a..7bdb3eb8b 100644
--- a/frontend/src/__tests__/components/molecules/MessagePlanBlock.test.tsx
+++ b/frontend/src/__tests__/components/molecules/MessagePlanBlock.test.tsx
@@ -28,6 +28,7 @@ describe('MessagePlanBlock', () => {
         index={0}
         channelItem={channelItem}
         routingConfigId='test-routing-config-id'
+        lockNumber={42}
       />
     );
 
@@ -47,6 +48,7 @@ describe('MessagePlanBlock', () => {
         index={2}
         channelItem={channelItem}
         routingConfigId='test-routing-config-id'
+        lockNumber={42}
       />
     );
 
@@ -65,6 +67,7 @@ describe('MessagePlanBlock', () => {
         index={0}
         channelItem={channelItem}
         routingConfigId='test-routing-config-id'
+        lockNumber={42}
       />
     );
 
@@ -83,6 +86,7 @@ describe('MessagePlanBlock', () => {
           channelItem={channelItem}
           template={mockTemplate}
           routingConfigId='test-routing-config-id'
+          lockNumber={42}
         />
       );
       expect(screen.getByText('Test email template')).toBeInTheDocument();
@@ -97,6 +101,7 @@ describe('MessagePlanBlock', () => {
           channelItem={channelItem}
           template={mockTemplate}
           routingConfigId='test-routing-config-id'
+          lockNumber={42}
         />
       );
 
@@ -121,6 +126,7 @@ describe('MessagePlanBlock', () => {
           index={0}
           channelItem={channelItem}
           routingConfigId='test-routing-config-id'
+          lockNumber={42}
         />
       );
 
@@ -151,6 +157,7 @@ describe('MessagePlanBlock', () => {
             channelItem={channelItem}
             template={mockTemplate}
             routingConfigId='test-routing-config-id'
+            lockNumber={42}
           />
         );
         expect(asFragment()).toMatchSnapshot();
@@ -168,6 +175,7 @@ describe('MessagePlanBlock', () => {
             index={0}
             channelItem={channelItem}
             routingConfigId='test-routing-config-id'
+            lockNumber={42}
           />
         );
         expect(asFragment()).toMatchSnapshot();
diff --git a/frontend/src/__tests__/components/molecules/MessagePlanChannelTemplate.test.tsx b/frontend/src/__tests__/components/molecules/MessagePlanChannelTemplate.test.tsx
index 8f6cfad93..5583ef37a 100644
--- a/frontend/src/__tests__/components/molecules/MessagePlanChannelTemplate.test.tsx
+++ b/frontend/src/__tests__/components/molecules/MessagePlanChannelTemplate.test.tsx
@@ -10,6 +10,7 @@ describe('MessagePlanChannelTemplate', () => {
       <MessagePlanChannelTemplate
         channel='EMAIL'
         routingConfigId={routingConfigId}
+        lockNumber={42}
       />
     );
 
@@ -25,6 +26,7 @@ describe('MessagePlanChannelTemplate', () => {
           channel='LETTER'
           required={false}
           routingConfigId={routingConfigId}
+          lockNumber={42}
         />
       );
     });
@@ -42,6 +44,7 @@ describe('MessagePlanChannelTemplate', () => {
         <MessagePlanChannelTemplate
           channel='NHSAPP'
           routingConfigId={routingConfigId}
+          lockNumber={42}
         />
       );
     });
@@ -52,7 +55,7 @@ describe('MessagePlanChannelTemplate', () => {
       });
       expect(link).toHaveAttribute(
         'href',
-        `/message-plans/choose-nhs-app-template/${routingConfigId}`
+        `/message-plans/choose-nhs-app-template/${routingConfigId}?lockNumber=42`
       );
     });
 
@@ -78,6 +81,7 @@ describe('MessagePlanChannelTemplate', () => {
           channel='SMS'
           template={testTemplate}
           routingConfigId={routingConfigId}
+          lockNumber={42}
         />
       );
     });
@@ -92,7 +96,7 @@ describe('MessagePlanChannelTemplate', () => {
       });
       expect(link).toHaveAttribute(
         'href',
-        `/message-plans/choose-text-message-template/${routingConfigId}`
+        `/message-plans/choose-text-message-template/${routingConfigId}?lockNumber=42`
       );
     });
 
@@ -131,6 +135,7 @@ describe('MessagePlanChannelTemplate', () => {
         <MessagePlanChannelTemplate
           channel={channel}
           routingConfigId={routingConfigId}
+          lockNumber={42}
         />
       );
 
@@ -151,6 +156,7 @@ describe('MessagePlanChannelTemplate', () => {
           channel={channel}
           template={testTemplate}
           routingConfigId={routingConfigId}
+          lockNumber={42}
         />
       );
       expect(container).toMatchSnapshot();
diff --git a/frontend/src/__tests__/components/molecules/__snapshots__/MessagePlanBlock.test.tsx.snap b/frontend/src/__tests__/components/molecules/__snapshots__/MessagePlanBlock.test.tsx.snap
index 2e6ad30b9..251a382f7 100644
--- a/frontend/src/__tests__/components/molecules/__snapshots__/MessagePlanBlock.test.tsx.snap
+++ b/frontend/src/__tests__/components/molecules/__snapshots__/MessagePlanBlock.test.tsx.snap
@@ -35,7 +35,7 @@ exports[`MessagePlanBlock for channel EMAIL with no template should match snapsh
             <a
               class="nhsuk-link nhsuk-link--no-visited-state"
               data-testid="choose-template-link-EMAIL"
-              href="/message-plans/choose-email-template/test-routing-config-id"
+              href="/message-plans/choose-email-template/test-routing-config-id?lockNumber=42"
             >
               Choose
               <span
@@ -94,7 +94,7 @@ exports[`MessagePlanBlock for channel EMAIL with template should match snapshot
             <a
               class="nhsuk-link nhsuk-link--no-visited-state"
               data-testid="change-template-link-EMAIL"
-              href="/message-plans/choose-email-template/test-routing-config-id"
+              href="/message-plans/choose-email-template/test-routing-config-id?lockNumber=42"
             >
               Change
               <span
@@ -109,14 +109,22 @@ exports[`MessagePlanBlock for channel EMAIL with template should match snapshot
             <form>
               <input
                 name="channel"
+                readonly=""
                 type="hidden"
                 value="EMAIL"
               />
               <input
                 name="routingConfigId"
+                readonly=""
                 type="hidden"
                 value="test-routing-config-id"
               />
+              <input
+                name="lockNumber"
+                readonly=""
+                type="hidden"
+                value="42"
+              />
               <button
                 class="channel-template-link--remove nhsuk-link"
                 data-testid="remove-template-link-EMAIL"
@@ -175,7 +183,7 @@ exports[`MessagePlanBlock for channel LETTER with no template should match snaps
             <a
               class="nhsuk-link nhsuk-link--no-visited-state"
               data-testid="choose-template-link-LETTER"
-              href="/message-plans/choose-standard-english-letter-template/test-routing-config-id"
+              href="/message-plans/choose-standard-english-letter-template/test-routing-config-id?lockNumber=42"
             >
               Choose
               <span
@@ -234,7 +242,7 @@ exports[`MessagePlanBlock for channel LETTER with template should match snapshot
             <a
               class="nhsuk-link nhsuk-link--no-visited-state"
               data-testid="change-template-link-LETTER"
-              href="/message-plans/choose-standard-english-letter-template/test-routing-config-id"
+              href="/message-plans/choose-standard-english-letter-template/test-routing-config-id?lockNumber=42"
             >
               Change
               <span
@@ -249,14 +257,22 @@ exports[`MessagePlanBlock for channel LETTER with template should match snapshot
             <form>
               <input
                 name="channel"
+                readonly=""
                 type="hidden"
                 value="LETTER"
               />
               <input
                 name="routingConfigId"
+                readonly=""
                 type="hidden"
                 value="test-routing-config-id"
               />
+              <input
+                name="lockNumber"
+                readonly=""
+                type="hidden"
+                value="42"
+              />
               <button
                 class="channel-template-link--remove nhsuk-link"
                 data-testid="remove-template-link-LETTER"
@@ -315,7 +331,7 @@ exports[`MessagePlanBlock for channel NHSAPP with no template should match snaps
             <a
               class="nhsuk-link nhsuk-link--no-visited-state"
               data-testid="choose-template-link-NHSAPP"
-              href="/message-plans/choose-nhs-app-template/test-routing-config-id"
+              href="/message-plans/choose-nhs-app-template/test-routing-config-id?lockNumber=42"
             >
               Choose
               <span
@@ -374,7 +390,7 @@ exports[`MessagePlanBlock for channel NHSAPP with template should match snapshot
             <a
               class="nhsuk-link nhsuk-link--no-visited-state"
               data-testid="change-template-link-NHSAPP"
-              href="/message-plans/choose-nhs-app-template/test-routing-config-id"
+              href="/message-plans/choose-nhs-app-template/test-routing-config-id?lockNumber=42"
             >
               Change
               <span
@@ -389,14 +405,22 @@ exports[`MessagePlanBlock for channel NHSAPP with template should match snapshot
             <form>
               <input
                 name="channel"
+                readonly=""
                 type="hidden"
                 value="NHSAPP"
               />
               <input
                 name="routingConfigId"
+                readonly=""
                 type="hidden"
                 value="test-routing-config-id"
               />
+              <input
+                name="lockNumber"
+                readonly=""
+                type="hidden"
+                value="42"
+              />
               <button
                 class="channel-template-link--remove nhsuk-link"
                 data-testid="remove-template-link-NHSAPP"
@@ -455,7 +479,7 @@ exports[`MessagePlanBlock for channel SMS with no template should match snapshot
             <a
               class="nhsuk-link nhsuk-link--no-visited-state"
               data-testid="choose-template-link-SMS"
-              href="/message-plans/choose-text-message-template/test-routing-config-id"
+              href="/message-plans/choose-text-message-template/test-routing-config-id?lockNumber=42"
             >
               Choose
               <span
@@ -514,7 +538,7 @@ exports[`MessagePlanBlock for channel SMS with template should match snapshot 1`
             <a
               class="nhsuk-link nhsuk-link--no-visited-state"
               data-testid="change-template-link-SMS"
-              href="/message-plans/choose-text-message-template/test-routing-config-id"
+              href="/message-plans/choose-text-message-template/test-routing-config-id?lockNumber=42"
             >
               Change
               <span
@@ -529,14 +553,22 @@ exports[`MessagePlanBlock for channel SMS with template should match snapshot 1`
             <form>
               <input
                 name="channel"
+                readonly=""
                 type="hidden"
                 value="SMS"
               />
               <input
                 name="routingConfigId"
+                readonly=""
                 type="hidden"
                 value="test-routing-config-id"
               />
+              <input
+                name="lockNumber"
+                readonly=""
+                type="hidden"
+                value="42"
+              />
               <button
                 class="channel-template-link--remove nhsuk-link"
                 data-testid="remove-template-link-SMS"
diff --git a/frontend/src/__tests__/components/molecules/__snapshots__/MessagePlanChannelTemplate.test.tsx.snap b/frontend/src/__tests__/components/molecules/__snapshots__/MessagePlanChannelTemplate.test.tsx.snap
index b78daea5d..9e2aff1c2 100644
--- a/frontend/src/__tests__/components/molecules/__snapshots__/MessagePlanChannelTemplate.test.tsx.snap
+++ b/frontend/src/__tests__/components/molecules/__snapshots__/MessagePlanChannelTemplate.test.tsx.snap
@@ -20,7 +20,7 @@ exports[`MessagePlanChannelTemplate should match snapshot for empty state (EMAIL
           <a
             class="nhsuk-link nhsuk-link--no-visited-state"
             data-testid="choose-template-link-EMAIL"
-            href="/message-plans/choose-email-template/test-routing-config-id"
+            href="/message-plans/choose-email-template/test-routing-config-id?lockNumber=42"
           >
             Choose
             <span
@@ -58,7 +58,7 @@ exports[`MessagePlanChannelTemplate should match snapshot for empty state (LETTE
           <a
             class="nhsuk-link nhsuk-link--no-visited-state"
             data-testid="choose-template-link-LETTER"
-            href="/message-plans/choose-standard-english-letter-template/test-routing-config-id"
+            href="/message-plans/choose-standard-english-letter-template/test-routing-config-id?lockNumber=42"
           >
             Choose
             <span
@@ -96,7 +96,7 @@ exports[`MessagePlanChannelTemplate should match snapshot for empty state (NHSAP
           <a
             class="nhsuk-link nhsuk-link--no-visited-state"
             data-testid="choose-template-link-NHSAPP"
-            href="/message-plans/choose-nhs-app-template/test-routing-config-id"
+            href="/message-plans/choose-nhs-app-template/test-routing-config-id?lockNumber=42"
           >
             Choose
             <span
@@ -134,7 +134,7 @@ exports[`MessagePlanChannelTemplate should match snapshot for empty state (SMS)
           <a
             class="nhsuk-link nhsuk-link--no-visited-state"
             data-testid="choose-template-link-SMS"
-            href="/message-plans/choose-text-message-template/test-routing-config-id"
+            href="/message-plans/choose-text-message-template/test-routing-config-id?lockNumber=42"
           >
             Choose
             <span
@@ -178,7 +178,7 @@ exports[`MessagePlanChannelTemplate should match snapshot for selected template
           <a
             class="nhsuk-link nhsuk-link--no-visited-state"
             data-testid="change-template-link-EMAIL"
-            href="/message-plans/choose-email-template/test-routing-config-id"
+            href="/message-plans/choose-email-template/test-routing-config-id?lockNumber=42"
           >
             Change
             <span
@@ -194,14 +194,22 @@ exports[`MessagePlanChannelTemplate should match snapshot for selected template
           <form>
             <input
               name="channel"
+              readonly=""
               type="hidden"
               value="EMAIL"
             />
             <input
               name="routingConfigId"
+              readonly=""
               type="hidden"
               value="test-routing-config-id"
             />
+            <input
+              name="lockNumber"
+              readonly=""
+              type="hidden"
+              value="42"
+            />
             <button
               class="channel-template-link--remove nhsuk-link"
               data-testid="remove-template-link-EMAIL"
@@ -251,7 +259,7 @@ exports[`MessagePlanChannelTemplate should match snapshot for selected template
           <a
             class="nhsuk-link nhsuk-link--no-visited-state"
             data-testid="change-template-link-LETTER"
-            href="/message-plans/choose-standard-english-letter-template/test-routing-config-id"
+            href="/message-plans/choose-standard-english-letter-template/test-routing-config-id?lockNumber=42"
           >
             Change
             <span
@@ -267,14 +275,22 @@ exports[`MessagePlanChannelTemplate should match snapshot for selected template
           <form>
             <input
               name="channel"
+              readonly=""
               type="hidden"
               value="LETTER"
             />
             <input
               name="routingConfigId"
+              readonly=""
               type="hidden"
               value="test-routing-config-id"
             />
+            <input
+              name="lockNumber"
+              readonly=""
+              type="hidden"
+              value="42"
+            />
             <button
               class="channel-template-link--remove nhsuk-link"
               data-testid="remove-template-link-LETTER"
@@ -324,7 +340,7 @@ exports[`MessagePlanChannelTemplate should match snapshot for selected template
           <a
             class="nhsuk-link nhsuk-link--no-visited-state"
             data-testid="change-template-link-NHSAPP"
-            href="/message-plans/choose-nhs-app-template/test-routing-config-id"
+            href="/message-plans/choose-nhs-app-template/test-routing-config-id?lockNumber=42"
           >
             Change
             <span
@@ -340,14 +356,22 @@ exports[`MessagePlanChannelTemplate should match snapshot for selected template
           <form>
             <input
               name="channel"
+              readonly=""
               type="hidden"
               value="NHSAPP"
             />
             <input
               name="routingConfigId"
+              readonly=""
               type="hidden"
               value="test-routing-config-id"
             />
+            <input
+              name="lockNumber"
+              readonly=""
+              type="hidden"
+              value="42"
+            />
             <button
               class="channel-template-link--remove nhsuk-link"
               data-testid="remove-template-link-NHSAPP"
@@ -397,7 +421,7 @@ exports[`MessagePlanChannelTemplate should match snapshot for selected template
           <a
             class="nhsuk-link nhsuk-link--no-visited-state"
             data-testid="change-template-link-SMS"
-            href="/message-plans/choose-text-message-template/test-routing-config-id"
+            href="/message-plans/choose-text-message-template/test-routing-config-id?lockNumber=42"
           >
             Change
             <span
@@ -413,14 +437,22 @@ exports[`MessagePlanChannelTemplate should match snapshot for selected template
           <form>
             <input
               name="channel"
+              readonly=""
               type="hidden"
               value="SMS"
             />
             <input
               name="routingConfigId"
+              readonly=""
               type="hidden"
               value="test-routing-config-id"
             />
+            <input
+              name="lockNumber"
+              readonly=""
+              type="hidden"
+              value="42"
+            />
             <button
               class="channel-template-link--remove nhsuk-link"
               data-testid="remove-template-link-SMS"
diff --git a/frontend/src/__tests__/components/organisms/CreateEditMessagePlan.test.tsx b/frontend/src/__tests__/components/organisms/CreateEditMessagePlan.test.tsx
index 4835d18d8..0362ef38b 100644
--- a/frontend/src/__tests__/components/organisms/CreateEditMessagePlan.test.tsx
+++ b/frontend/src/__tests__/components/organisms/CreateEditMessagePlan.test.tsx
@@ -37,6 +37,7 @@ function buildRoutingConfig({
       channelType: 'primary',
       defaultTemplateId: `template-${index}`,
     })),
+    lockNumber: 0,
     defaultCascadeGroup: 'standard',
   };
 }
diff --git a/frontend/src/__tests__/components/organisms/MessagePlanChannelList.test.tsx b/frontend/src/__tests__/components/organisms/MessagePlanChannelList.test.tsx
index a2126358a..7bd26276d 100644
--- a/frontend/src/__tests__/components/organisms/MessagePlanChannelList.test.tsx
+++ b/frontend/src/__tests__/components/organisms/MessagePlanChannelList.test.tsx
@@ -25,6 +25,7 @@ function buildRoutingConfig(channels: Channel[]): RoutingConfig {
       channelType: 'primary',
       defaultTemplateId: `test-template-${i}`,
     })),
+    lockNumber: 0,
     defaultCascadeGroup: 'standard',
   };
 }
diff --git a/frontend/src/__tests__/components/organisms/__snapshots__/CreateEditMessagePlan.test.tsx.snap b/frontend/src/__tests__/components/organisms/__snapshots__/CreateEditMessagePlan.test.tsx.snap
index 23e89617a..ca68464b7 100644
--- a/frontend/src/__tests__/components/organisms/__snapshots__/CreateEditMessagePlan.test.tsx.snap
+++ b/frontend/src/__tests__/components/organisms/__snapshots__/CreateEditMessagePlan.test.tsx.snap
@@ -105,7 +105,7 @@ exports[`CreateEditMessagePlan should match snapshot for a typical message plan
                     <a
                       class="nhsuk-link nhsuk-link--no-visited-state"
                       data-testid="choose-template-link-NHSAPP"
-                      href="/message-plans/choose-nhs-app-template/30fd1e1c-a608-47cf-9cc2-eabaeeeebeca"
+                      href="/message-plans/choose-nhs-app-template/30fd1e1c-a608-47cf-9cc2-eabaeeeebeca?lockNumber=0"
                     >
                       Choose
                       <span
@@ -242,7 +242,7 @@ exports[`CreateEditMessagePlan should match snapshot for a typical message plan
                     <a
                       class="nhsuk-link nhsuk-link--no-visited-state"
                       data-testid="choose-template-link-SMS"
-                      href="/message-plans/choose-text-message-template/30fd1e1c-a608-47cf-9cc2-eabaeeeebeca"
+                      href="/message-plans/choose-text-message-template/30fd1e1c-a608-47cf-9cc2-eabaeeeebeca?lockNumber=0"
                     >
                       Choose
                       <span
@@ -379,7 +379,7 @@ exports[`CreateEditMessagePlan should match snapshot for a typical message plan
                     <a
                       class="nhsuk-link nhsuk-link--no-visited-state"
                       data-testid="choose-template-link-EMAIL"
-                      href="/message-plans/choose-email-template/30fd1e1c-a608-47cf-9cc2-eabaeeeebeca"
+                      href="/message-plans/choose-email-template/30fd1e1c-a608-47cf-9cc2-eabaeeeebeca?lockNumber=0"
                     >
                       Choose
                       <span
@@ -516,7 +516,7 @@ exports[`CreateEditMessagePlan should match snapshot for a typical message plan
                     <a
                       class="nhsuk-link nhsuk-link--no-visited-state"
                       data-testid="choose-template-link-LETTER"
-                      href="/message-plans/choose-standard-english-letter-template/30fd1e1c-a608-47cf-9cc2-eabaeeeebeca"
+                      href="/message-plans/choose-standard-english-letter-template/30fd1e1c-a608-47cf-9cc2-eabaeeeebeca?lockNumber=0"
                     >
                       Choose
                       <span
@@ -674,7 +674,7 @@ exports[`CreateEditMessagePlan should match snapshot for a typical message plan
                     <a
                       class="nhsuk-link nhsuk-link--no-visited-state"
                       data-testid="change-template-link-NHSAPP"
-                      href="/message-plans/choose-nhs-app-template/30fd1e1c-a608-47cf-9cc2-eabaeeeebeca"
+                      href="/message-plans/choose-nhs-app-template/30fd1e1c-a608-47cf-9cc2-eabaeeeebeca?lockNumber=0"
                     >
                       Change
                       <span
@@ -689,14 +689,22 @@ exports[`CreateEditMessagePlan should match snapshot for a typical message plan
                     <form>
                       <input
                         name="channel"
+                        readonly=""
                         type="hidden"
                         value="NHSAPP"
                       />
                       <input
                         name="routingConfigId"
+                        readonly=""
                         type="hidden"
                         value="30fd1e1c-a608-47cf-9cc2-eabaeeeebeca"
                       />
+                      <input
+                        name="lockNumber"
+                        readonly=""
+                        type="hidden"
+                        value="0"
+                      />
                       <button
                         class="channel-template-link--remove nhsuk-link"
                         data-testid="remove-template-link-NHSAPP"
@@ -845,7 +853,7 @@ exports[`CreateEditMessagePlan should match snapshot for a typical message plan
                     <a
                       class="nhsuk-link nhsuk-link--no-visited-state"
                       data-testid="change-template-link-EMAIL"
-                      href="/message-plans/choose-email-template/30fd1e1c-a608-47cf-9cc2-eabaeeeebeca"
+                      href="/message-plans/choose-email-template/30fd1e1c-a608-47cf-9cc2-eabaeeeebeca?lockNumber=0"
                     >
                       Change
                       <span
@@ -860,14 +868,22 @@ exports[`CreateEditMessagePlan should match snapshot for a typical message plan
                     <form>
                       <input
                         name="channel"
+                        readonly=""
                         type="hidden"
                         value="EMAIL"
                       />
                       <input
                         name="routingConfigId"
+                        readonly=""
                         type="hidden"
                         value="30fd1e1c-a608-47cf-9cc2-eabaeeeebeca"
                       />
+                      <input
+                        name="lockNumber"
+                        readonly=""
+                        type="hidden"
+                        value="0"
+                      />
                       <button
                         class="channel-template-link--remove nhsuk-link"
                         data-testid="remove-template-link-EMAIL"
@@ -1016,7 +1032,7 @@ exports[`CreateEditMessagePlan should match snapshot for a typical message plan
                     <a
                       class="nhsuk-link nhsuk-link--no-visited-state"
                       data-testid="change-template-link-LETTER"
-                      href="/message-plans/choose-standard-english-letter-template/30fd1e1c-a608-47cf-9cc2-eabaeeeebeca"
+                      href="/message-plans/choose-standard-english-letter-template/30fd1e1c-a608-47cf-9cc2-eabaeeeebeca?lockNumber=0"
                     >
                       Change
                       <span
@@ -1031,14 +1047,22 @@ exports[`CreateEditMessagePlan should match snapshot for a typical message plan
                     <form>
                       <input
                         name="channel"
+                        readonly=""
                         type="hidden"
                         value="LETTER"
                       />
                       <input
                         name="routingConfigId"
+                        readonly=""
                         type="hidden"
                         value="30fd1e1c-a608-47cf-9cc2-eabaeeeebeca"
                       />
+                      <input
+                        name="lockNumber"
+                        readonly=""
+                        type="hidden"
+                        value="0"
+                      />
                       <button
                         class="channel-template-link--remove nhsuk-link"
                         data-testid="remove-template-link-LETTER"
diff --git a/frontend/src/__tests__/components/organisms/__snapshots__/MessagePlanChannelList.test.tsx.snap b/frontend/src/__tests__/components/organisms/__snapshots__/MessagePlanChannelList.test.tsx.snap
index 6e45d1098..8060b1b89 100644
--- a/frontend/src/__tests__/components/organisms/__snapshots__/MessagePlanChannelList.test.tsx.snap
+++ b/frontend/src/__tests__/components/organisms/__snapshots__/MessagePlanChannelList.test.tsx.snap
@@ -44,7 +44,7 @@ exports[`MessagePlanChannelList should match snapshot for a digital routing plan
               <a
                 class="nhsuk-link nhsuk-link--no-visited-state"
                 data-testid="change-template-link-NHSAPP"
-                href="/message-plans/choose-nhs-app-template/routingconfig-1"
+                href="/message-plans/choose-nhs-app-template/routingconfig-1?lockNumber=0"
               >
                 Change
                 <span
@@ -59,14 +59,22 @@ exports[`MessagePlanChannelList should match snapshot for a digital routing plan
               <form>
                 <input
                   name="channel"
+                  readonly=""
                   type="hidden"
                   value="NHSAPP"
                 />
                 <input
                   name="routingConfigId"
+                  readonly=""
                   type="hidden"
                   value="routingconfig-1"
                 />
+                <input
+                  name="lockNumber"
+                  readonly=""
+                  type="hidden"
+                  value="0"
+                />
                 <button
                   class="channel-template-link--remove nhsuk-link"
                   data-testid="remove-template-link-NHSAPP"
@@ -215,7 +223,7 @@ exports[`MessagePlanChannelList should match snapshot for a digital routing plan
               <a
                 class="nhsuk-link nhsuk-link--no-visited-state"
                 data-testid="change-template-link-EMAIL"
-                href="/message-plans/choose-email-template/routingconfig-1"
+                href="/message-plans/choose-email-template/routingconfig-1?lockNumber=0"
               >
                 Change
                 <span
@@ -230,14 +238,22 @@ exports[`MessagePlanChannelList should match snapshot for a digital routing plan
               <form>
                 <input
                   name="channel"
+                  readonly=""
                   type="hidden"
                   value="EMAIL"
                 />
                 <input
                   name="routingConfigId"
+                  readonly=""
                   type="hidden"
                   value="routingconfig-1"
                 />
+                <input
+                  name="lockNumber"
+                  readonly=""
+                  type="hidden"
+                  value="0"
+                />
                 <button
                   class="channel-template-link--remove nhsuk-link"
                   data-testid="remove-template-link-EMAIL"
@@ -386,7 +402,7 @@ exports[`MessagePlanChannelList should match snapshot for a digital routing plan
               <a
                 class="nhsuk-link nhsuk-link--no-visited-state"
                 data-testid="change-template-link-SMS"
-                href="/message-plans/choose-text-message-template/routingconfig-1"
+                href="/message-plans/choose-text-message-template/routingconfig-1?lockNumber=0"
               >
                 Change
                 <span
@@ -401,14 +417,22 @@ exports[`MessagePlanChannelList should match snapshot for a digital routing plan
               <form>
                 <input
                   name="channel"
+                  readonly=""
                   type="hidden"
                   value="SMS"
                 />
                 <input
                   name="routingConfigId"
+                  readonly=""
                   type="hidden"
                   value="routingconfig-1"
                 />
+                <input
+                  name="lockNumber"
+                  readonly=""
+                  type="hidden"
+                  value="0"
+                />
                 <button
                   class="channel-template-link--remove nhsuk-link"
                   data-testid="remove-template-link-SMS"
@@ -477,7 +501,7 @@ exports[`MessagePlanChannelList should match snapshot for a routing plan with a
               <a
                 class="nhsuk-link nhsuk-link--no-visited-state"
                 data-testid="change-template-link-NHSAPP"
-                href="/message-plans/choose-nhs-app-template/routingconfig-1"
+                href="/message-plans/choose-nhs-app-template/routingconfig-1?lockNumber=0"
               >
                 Change
                 <span
@@ -492,14 +516,22 @@ exports[`MessagePlanChannelList should match snapshot for a routing plan with a
               <form>
                 <input
                   name="channel"
+                  readonly=""
                   type="hidden"
                   value="NHSAPP"
                 />
                 <input
                   name="routingConfigId"
+                  readonly=""
                   type="hidden"
                   value="routingconfig-1"
                 />
+                <input
+                  name="lockNumber"
+                  readonly=""
+                  type="hidden"
+                  value="0"
+                />
                 <button
                   class="channel-template-link--remove nhsuk-link"
                   data-testid="remove-template-link-NHSAPP"
@@ -648,7 +680,7 @@ exports[`MessagePlanChannelList should match snapshot for a routing plan with a
               <a
                 class="nhsuk-link nhsuk-link--no-visited-state"
                 data-testid="change-template-link-EMAIL"
-                href="/message-plans/choose-email-template/routingconfig-1"
+                href="/message-plans/choose-email-template/routingconfig-1?lockNumber=0"
               >
                 Change
                 <span
@@ -663,14 +695,22 @@ exports[`MessagePlanChannelList should match snapshot for a routing plan with a
               <form>
                 <input
                   name="channel"
+                  readonly=""
                   type="hidden"
                   value="EMAIL"
                 />
                 <input
                   name="routingConfigId"
+                  readonly=""
                   type="hidden"
                   value="routingconfig-1"
                 />
+                <input
+                  name="lockNumber"
+                  readonly=""
+                  type="hidden"
+                  value="0"
+                />
                 <button
                   class="channel-template-link--remove nhsuk-link"
                   data-testid="remove-template-link-EMAIL"
@@ -819,7 +859,7 @@ exports[`MessagePlanChannelList should match snapshot for a routing plan with a
               <a
                 class="nhsuk-link nhsuk-link--no-visited-state"
                 data-testid="change-template-link-LETTER"
-                href="/message-plans/choose-standard-english-letter-template/routingconfig-1"
+                href="/message-plans/choose-standard-english-letter-template/routingconfig-1?lockNumber=0"
               >
                 Change
                 <span
@@ -834,14 +874,22 @@ exports[`MessagePlanChannelList should match snapshot for a routing plan with a
               <form>
                 <input
                   name="channel"
+                  readonly=""
                   type="hidden"
                   value="LETTER"
                 />
                 <input
                   name="routingConfigId"
+                  readonly=""
                   type="hidden"
                   value="routingconfig-1"
                 />
+                <input
+                  name="lockNumber"
+                  readonly=""
+                  type="hidden"
+                  value="0"
+                />
                 <button
                   class="channel-template-link--remove nhsuk-link"
                   data-testid="remove-template-link-LETTER"
diff --git a/frontend/src/__tests__/components/organisms/__snapshots__/PreviewLetterTemplate.test.tsx.snap b/frontend/src/__tests__/components/organisms/__snapshots__/PreviewLetterTemplate.test.tsx.snap
index 53237a5d6..c65d0e7ba 100644
--- a/frontend/src/__tests__/components/organisms/__snapshots__/PreviewLetterTemplate.test.tsx.snap
+++ b/frontend/src/__tests__/components/organisms/__snapshots__/PreviewLetterTemplate.test.tsx.snap
@@ -163,7 +163,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template language
           class="nhsuk-button"
           data-testid="preview-letter-template-cta"
           draggable="false"
-          href="/templates/submit-letter-template/0A097DCD-35F9-4DAD-A37E-AC358B71B74D"
+          href="/templates/submit-letter-template/0A097DCD-35F9-4DAD-A37E-AC358B71B74D?lockNumber=1"
           id="preview-letter-template-cta"
           role="button"
         >
@@ -308,7 +308,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
           class="nhsuk-button"
           data-testid="preview-letter-template-cta"
           draggable="false"
-          href="/templates/submit-letter-template/0A097DCD-35F9-4DAD-A37E-AC358B71B74D"
+          href="/templates/submit-letter-template/0A097DCD-35F9-4DAD-A37E-AC358B71B74D?lockNumber=1"
           id="preview-letter-template-cta"
           role="button"
         >
@@ -453,7 +453,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
           class="nhsuk-button"
           data-testid="preview-letter-template-cta"
           draggable="false"
-          href="/templates/request-proof-of-template/53525D03-1BC1-4563-ABF9-A74FF04142AF"
+          href="/templates/request-proof-of-template/53525D03-1BC1-4563-ABF9-A74FF04142AF?lockNumber=1"
           id="preview-letter-template-cta"
           role="button"
         >
@@ -985,7 +985,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
           class="nhsuk-button"
           data-testid="preview-letter-template-cta"
           draggable="false"
-          href="/templates/submit-letter-template/2C56C5F6-B3AD-4FF8-A8A2-52E4FA8AF2BE"
+          href="/templates/submit-letter-template/2C56C5F6-B3AD-4FF8-A8A2-52E4FA8AF2BE?lockNumber=1"
           id="preview-letter-template-cta"
           role="button"
         >
@@ -1239,7 +1239,7 @@ exports[`PreviewLetterTemplate component matches snapshot when template status i
           class="nhsuk-button"
           data-testid="preview-letter-template-cta"
           draggable="false"
-          href="/templates/submit-letter-template/2C56C5F6-B3AD-4FF8-A8A2-52E4FA8AF2BE"
+          href="/templates/submit-letter-template/2C56C5F6-B3AD-4FF8-A8A2-52E4FA8AF2BE?lockNumber=1"
           id="preview-letter-template-cta"
           role="button"
         >
diff --git a/frontend/src/__tests__/helpers/helpers.ts b/frontend/src/__tests__/helpers/helpers.ts
index a35f338ab..3ee3d3f97 100644
--- a/frontend/src/__tests__/helpers/helpers.ts
+++ b/frontend/src/__tests__/helpers/helpers.ts
@@ -106,5 +106,6 @@ export const ROUTING_CONFIG: RoutingConfig = {
       defaultTemplateId: LETTER_TEMPLATE.id,
     },
   ],
+  lockNumber: 0,
   defaultCascadeGroup: 'standard',
 };
diff --git a/frontend/src/__tests__/helpers/routing-config-factory.ts b/frontend/src/__tests__/helpers/routing-config-factory.ts
index f1f6e1127..4fc09b224 100644
--- a/frontend/src/__tests__/helpers/routing-config-factory.ts
+++ b/frontend/src/__tests__/helpers/routing-config-factory.ts
@@ -21,6 +21,7 @@ export const RoutingConfigFactory = {
       ],
       cascadeGroupOverrides: [{ name: 'standard' }],
       name: 'Test config',
+      lockNumber: 0,
       ...data,
     };
   },
diff --git a/frontend/src/__tests__/utils/get-message-plan-template-ids.test.ts b/frontend/src/__tests__/utils/get-message-plan-template-ids.test.ts
index 5dd7bc155..fdf87a14e 100644
--- a/frontend/src/__tests__/utils/get-message-plan-template-ids.test.ts
+++ b/frontend/src/__tests__/utils/get-message-plan-template-ids.test.ts
@@ -1,23 +1,9 @@
 import { getMessagePlanTemplateIds } from '@utils/get-message-plan-template-ids';
 import type { RoutingConfig } from 'nhs-notify-backend-client';
 
-const baseConfig: RoutingConfig = {
-  id: 'test-id',
-  name: 'Test message plan',
-  status: 'DRAFT',
-  clientId: 'client-1',
-  campaignId: 'campaign-1',
-  createdAt: '2025-01-01T00:00:00.000Z',
-  updatedAt: '2025-01-01T00:00:00.000Z',
-  cascade: [],
-  cascadeGroupOverrides: [],
-  defaultCascadeGroup: 'standard',
-};
-
 describe('getMessagePlanTemplateIds', () => {
   it('should collect unique template IDs from defaults and conditionals', () => {
-    const plan: RoutingConfig = {
-      ...baseConfig,
+    const plan: Pick<RoutingConfig, 'cascade'> = {
       cascade: [
         {
           cascadeGroups: ['standard'],
@@ -49,8 +35,7 @@ describe('getMessagePlanTemplateIds', () => {
   });
 
   it('should return empty set when there are no templates', () => {
-    const plan: RoutingConfig = {
-      ...baseConfig,
+    const plan: Pick<RoutingConfig, 'cascade'> = {
       cascade: [
         {
           cascadeGroups: ['standard'],
diff --git a/frontend/src/__tests__/utils/message-plans.test.ts b/frontend/src/__tests__/utils/message-plans.test.ts
index 3642e5f9a..ae4496a12 100644
--- a/frontend/src/__tests__/utils/message-plans.test.ts
+++ b/frontend/src/__tests__/utils/message-plans.test.ts
@@ -66,6 +66,7 @@ const baseConfig: RoutingConfig = {
   createdAt: '2025-01-01T00:00:00.000Z',
   updatedAt: '2025-01-01T00:00:00.000Z',
   cascade: [validCascadeItem],
+  lockNumber: 0,
   cascadeGroupOverrides: [],
   defaultCascadeGroup: 'standard',
 };
@@ -117,6 +118,7 @@ describe('Message plans actions', () => {
             cascadeGroups: ['standard'],
           },
         ],
+        lockNumber: 0,
         cascadeGroupOverrides: [],
         defaultCascadeGroup: 'standard',
       } satisfies Omit<RoutingConfig, 'id' | 'updatedAt'>;
@@ -198,6 +200,7 @@ describe('Message plans actions', () => {
             cascadeGroupOverrides: [],
             id: 'a487ed49-e2f7-4871-ac8d-0c6c682c71f5',
             createdAt: '2022-01-01T00:00:00.000Z',
+            lockNumber: 0,
             defaultCascadeGroup: 'standard',
           },
         ],
@@ -349,7 +352,7 @@ describe('Message plans actions', () => {
       });
 
       await expect(
-        updateRoutingConfig(validRoutingConfigId, baseConfig)
+        updateRoutingConfig(validRoutingConfigId, baseConfig, 42)
       ).rejects.toThrow('Failed to get access token');
 
       expect(routingConfigApiMock.update).not.toHaveBeenCalled();
@@ -364,12 +367,17 @@ describe('Message plans actions', () => {
 
       routingConfigApiMock.update.mockResolvedValueOnce({ data: updated });
 
-      const response = await updateRoutingConfig(validRoutingConfigId, updated);
+      const response = await updateRoutingConfig(
+        validRoutingConfigId,
+        updated,
+        42
+      );
 
       expect(routingConfigApiMock.update).toHaveBeenCalledWith(
         'mock-token',
         validRoutingConfigId,
-        updated
+        updated,
+        42
       );
       expect(response).toEqual(updated);
       expect(loggerMock.error).not.toHaveBeenCalled();
@@ -382,7 +390,8 @@ describe('Message plans actions', () => {
 
       const response = await updateRoutingConfig(
         validRoutingConfigId,
-        baseConfig
+        baseConfig,
+        42
       );
 
       expect(response).toBeUndefined();
@@ -396,13 +405,14 @@ describe('Message plans actions', () => {
       });
 
       await expect(
-        updateRoutingConfig(validRoutingConfigId, baseConfig)
+        updateRoutingConfig(validRoutingConfigId, baseConfig, 42)
       ).rejects.toThrow('Failed to update message plan');
 
       expect(routingConfigApiMock.update).toHaveBeenCalledWith(
         'mock-token',
         validRoutingConfigId,
-        baseConfig
+        baseConfig,
+        42
       );
       expect(loggerMock.error).toHaveBeenCalledWith(
         'Failed to update message plan',
@@ -419,13 +429,15 @@ describe('Message plans actions', () => {
 
       const response = await updateRoutingConfig(
         invalidRoutingConfigId,
-        baseConfig
+        baseConfig,
+        42
       );
 
       expect(routingConfigApiMock.update).toHaveBeenCalledWith(
         'mock-token',
         invalidRoutingConfigId,
-        baseConfig
+        baseConfig,
+        42
       );
       expect(response).toBeUndefined();
       expect(loggerMock.error).toHaveBeenCalledWith(
@@ -566,6 +578,7 @@ describe('Message plans actions', () => {
           defaultCascadeGroup: 'standard',
           status: 'DRAFT',
           updatedAt: now.toISOString(),
+          lockNumber: 0,
         },
       }));
 
@@ -616,6 +629,7 @@ describe('Message plans actions', () => {
             defaultTemplateId: null,
           },
         ],
+        lockNumber: 0,
         cascadeGroupOverrides: [],
         defaultCascadeGroup: 'standard',
       });
diff --git a/frontend/src/app/email-template-submitted/[templateId]/page.tsx b/frontend/src/app/email-template-submitted/[templateId]/page.tsx
index 33e744c1d..0f0713cf5 100644
--- a/frontend/src/app/email-template-submitted/[templateId]/page.tsx
+++ b/frontend/src/app/email-template-submitted/[templateId]/page.tsx
@@ -3,7 +3,7 @@
 import { Metadata } from 'next';
 import { TemplateSubmitted } from '@molecules/TemplateSubmitted/TemplateSubmitted';
 import {
-  TemplateSubmittedPageProps,
+  TemplatePageProps,
   validateSubmittedEmailTemplate,
 } from 'nhs-notify-web-template-management-utils';
 import { getTemplate } from '@utils/form-actions';
@@ -18,9 +18,7 @@ export async function generateMetadata(): Promise<Metadata> {
   };
 }
 
-const EmailTemplateSubmittedPage = async (
-  props: TemplateSubmittedPageProps
-) => {
+const EmailTemplateSubmittedPage = async (props: TemplatePageProps) => {
   const { templateId } = await props.params;
 
   const template = await getTemplate(templateId);
diff --git a/frontend/src/app/letter-template-submitted/[templateId]/page.tsx b/frontend/src/app/letter-template-submitted/[templateId]/page.tsx
index 783bc3d1b..0a281c89f 100644
--- a/frontend/src/app/letter-template-submitted/[templateId]/page.tsx
+++ b/frontend/src/app/letter-template-submitted/[templateId]/page.tsx
@@ -2,7 +2,7 @@
 
 import { TemplateSubmitted } from '@molecules/TemplateSubmitted/TemplateSubmitted';
 import {
-  TemplateSubmittedPageProps,
+  TemplatePageProps,
   validateSubmittedLetterTemplate,
 } from 'nhs-notify-web-template-management-utils';
 import { getTemplate } from '@utils/form-actions';
@@ -18,9 +18,7 @@ export async function generateMetadata(): Promise<Metadata> {
   };
 }
 
-const LetterTemplateSubmittedPage = async (
-  props: TemplateSubmittedPageProps
-) => {
+const LetterTemplateSubmittedPage = async (props: TemplatePageProps) => {
   const { templateId } = await props.params;
 
   const template = await getTemplate(templateId);
diff --git a/frontend/src/app/message-plans/choose-email-template/[routingConfigId]/page.tsx b/frontend/src/app/message-plans/choose-email-template/[routingConfigId]/page.tsx
index cb041312c..30fa9cc8e 100644
--- a/frontend/src/app/message-plans/choose-email-template/[routingConfigId]/page.tsx
+++ b/frontend/src/app/message-plans/choose-email-template/[routingConfigId]/page.tsx
@@ -8,6 +8,7 @@ import { redirect, RedirectType } from 'next/navigation';
 import content from '@content/content';
 import { ChooseChannelTemplate } from '@forms/ChooseChannelTemplate';
 import { getTemplates } from '@utils/form-actions';
+import { $LockNumber } from 'nhs-notify-backend-client';
 const { pageTitle, pageHeading } = content.pages.chooseEmailTemplate;
 
 export async function generateMetadata(): Promise<Metadata> {
@@ -19,6 +20,17 @@ export async function generateMetadata(): Promise<Metadata> {
 export default async function ChooseEmailTemplate(props: MessagePlanPageProps) {
   const { routingConfigId } = await props.params;
 
+  const searchParams = await props.searchParams;
+
+  const lockNumberResult = $LockNumber.safeParse(searchParams?.lockNumber);
+
+  if (!lockNumberResult.success) {
+    return redirect(
+      `/message-plans/choose-templates/${routingConfigId}`,
+      RedirectType.replace
+    );
+  }
+
   const messagePlan = await getRoutingConfig(routingConfigId);
 
   if (!messagePlan) {
@@ -43,6 +55,7 @@ export default async function ChooseEmailTemplate(props: MessagePlanPageProps) {
       pageHeading={pageHeading}
       templateList={availableTemplateList}
       cascadeIndex={cascadeIndex}
+      lockNumber={lockNumberResult.data}
     />
   );
 }
diff --git a/frontend/src/app/message-plans/choose-nhs-app-template/[routingConfigId]/page.tsx b/frontend/src/app/message-plans/choose-nhs-app-template/[routingConfigId]/page.tsx
index d0156608a..8221e3e0e 100644
--- a/frontend/src/app/message-plans/choose-nhs-app-template/[routingConfigId]/page.tsx
+++ b/frontend/src/app/message-plans/choose-nhs-app-template/[routingConfigId]/page.tsx
@@ -8,6 +8,7 @@ import { redirect, RedirectType } from 'next/navigation';
 import content from '@content/content';
 import { ChooseChannelTemplate } from '@forms/ChooseChannelTemplate';
 import { getTemplates } from '@utils/form-actions';
+import { $LockNumber } from 'nhs-notify-backend-client';
 const { pageTitle, pageHeading } = content.pages.chooseNhsAppTemplate;
 
 export async function generateMetadata(): Promise<Metadata> {
@@ -21,6 +22,17 @@ export default async function ChooseNhsAppTemplate(
 ) {
   const { routingConfigId } = await props.params;
 
+  const searchParams = await props.searchParams;
+
+  const lockNumberResult = $LockNumber.safeParse(searchParams?.lockNumber);
+
+  if (!lockNumberResult.success) {
+    return redirect(
+      `/message-plans/choose-templates/${routingConfigId}`,
+      RedirectType.replace
+    );
+  }
+
   const messagePlan = await getRoutingConfig(routingConfigId);
 
   if (!messagePlan) {
@@ -45,6 +57,7 @@ export default async function ChooseNhsAppTemplate(
       pageHeading={pageHeading}
       templateList={availableTemplateList}
       cascadeIndex={cascadeIndex}
+      lockNumber={lockNumberResult.data}
     />
   );
 }
diff --git a/frontend/src/app/message-plans/choose-standard-english-letter-template/[routingConfigId]/page.tsx b/frontend/src/app/message-plans/choose-standard-english-letter-template/[routingConfigId]/page.tsx
index 20f655bda..b4cfca7ae 100644
--- a/frontend/src/app/message-plans/choose-standard-english-letter-template/[routingConfigId]/page.tsx
+++ b/frontend/src/app/message-plans/choose-standard-english-letter-template/[routingConfigId]/page.tsx
@@ -8,6 +8,7 @@ import { redirect, RedirectType } from 'next/navigation';
 import content from '@content/content';
 import { ChooseChannelTemplate } from '@forms/ChooseChannelTemplate';
 import { getTemplates } from '@utils/form-actions';
+import { $LockNumber } from 'nhs-notify-backend-client';
 const { pageTitle, pageHeading } =
   content.pages.chooseStandardEnglishLetterTemplate;
 
@@ -22,6 +23,17 @@ export default async function ChooseStandardEnglishLetterTemplate(
 ) {
   const { routingConfigId } = await props.params;
 
+  const searchParams = await props.searchParams;
+
+  const lockNumberResult = $LockNumber.safeParse(searchParams?.lockNumber);
+
+  if (!lockNumberResult.success) {
+    return redirect(
+      `/message-plans/choose-templates/${routingConfigId}`,
+      RedirectType.replace
+    );
+  }
+
   const messagePlan = await getRoutingConfig(routingConfigId);
 
   if (!messagePlan) {
@@ -48,6 +60,7 @@ export default async function ChooseStandardEnglishLetterTemplate(
       pageHeading={pageHeading}
       templateList={availableTemplateList}
       cascadeIndex={cascadeIndex}
+      lockNumber={lockNumberResult.data}
     />
   );
 }
diff --git a/frontend/src/app/message-plans/choose-templates/[routingConfigId]/actions.test.ts b/frontend/src/app/message-plans/choose-templates/[routingConfigId]/actions.test.ts
index b3c52f48f..dd48ceaef 100644
--- a/frontend/src/app/message-plans/choose-templates/[routingConfigId]/actions.test.ts
+++ b/frontend/src/app/message-plans/choose-templates/[routingConfigId]/actions.test.ts
@@ -41,6 +41,7 @@ const baseConfig = {
     },
   ],
   cascadeGroupOverrides: [],
+  lockNumber: 0,
   defaultCascadeGroup: 'standard',
 };
 
@@ -55,6 +56,7 @@ describe('removeTemplateFromMessagePlan', () => {
     const formData = new FormData();
     formData.set('routingConfigId', routingConfigId);
     formData.set('channel', 'EMAIL');
+    formData.set('lockNumber', '42');
 
     await removeTemplateFromMessagePlan(formData);
 
@@ -73,7 +75,8 @@ describe('removeTemplateFromMessagePlan', () => {
             defaultTemplateId: 'template-2',
           }),
         ],
-      })
+      }),
+      42
     );
   });
 
@@ -84,6 +87,7 @@ describe('removeTemplateFromMessagePlan', () => {
     const formData = new FormData();
     formData.set('routingConfigId', routingConfigId);
     formData.set('channel', 'EMAIL');
+    formData.set('lockNumber', '42');
 
     await removeTemplateFromMessagePlan(formData);
 
@@ -98,6 +102,7 @@ describe('removeTemplateFromMessagePlan', () => {
     const formData = new FormData();
     formData.set('routingConfigId', routingConfigId);
     formData.set('channel', 'EMAIL');
+    formData.set('lockNumber', '42');
 
     await expect(removeTemplateFromMessagePlan(formData)).rejects.toThrow(
       /not found/
@@ -116,6 +121,7 @@ describe('removeTemplateFromMessagePlan', () => {
     const formData = new FormData();
     formData.set('routingConfigId', 'invalid-id');
     formData.set('channel', 'test');
+    formData.set('lockNumber', '42');
 
     await expect(removeTemplateFromMessagePlan(formData)).rejects.toThrow(
       /Invalid form data/
diff --git a/frontend/src/app/message-plans/choose-templates/[routingConfigId]/actions.ts b/frontend/src/app/message-plans/choose-templates/[routingConfigId]/actions.ts
index 8ffe8618f..0510bc48e 100644
--- a/frontend/src/app/message-plans/choose-templates/[routingConfigId]/actions.ts
+++ b/frontend/src/app/message-plans/choose-templates/[routingConfigId]/actions.ts
@@ -2,7 +2,7 @@
 
 import { z } from 'zod';
 import { getRoutingConfig, updateRoutingConfig } from '@utils/message-plans';
-import { $Channel } from 'nhs-notify-backend-client';
+import { $Channel, $LockNumber } from 'nhs-notify-backend-client';
 import { redirect } from 'next/navigation';
 
 export async function removeTemplateFromMessagePlan(formData: FormData) {
@@ -10,17 +10,19 @@ export async function removeTemplateFromMessagePlan(formData: FormData) {
     .object({
       routingConfigId: z.uuidv4(),
       channel: $Channel,
+      lockNumber: $LockNumber,
     })
     .safeParse({
       routingConfigId: formData.get('routingConfigId'),
       channel: formData.get('channel'),
+      lockNumber: formData.get('lockNumber'),
     });
 
   if (!parseResult.success) {
     throw new Error('Invalid form data');
   }
 
-  const { routingConfigId, channel } = parseResult.data;
+  const { routingConfigId, channel, lockNumber } = parseResult.data;
 
   const routingConfig = await getRoutingConfig(routingConfigId);
 
@@ -40,7 +42,7 @@ export async function removeTemplateFromMessagePlan(formData: FormData) {
     cascade: updatedCascade,
   };
 
-  await updateRoutingConfig(routingConfigId, updatedConfig);
+  await updateRoutingConfig(routingConfigId, updatedConfig, lockNumber);
 
   redirect(`/message-plans/choose-templates/${routingConfigId}`);
 }
diff --git a/frontend/src/app/message-plans/choose-text-message-template/[routingConfigId]/page.tsx b/frontend/src/app/message-plans/choose-text-message-template/[routingConfigId]/page.tsx
index c8cee456c..7b1feaac6 100644
--- a/frontend/src/app/message-plans/choose-text-message-template/[routingConfigId]/page.tsx
+++ b/frontend/src/app/message-plans/choose-text-message-template/[routingConfigId]/page.tsx
@@ -8,6 +8,8 @@ import { redirect, RedirectType } from 'next/navigation';
 import content from '@content/content';
 import { ChooseChannelTemplate } from '@forms/ChooseChannelTemplate';
 import { getTemplates } from '@utils/form-actions';
+import { $LockNumber } from 'nhs-notify-backend-client';
+
 const { pageTitle, pageHeading } = content.pages.chooseTextMessageTemplate;
 
 export async function generateMetadata(): Promise<Metadata> {
@@ -21,6 +23,17 @@ export default async function ChooseTextMessageTemplate(
 ) {
   const { routingConfigId } = await props.params;
 
+  const searchParams = await props.searchParams;
+
+  const lockNumberResult = $LockNumber.safeParse(searchParams?.lockNumber);
+
+  if (!lockNumberResult.success) {
+    return redirect(
+      `/message-plans/choose-templates/${routingConfigId}`,
+      RedirectType.replace
+    );
+  }
+
   const messagePlan = await getRoutingConfig(routingConfigId);
 
   if (!messagePlan) {
@@ -45,6 +58,7 @@ export default async function ChooseTextMessageTemplate(
       pageHeading={pageHeading}
       templateList={availableTemplateList}
       cascadeIndex={cascadeIndex}
+      lockNumber={lockNumberResult.data}
     />
   );
 }
diff --git a/frontend/src/app/message-plans/edit-message-plan-settings/[routingConfigId]/page.tsx b/frontend/src/app/message-plans/edit-message-plan-settings/[routingConfigId]/page.tsx
index 2c438685c..1c2785e02 100644
--- a/frontend/src/app/message-plans/edit-message-plan-settings/[routingConfigId]/page.tsx
+++ b/frontend/src/app/message-plans/edit-message-plan-settings/[routingConfigId]/page.tsx
@@ -53,6 +53,12 @@ export default async function EditMessagePlanSettingsPage({
                 value={routingConfigId}
                 readOnly
               />
+              <input
+                type='hidden'
+                name='lockNumber'
+                value={routingConfig.lockNumber}
+                readOnly
+              />
             </MessagePlanForm>
           </div>
         </div>
diff --git a/frontend/src/app/message-plans/edit-message-plan-settings/[routingConfigId]/server-action.ts b/frontend/src/app/message-plans/edit-message-plan-settings/[routingConfigId]/server-action.ts
index 5f6ab36ad..3e112687c 100644
--- a/frontend/src/app/message-plans/edit-message-plan-settings/[routingConfigId]/server-action.ts
+++ b/frontend/src/app/message-plans/edit-message-plan-settings/[routingConfigId]/server-action.ts
@@ -5,9 +5,11 @@ import { z } from 'zod/v4';
 import type { FormState } from 'nhs-notify-web-template-management-utils';
 import { $MessagePlanFormData } from '@forms/MessagePlan/schema';
 import { updateRoutingConfig } from '@utils/message-plans';
+import { $LockNumber } from 'nhs-notify-backend-client';
 
 const $UpdateMessagePlanFormData = $MessagePlanFormData.extend({
   routingConfigId: z.string({ error: 'Invalid message plan id' }),
+  lockNumber: $LockNumber,
 });
 
 export async function editMessagePlanSettingsServerAction(
@@ -27,10 +29,14 @@ export async function editMessagePlanSettingsServerAction(
 
   delete state.errorState;
 
-  await updateRoutingConfig(parsed.data.routingConfigId, {
-    name: parsed.data.name,
-    campaignId: parsed.data.campaignId,
-  });
+  await updateRoutingConfig(
+    parsed.data.routingConfigId,
+    {
+      name: parsed.data.name,
+      campaignId: parsed.data.campaignId,
+    },
+    parsed.data.lockNumber
+  );
 
   redirect(
     `/message-plans/choose-templates/${parsed.data.routingConfigId}`,
diff --git a/frontend/src/app/nhs-app-template-submitted/[templateId]/page.tsx b/frontend/src/app/nhs-app-template-submitted/[templateId]/page.tsx
index 5faf0f6dd..6c46bf0eb 100644
--- a/frontend/src/app/nhs-app-template-submitted/[templateId]/page.tsx
+++ b/frontend/src/app/nhs-app-template-submitted/[templateId]/page.tsx
@@ -3,7 +3,7 @@
 import { Metadata } from 'next';
 import { TemplateSubmitted } from '@molecules/TemplateSubmitted/TemplateSubmitted';
 import {
-  TemplateSubmittedPageProps,
+  TemplatePageProps,
   validateSubmittedNHSAppTemplate,
 } from 'nhs-notify-web-template-management-utils';
 import { getTemplate } from '@utils/form-actions';
@@ -18,9 +18,7 @@ export async function generateMetadata(): Promise<Metadata> {
   };
 }
 
-const NhsAppTemplateSubmittedPage = async (
-  props: TemplateSubmittedPageProps
-) => {
+const NhsAppTemplateSubmittedPage = async (props: TemplatePageProps) => {
   const { templateId } = await props.params;
 
   const template = await getTemplate(templateId);
diff --git a/frontend/src/app/request-proof-of-template/[templateId]/page.tsx b/frontend/src/app/request-proof-of-template/[templateId]/page.tsx
index 06df67778..e9d3350a1 100644
--- a/frontend/src/app/request-proof-of-template/[templateId]/page.tsx
+++ b/frontend/src/app/request-proof-of-template/[templateId]/page.tsx
@@ -10,6 +10,7 @@ import {
 import { getTemplate } from '@utils/form-actions';
 import content from '@content/content';
 import { serverIsFeatureEnabled } from '@utils/server-features';
+import { $LockNumber } from 'nhs-notify-backend-client';
 
 const { pageTitle } = content.components.requestProof;
 
@@ -28,6 +29,17 @@ const RequestProofPage = async (props: TemplatePageProps) => {
     return redirect('/invalid-template', RedirectType.replace);
   }
 
+  const searchParams = await props.searchParams;
+
+  const lockNumberResult = $LockNumber.safeParse(searchParams?.lockNumber);
+
+  if (!lockNumberResult.success) {
+    return redirect(
+      `/preview-letter-template/${templateId}`,
+      RedirectType.replace
+    );
+  }
+
   const template = await getTemplate(templateId);
 
   const validatedTemplate = validateLetterTemplate(template);
@@ -41,7 +53,7 @@ const RequestProofPage = async (props: TemplatePageProps) => {
       templateName={validatedTemplate.name}
       templateId={validatedTemplate.id}
       channel={validatedTemplate.templateType}
-      lockNumber={validatedTemplate.lockNumber}
+      lockNumber={lockNumberResult.data}
     />
   );
 };
diff --git a/frontend/src/app/submit-email-template/[templateId]/page.tsx b/frontend/src/app/submit-email-template/[templateId]/page.tsx
index ecfbe94b6..ab1412967 100644
--- a/frontend/src/app/submit-email-template/[templateId]/page.tsx
+++ b/frontend/src/app/submit-email-template/[templateId]/page.tsx
@@ -2,6 +2,7 @@
 
 import { Metadata } from 'next';
 import { redirect, RedirectType } from 'next/navigation';
+import { $LockNumber } from 'nhs-notify-backend-client';
 import { SubmitDigitalTemplate } from '@forms/SubmitTemplate/SubmitDigitalTemplate';
 import {
   TemplatePageProps,
@@ -21,6 +22,17 @@ export async function generateMetadata(): Promise<Metadata> {
 const SubmitEmailTemplatePage = async (props: TemplatePageProps) => {
   const { templateId } = await props.params;
 
+  const searchParams = await props.searchParams;
+
+  const lockNumberResult = $LockNumber.safeParse(searchParams?.lockNumber);
+
+  if (!lockNumberResult.success) {
+    return redirect(
+      `/preview-email-template/${templateId}`,
+      RedirectType.replace
+    );
+  }
+
   const template = await getTemplate(templateId);
 
   const validatedTemplate = validateEmailTemplate(template);
@@ -33,7 +45,7 @@ const SubmitEmailTemplatePage = async (props: TemplatePageProps) => {
     <SubmitDigitalTemplate
       templateName={validatedTemplate.name}
       templateId={validatedTemplate.id}
-      lockNumber={validatedTemplate.lockNumber}
+      lockNumber={lockNumberResult.data}
       channel='EMAIL'
     />
   );
diff --git a/frontend/src/app/submit-letter-template/[templateId]/page.tsx b/frontend/src/app/submit-letter-template/[templateId]/page.tsx
index a396c17ec..32b97b791 100644
--- a/frontend/src/app/submit-letter-template/[templateId]/page.tsx
+++ b/frontend/src/app/submit-letter-template/[templateId]/page.tsx
@@ -8,6 +8,7 @@ import {
 } from 'nhs-notify-web-template-management-utils';
 import { getTemplate } from '@utils/form-actions';
 import { SubmitLetterTemplate } from '@forms/SubmitTemplate/SubmitLetterTemplate';
+import { $LockNumber } from 'nhs-notify-backend-client';
 
 export async function generateMetadata(): Promise<Metadata> {
   return {
@@ -18,6 +19,17 @@ export async function generateMetadata(): Promise<Metadata> {
 const SubmitLetterTemplatePage = async (props: TemplatePageProps) => {
   const { templateId } = await props.params;
 
+  const searchParams = await props.searchParams;
+
+  const lockNumberResult = $LockNumber.safeParse(searchParams?.lockNumber);
+
+  if (!lockNumberResult.success) {
+    return redirect(
+      `/preview-letter-template/${templateId}`,
+      RedirectType.replace
+    );
+  }
+
   const template = await getTemplate(templateId);
 
   const validatedTemplate = validateLetterTemplate(template);
@@ -30,7 +42,7 @@ const SubmitLetterTemplatePage = async (props: TemplatePageProps) => {
     <SubmitLetterTemplate
       templateName={validatedTemplate.name}
       templateId={validatedTemplate.id}
-      lockNumber={validatedTemplate.lockNumber}
+      lockNumber={lockNumberResult.data}
     />
   );
 };
diff --git a/frontend/src/app/submit-nhs-app-template/[templateId]/page.tsx b/frontend/src/app/submit-nhs-app-template/[templateId]/page.tsx
index fe524e64d..c81ce5fe7 100644
--- a/frontend/src/app/submit-nhs-app-template/[templateId]/page.tsx
+++ b/frontend/src/app/submit-nhs-app-template/[templateId]/page.tsx
@@ -2,6 +2,7 @@
 
 import { Metadata } from 'next';
 import { redirect, RedirectType } from 'next/navigation';
+import { $LockNumber } from 'nhs-notify-backend-client';
 import { SubmitDigitalTemplate } from '@forms/SubmitTemplate/SubmitDigitalTemplate';
 import {
   TemplatePageProps,
@@ -21,6 +22,17 @@ export async function generateMetadata(): Promise<Metadata> {
 const SubmitNhsAppTemplatePage = async (props: TemplatePageProps) => {
   const { templateId } = await props.params;
 
+  const searchParams = await props.searchParams;
+
+  const lockNumberResult = $LockNumber.safeParse(searchParams?.lockNumber);
+
+  if (!lockNumberResult.success) {
+    return redirect(
+      `/preview-nhs-app-template/${templateId}`,
+      RedirectType.replace
+    );
+  }
+
   const template = await getTemplate(templateId);
 
   const validatedTemplate = validateNHSAppTemplate(template);
@@ -34,7 +46,7 @@ const SubmitNhsAppTemplatePage = async (props: TemplatePageProps) => {
       templateName={validatedTemplate.name}
       templateId={validatedTemplate.id}
       channel='NHS_APP'
-      lockNumber={validatedTemplate.lockNumber}
+      lockNumber={lockNumberResult.data}
     />
   );
 };
diff --git a/frontend/src/app/submit-text-message-template/[templateId]/page.tsx b/frontend/src/app/submit-text-message-template/[templateId]/page.tsx
index 7be99331b..d6e43573f 100644
--- a/frontend/src/app/submit-text-message-template/[templateId]/page.tsx
+++ b/frontend/src/app/submit-text-message-template/[templateId]/page.tsx
@@ -2,6 +2,7 @@
 
 import { Metadata } from 'next';
 import { redirect, RedirectType } from 'next/navigation';
+import { $LockNumber } from 'nhs-notify-backend-client';
 import { SubmitDigitalTemplate } from '@forms/SubmitTemplate/SubmitDigitalTemplate';
 import {
   TemplatePageProps,
@@ -21,6 +22,17 @@ export async function generateMetadata(): Promise<Metadata> {
 const SubmitSmsTemplatePage = async (props: TemplatePageProps) => {
   const { templateId } = await props.params;
 
+  const searchParams = await props.searchParams;
+
+  const lockNumberResult = $LockNumber.safeParse(searchParams?.lockNumber);
+
+  if (!lockNumberResult.success) {
+    return redirect(
+      `/preview-text-message-template/${templateId}`,
+      RedirectType.replace
+    );
+  }
+
   const template = await getTemplate(templateId);
 
   const validatedTemplate = validateSMSTemplate(template);
@@ -34,7 +46,7 @@ const SubmitSmsTemplatePage = async (props: TemplatePageProps) => {
       templateName={validatedTemplate.name}
       templateId={validatedTemplate.id}
       channel='SMS'
-      lockNumber={validatedTemplate.lockNumber}
+      lockNumber={lockNumberResult.data}
     />
   );
 };
diff --git a/frontend/src/app/text-message-template-submitted/[templateId]/page.tsx b/frontend/src/app/text-message-template-submitted/[templateId]/page.tsx
index 7f7af4e65..84336524a 100644
--- a/frontend/src/app/text-message-template-submitted/[templateId]/page.tsx
+++ b/frontend/src/app/text-message-template-submitted/[templateId]/page.tsx
@@ -3,7 +3,7 @@
 import { Metadata } from 'next';
 import { TemplateSubmitted } from '@molecules/TemplateSubmitted/TemplateSubmitted';
 import {
-  TemplateSubmittedPageProps,
+  TemplatePageProps,
   validateSubmittedSMSTemplate,
 } from 'nhs-notify-web-template-management-utils';
 import { getTemplate } from '@utils/form-actions';
@@ -18,7 +18,7 @@ export async function generateMetadata(): Promise<Metadata> {
   };
 }
 
-const SmsTemplateSubmittedPage = async (props: TemplateSubmittedPageProps) => {
+const SmsTemplateSubmittedPage = async (props: TemplatePageProps) => {
   const { templateId } = await props.params;
 
   const template = await getTemplate(templateId);
diff --git a/frontend/src/components/forms/ChooseChannelTemplate/ChooseChannelTemplate.tsx b/frontend/src/components/forms/ChooseChannelTemplate/ChooseChannelTemplate.tsx
index 817527461..d768636f6 100644
--- a/frontend/src/components/forms/ChooseChannelTemplate/ChooseChannelTemplate.tsx
+++ b/frontend/src/components/forms/ChooseChannelTemplate/ChooseChannelTemplate.tsx
@@ -22,7 +22,8 @@ import classNames from 'classnames';
 const content = baseContent.components.chooseChannelTemplate;
 
 export function ChooseChannelTemplate(props: ChooseChannelTemplateProps) {
-  const { messagePlan, pageHeading, templateList, cascadeIndex } = props;
+  const { messagePlan, pageHeading, templateList, cascadeIndex, lockNumber } =
+    props;
 
   const [state, action] = useActionState(chooseChannelTemplateAction, {
     ...props,
@@ -54,6 +55,12 @@ export function ChooseChannelTemplate(props: ChooseChannelTemplateProps) {
             formId={'choose-channel-template'}
             formAttributes={{ onSubmit: formValidate }}
           >
+            <input
+              type='hidden'
+              name='lockNumber'
+              value={lockNumber}
+              readOnly
+            />
             {selectedTemplateId && (
               <SummaryList data-testid='previous-selection-summary'>
                 <SummaryList.Row>
diff --git a/frontend/src/components/forms/ChooseChannelTemplate/choose-channel-template.types.ts b/frontend/src/components/forms/ChooseChannelTemplate/choose-channel-template.types.ts
index 5efdcce99..4f0e5a206 100644
--- a/frontend/src/components/forms/ChooseChannelTemplate/choose-channel-template.types.ts
+++ b/frontend/src/components/forms/ChooseChannelTemplate/choose-channel-template.types.ts
@@ -5,4 +5,5 @@ export type ChooseChannelTemplateProps = {
   pageHeading: string;
   templateList: TemplateDto[];
   cascadeIndex: number;
+  lockNumber: number;
 };
diff --git a/frontend/src/components/forms/ChooseChannelTemplate/server-action.ts b/frontend/src/components/forms/ChooseChannelTemplate/server-action.ts
index 03f980501..8a5303407 100644
--- a/frontend/src/components/forms/ChooseChannelTemplate/server-action.ts
+++ b/frontend/src/components/forms/ChooseChannelTemplate/server-action.ts
@@ -3,15 +3,20 @@ import { FormState } from 'nhs-notify-web-template-management-utils';
 import { z } from 'zod';
 import { updateRoutingConfig } from '@utils/message-plans';
 import { ChooseChannelTemplateProps } from './choose-channel-template.types';
+import { $LockNumber } from 'nhs-notify-backend-client';
 
 export type ChooseChannelTemplateFormState = FormState &
-  ChooseChannelTemplateProps;
+  Pick<
+    ChooseChannelTemplateProps,
+    'cascadeIndex' | 'messagePlan' | 'pageHeading' | 'templateList'
+  >;
 
 export const $ChooseChannelTemplate = (errorMessage: string) =>
   z.object({
     channelTemplate: z.string({
       message: errorMessage,
     }),
+    lockNumber: $LockNumber,
   });
 
 export async function chooseChannelTemplateAction(
@@ -50,10 +55,14 @@ export async function chooseChannelTemplateAction(
       : item
   );
 
-  await updateRoutingConfig(messagePlan.id, {
-    cascade: newCascade,
-    cascadeGroupOverrides: messagePlan.cascadeGroupOverrides,
-  });
+  await updateRoutingConfig(
+    messagePlan.id,
+    {
+      cascade: newCascade,
+      cascadeGroupOverrides: messagePlan.cascadeGroupOverrides,
+    },
+    parsedForm.data.lockNumber
+  );
 
   redirect(
     `/message-plans/choose-templates/${messagePlan.id}`,
diff --git a/frontend/src/components/forms/PreviewEmailTemplate/server-actions.ts b/frontend/src/components/forms/PreviewEmailTemplate/server-actions.ts
index ae17617d4..226b955cf 100644
--- a/frontend/src/components/forms/PreviewEmailTemplate/server-actions.ts
+++ b/frontend/src/components/forms/PreviewEmailTemplate/server-actions.ts
@@ -39,7 +39,7 @@ export async function previewEmailTemplateAction(
 
   if (data.previewEmailTemplateAction === 'email-submit') {
     return redirect(
-      `/submit-email-template/${formState.id}`,
+      `/submit-email-template/${formState.id}?lockNumber=${formState.lockNumber}`,
       RedirectType.push
     );
   }
diff --git a/frontend/src/components/forms/PreviewNHSAppTemplate/server-action.ts b/frontend/src/components/forms/PreviewNHSAppTemplate/server-action.ts
index 42aaa8798..f5a323783 100644
--- a/frontend/src/components/forms/PreviewNHSAppTemplate/server-action.ts
+++ b/frontend/src/components/forms/PreviewNHSAppTemplate/server-action.ts
@@ -12,11 +12,17 @@ const {
   },
 } = content;
 
-const radioSelectionToPageMap: Record<'nhsapp-edit' | 'nhsapp-submit', string> =
-  {
-    'nhsapp-edit': 'edit-nhs-app-template',
-    'nhsapp-submit': 'submit-nhs-app-template',
-  };
+function radioSelectionToRedirectUrl(
+  selection: 'nhsapp-edit' | 'nhsapp-submit',
+  id: string,
+  lockNumber: number
+) {
+  if (selection === 'nhsapp-edit') {
+    return `/edit-nhs-app-template/${id}`;
+  }
+
+  return `/submit-nhs-app-template/${id}?lockNumber=${lockNumber}`;
+}
 
 export const schema = z.object({
   previewNHSAppTemplateAction: z.enum(['nhsapp-edit', 'nhsapp-submit'], {
@@ -38,10 +44,12 @@ export function previewNhsAppTemplateAction(
     };
   }
 
-  const page =
-    radioSelectionToPageMap[
-      validationResponse.data.previewNHSAppTemplateAction
-    ];
-
-  return redirect(`/${page}/${formState.id}`, RedirectType.push);
+  return redirect(
+    radioSelectionToRedirectUrl(
+      validationResponse.data.previewNHSAppTemplateAction,
+      formState.id,
+      formState.lockNumber
+    ),
+    RedirectType.push
+  );
 }
diff --git a/frontend/src/components/forms/PreviewSMSTemplate/server-actions.ts b/frontend/src/components/forms/PreviewSMSTemplate/server-actions.ts
index efb80ed7a..fab071047 100644
--- a/frontend/src/components/forms/PreviewSMSTemplate/server-actions.ts
+++ b/frontend/src/components/forms/PreviewSMSTemplate/server-actions.ts
@@ -42,7 +42,7 @@ export async function previewSmsTemplateAction(
 
   if (data.previewSMSTemplateAction === 'sms-submit') {
     return redirect(
-      `/submit-text-message-template/${formState.id}`,
+      `/submit-text-message-template/${formState.id}?lockNumber=${formState.lockNumber}`,
       RedirectType.push
     );
   }
diff --git a/frontend/src/components/molecules/MessagePlanBlock/MessagePlanBlock.tsx b/frontend/src/components/molecules/MessagePlanBlock/MessagePlanBlock.tsx
index 72f989d79..b4ad8cbef 100644
--- a/frontend/src/components/molecules/MessagePlanBlock/MessagePlanBlock.tsx
+++ b/frontend/src/components/molecules/MessagePlanBlock/MessagePlanBlock.tsx
@@ -17,11 +17,13 @@ export function MessagePlanBlock({
   channelItem,
   template,
   routingConfigId,
+  lockNumber,
 }: {
   index: number;
   channelItem: CascadeItem;
   template?: TemplateDto;
   routingConfigId: RoutingConfig['id'];
+  lockNumber: number;
 }) {
   return (
     <li
@@ -40,6 +42,7 @@ export function MessagePlanBlock({
         template={template}
         required={true}
         routingConfigId={routingConfigId}
+        lockNumber={lockNumber}
       />
     </li>
   );
diff --git a/frontend/src/components/molecules/MessagePlanChannelTemplate/MessagePlanChannelTemplate.tsx b/frontend/src/components/molecules/MessagePlanChannelTemplate/MessagePlanChannelTemplate.tsx
index 99e54dc81..1a7f34f83 100644
--- a/frontend/src/components/molecules/MessagePlanChannelTemplate/MessagePlanChannelTemplate.tsx
+++ b/frontend/src/components/molecules/MessagePlanChannelTemplate/MessagePlanChannelTemplate.tsx
@@ -17,10 +17,12 @@ export function MessagePlanChannelTemplate({
   channel,
   template,
   routingConfigId,
+  lockNumber,
   required = true,
 }: {
   channel: Channel;
   routingConfigId: RoutingConfig['id'];
+  lockNumber: number;
   template?: TemplateDto;
   required?: boolean;
 }) {
@@ -47,7 +49,7 @@ export function MessagePlanChannelTemplate({
               <Link
                 data-testid={`choose-template-link-${channel}`}
                 className='nhsuk-link nhsuk-link--no-visited-state'
-                href={`/message-plans/${messagePlanChooseTemplateUrl(channelToTemplateType(channel))}/${routingConfigId}`}
+                href={`/message-plans/${messagePlanChooseTemplateUrl(channelToTemplateType(channel))}/${routingConfigId}?lockNumber=${lockNumber}`}
               >
                 {content.templateLinks.choose}
                 <span className='nhsuk-u-visually-hidden'>
@@ -64,7 +66,7 @@ export function MessagePlanChannelTemplate({
                 <Link
                   data-testid={`change-template-link-${channel}`}
                   className='nhsuk-link nhsuk-link--no-visited-state'
-                  href={`/message-plans/${messagePlanChooseTemplateUrl(channelToTemplateType(channel))}/${routingConfigId}`}
+                  href={`/message-plans/${messagePlanChooseTemplateUrl(channelToTemplateType(channel))}/${routingConfigId}?lockNumber=${lockNumber}`}
                 >
                   {content.templateLinks.change}
                   <span className='nhsuk-u-visually-hidden'>
@@ -75,11 +77,23 @@ export function MessagePlanChannelTemplate({
               </li>
               <li>
                 <form>
-                  <input type='hidden' name='channel' value={channel} />
+                  <input
+                    type='hidden'
+                    name='channel'
+                    value={channel}
+                    readOnly
+                  />
                   <input
                     type='hidden'
                     name='routingConfigId'
                     value={routingConfigId}
+                    readOnly
+                  />
+                  <input
+                    type='hidden'
+                    name='lockNumber'
+                    value={lockNumber}
+                    readOnly
                   />
                   <button
                     data-testid={`remove-template-link-${channel}`}
diff --git a/frontend/src/components/organisms/MessagePlanChannelList/MessagePlanChannelList.tsx b/frontend/src/components/organisms/MessagePlanChannelList/MessagePlanChannelList.tsx
index cb06a9e4f..05dcb3dd2 100644
--- a/frontend/src/components/organisms/MessagePlanChannelList/MessagePlanChannelList.tsx
+++ b/frontend/src/components/organisms/MessagePlanChannelList/MessagePlanChannelList.tsx
@@ -36,6 +36,7 @@ export function MessagePlanChannelList({
                 messagePlanChannel.defaultTemplateId
               )}
               routingConfigId={messagePlan.id}
+              lockNumber={messagePlan.lockNumber}
             />
             {/* Show fallback conditions only if there is more than one channel, and not for the last channel */}
             {/* TODO: CCM-11494 Update this logic for letter formats */}
diff --git a/frontend/src/components/organisms/PreviewLetterTemplate/PreviewLetterTemplate.tsx b/frontend/src/components/organisms/PreviewLetterTemplate/PreviewLetterTemplate.tsx
index cbf901767..4fb90dcd4 100644
--- a/frontend/src/components/organisms/PreviewLetterTemplate/PreviewLetterTemplate.tsx
+++ b/frontend/src/components/organisms/PreviewLetterTemplate/PreviewLetterTemplate.tsx
@@ -40,15 +40,15 @@ export function PreviewLetterTemplate({
   const buttonMap: Record<string, ButtonDetails> = {
     NOT_YET_SUBMITTED: {
       text: submitText,
-      href: `${basePath}/submit-letter-template/${template.id}`,
+      href: `${basePath}/submit-letter-template/${template.id}?lockNumber=${template.lockNumber}`,
     },
     PROOF_AVAILABLE: {
       text: routing ? approveProofText : submitText,
-      href: `${basePath}/submit-letter-template/${template.id}`,
+      href: `${basePath}/submit-letter-template/${template.id}?lockNumber=${template.lockNumber}`,
     },
     PENDING_PROOF_REQUEST: {
       text: requestProofText,
-      href: `${basePath}/request-proof-of-template/${template.id}`,
+      href: `${basePath}/request-proof-of-template/${template.id}?lockNumber=${template.lockNumber}`,
     },
   } satisfies Partial<Record<TemplateStatus, ButtonDetails>>;
 
diff --git a/frontend/src/utils/get-message-plan-template-ids.ts b/frontend/src/utils/get-message-plan-template-ids.ts
index a83ce4fa5..972ebc1fa 100644
--- a/frontend/src/utils/get-message-plan-template-ids.ts
+++ b/frontend/src/utils/get-message-plan-template-ids.ts
@@ -4,7 +4,7 @@ import { RoutingConfig } from 'nhs-notify-backend-client';
  * Extracts all template IDs from a RoutingConfig
  */
 export function getMessagePlanTemplateIds(
-  messagePlan: RoutingConfig
+  messagePlan: Pick<RoutingConfig, 'cascade'>
 ): Set<string> {
   const templateIds = new Set<string>();
 
diff --git a/frontend/src/utils/message-plans.ts b/frontend/src/utils/message-plans.ts
index 4bed922d0..d0676a4d5 100644
--- a/frontend/src/utils/message-plans.ts
+++ b/frontend/src/utils/message-plans.ts
@@ -118,7 +118,8 @@ export async function createRoutingConfig(
 
 export async function updateRoutingConfig(
   routingConfigId: string,
-  updatedRoutingConfig: UpdateRoutingConfig
+  updatedRoutingConfig: UpdateRoutingConfig,
+  lockNumber: number
 ): Promise<RoutingConfig | undefined> {
   const { accessToken } = await getSessionServer();
 
@@ -129,7 +130,8 @@ export async function updateRoutingConfig(
   const { data, error } = await routingConfigurationApiClient.update(
     accessToken,
     routingConfigId,
-    updatedRoutingConfig
+    updatedRoutingConfig,
+    lockNumber
   );
 
   if (error) {
diff --git a/infrastructure/terraform/modules/backend-api/spec.tmpl.json b/infrastructure/terraform/modules/backend-api/spec.tmpl.json
index 0b592a070..6f3c7ed8c 100644
--- a/infrastructure/terraform/modules/backend-api/spec.tmpl.json
+++ b/infrastructure/terraform/modules/backend-api/spec.tmpl.json
@@ -668,6 +668,9 @@
             "format": "uuid",
             "type": "string"
           },
+          "lockNumber": {
+            "type": "integer"
+          },
           "name": {
             "type": "string"
           },
@@ -687,6 +690,7 @@
           "defaultCascadeGroup",
           "createdAt",
           "id",
+          "lockNumber",
           "name",
           "status",
           "updatedAt"
@@ -1185,6 +1189,15 @@
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "description": "Lock number of the current version of the routing configuration",
+            "in": "header",
+            "name": "X-Lock-Number",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
           }
         ],
         "responses": {
@@ -1286,7 +1299,7 @@
           "uri": "arn:aws:apigateway:${AWS_REGION}:lambda:path/2015-03-31/functions/${GET_ROUTING_CONFIG_LAMBDA_ARN}/invocations"
         }
       },
-      "put": {
+      "patch": {
         "description": "Update a routing configuration by Id",
         "parameters": [
           {
@@ -1297,6 +1310,15 @@
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "description": "Lock number of the current version of the routing configuration",
+            "in": "header",
+            "name": "X-Lock-Number",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
           }
         ],
         "requestBody": {
@@ -1373,6 +1395,15 @@
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "description": "Lock number of the current version of the routing configuration",
+            "in": "header",
+            "name": "X-Lock-Number",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
           }
         ],
         "responses": {
diff --git a/lambdas/backend-api/README.md b/lambdas/backend-api/README.md
index a5c48da9c..ed081b107 100644
--- a/lambdas/backend-api/README.md
+++ b/lambdas/backend-api/README.md
@@ -185,13 +185,14 @@ curl -X POST --location "${APIG_STAGE}/v1/routing-configuration" \
 }'
 ```
 
-### PUT - /v1/routing-configuration/:routingConfigId - Update a routing configuration
+### PATCH - /v1/routing-configuration/:routingConfigId - Update a routing configuration
 
 ```bash
-curl -X PUT --location "${APIG_STAGE}/v1/routing-configuration/${ROUTING_CONFIG_ID}" \
+curl -X PATCH --location "${APIG_STAGE}/v1/routing-configuration/${ROUTING_CONFIG_ID}" \
 --header 'Content-Type: application/json' \
 --header 'Accept: application/json' \
 --header "Authorization: $SANDBOX_TOKEN" \
+--header "X-Lock-Number: $CURRENT_LOCK_NUMBER" \
 --data '{
   "campaignId": "campaign",
   "cascade": [{
@@ -210,7 +211,8 @@ curl -X PUT --location "${APIG_STAGE}/v1/routing-configuration/${ROUTING_CONFIG_
 ```bash
 curl -X PATCH --location "${APIG_STAGE}/v1/routing-configuration/${ROUTING_CONFIG_ID}/submit" \
 --header 'Accept: application/json' \
---header "Authorization: $SANDBOX_TOKEN"
+--header "Authorization: $SANDBOX_TOKEN" \
+--header "X-Lock-Number: $CURRENT_LOCK_NUMBER"
 ```
 
 ### DELETE - /v1/routing-configuration/:routingConfigId - Delete a routing configuration
@@ -219,6 +221,7 @@ curl -X PATCH --location "${APIG_STAGE}/v1/routing-configuration/${ROUTING_CONFI
 curl -X DELETE --location "${APIG_STAGE}/v1/routing-configuration/${ROUTING_CONFIG_ID}" \
 --header 'Accept: application/json' \
 --header "Authorization: $SANDBOX_TOKEN"
+--header "X-Lock-Number: $CURRENT_LOCK_NUMBER"
 ```
 
 <!-- vale on -->
diff --git a/lambdas/backend-api/src/__tests__/api/create-routing-config.test.ts b/lambdas/backend-api/src/__tests__/api/create-routing-config.test.ts
index f0cbbcc70..ed8d95c2b 100644
--- a/lambdas/backend-api/src/__tests__/api/create-routing-config.test.ts
+++ b/lambdas/backend-api/src/__tests__/api/create-routing-config.test.ts
@@ -146,6 +146,7 @@ describe('Create Routing Config Handler', () => {
       createdAt: new Date().toISOString(),
       updatedAt: new Date().toISOString(),
       clientId: 'nhs-notify-client-id',
+      lockNumber: 0,
       defaultCascadeGroup: 'standard',
     };
 
diff --git a/lambdas/backend-api/src/__tests__/api/delete-routing-config.test.ts b/lambdas/backend-api/src/__tests__/api/delete-routing-config.test.ts
index f0df14b73..3e537c189 100644
--- a/lambdas/backend-api/src/__tests__/api/delete-routing-config.test.ts
+++ b/lambdas/backend-api/src/__tests__/api/delete-routing-config.test.ts
@@ -26,6 +26,9 @@ describe('Delete Routing Config Handler', () => {
       const event = mock<APIGatewayProxyEvent>({
         requestContext: { authorizer: ctx },
         pathParameters: { templateId: 'id' },
+        headers: {
+          'X-Lock-Number': '0',
+        },
       });
 
       const result = await handler(event, mock<Context>(), jest.fn());
@@ -53,6 +56,9 @@ describe('Delete Routing Config Handler', () => {
       },
       body: JSON.stringify({ name: 'test' }),
       pathParameters: { routingConfigId: undefined },
+      headers: {
+        'X-Lock-Number': '0',
+      },
     });
 
     const result = await handler(event, mock<Context>(), jest.fn());
@@ -87,6 +93,9 @@ describe('Delete Routing Config Handler', () => {
         authorizer: { user: 'sub', clientId: 'nhs-notify-client-id' },
       },
       pathParameters: { routingConfigId: '1-2-3' },
+      headers: {
+        'X-Lock-Number': '0',
+      },
     });
 
     const result = await handler(event, mock<Context>(), jest.fn());
@@ -104,7 +113,8 @@ describe('Delete Routing Config Handler', () => {
       {
         userId: 'sub',
         clientId: 'nhs-notify-client-id',
-      }
+      },
+      '0'
     );
   });
 
@@ -120,6 +130,9 @@ describe('Delete Routing Config Handler', () => {
         authorizer: { user: 'sub', clientId: 'nhs-notify-client-id' },
       },
       pathParameters: { routingConfigId: '1-2-3' },
+      headers: {
+        'X-Lock-Number': '0',
+      },
     });
 
     const result = await handler(event, mock<Context>(), jest.fn());
@@ -134,7 +147,47 @@ describe('Delete Routing Config Handler', () => {
       {
         userId: 'sub',
         clientId: 'nhs-notify-client-id',
-      }
+      },
+      '0'
+    );
+  });
+
+  test('coerces missing lock number header to empty string', async () => {
+    const { handler, mocks } = setup();
+
+    mocks.routingConfigClient.deleteRoutingConfig.mockResolvedValueOnce({
+      error: {
+        errorMeta: {
+          code: 409,
+          description:
+            'Lock number mismatch - Message Plan has been modified since last read',
+        },
+      },
+    });
+
+    const event = mock<APIGatewayProxyEvent>({
+      requestContext: {
+        authorizer: { user: 'sub', clientId: 'nhs-notify-client-id' },
+      },
+      pathParameters: { routingConfigId: '1-2-3' },
+      headers: {},
+    });
+
+    const result = await handler(event, mock<Context>(), jest.fn());
+
+    expect(result).toEqual({
+      statusCode: 409,
+      body: JSON.stringify({
+        statusCode: 409,
+        technicalMessage:
+          'Lock number mismatch - Message Plan has been modified since last read',
+      }),
+    });
+
+    expect(mocks.routingConfigClient.deleteRoutingConfig).toHaveBeenCalledWith(
+      '1-2-3',
+      { userId: 'sub', clientId: 'nhs-notify-client-id' },
+      ''
     );
   });
 });
diff --git a/lambdas/backend-api/src/__tests__/api/delete.test.ts b/lambdas/backend-api/src/__tests__/api/delete.test.ts
index 7f544583a..b65b97b66 100644
--- a/lambdas/backend-api/src/__tests__/api/delete.test.ts
+++ b/lambdas/backend-api/src/__tests__/api/delete.test.ts
@@ -152,7 +152,13 @@ describe('Template API - Delete', () => {
     const { handler, mocks } = setup();
 
     mocks.templateClient.deleteTemplate.mockResolvedValueOnce({
-      error: { errorMeta: { code: 409, description: 'Invalid lock number' } },
+      error: {
+        errorMeta: {
+          code: 409,
+          description:
+            'Lock number mismatch - Template has been modified since last read',
+        },
+      },
     });
 
     const event = mock<APIGatewayProxyEvent>({
@@ -160,6 +166,7 @@ describe('Template API - Delete', () => {
         authorizer: { user: 'sub', clientId: 'nhs-notify-client-id' },
       },
       pathParameters: { templateId: '1-2-3' },
+      headers: {},
     });
 
     const result = await handler(event, mock<Context>(), jest.fn());
@@ -168,7 +175,8 @@ describe('Template API - Delete', () => {
       statusCode: 409,
       body: JSON.stringify({
         statusCode: 409,
-        technicalMessage: 'Invalid lock number',
+        technicalMessage:
+          'Lock number mismatch - Template has been modified since last read',
       }),
     });
 
diff --git a/lambdas/backend-api/src/__tests__/api/proof.test.ts b/lambdas/backend-api/src/__tests__/api/proof.test.ts
index f1d9d2833..fb0f5a4de 100644
--- a/lambdas/backend-api/src/__tests__/api/proof.test.ts
+++ b/lambdas/backend-api/src/__tests__/api/proof.test.ts
@@ -112,7 +112,8 @@ describe('Template API - request proof', () => {
       error: {
         errorMeta: {
           code: 409,
-          description: 'Invalid lock number',
+          description:
+            'Lock number mismatch - Template has been modified since last read',
         },
       },
     });
@@ -122,6 +123,7 @@ describe('Template API - request proof', () => {
         authorizer: { user: 'sub', clientId: 'nhs-notify-client-id' },
       },
       pathParameters: { templateId: 'template-id' },
+      headers: {},
     });
 
     const result = await handler(event, mock<Context>(), jest.fn());
@@ -130,7 +132,8 @@ describe('Template API - request proof', () => {
       statusCode: 409,
       body: JSON.stringify({
         statusCode: 409,
-        technicalMessage: 'Invalid lock number',
+        technicalMessage:
+          'Lock number mismatch - Template has been modified since last read',
       }),
     });
 
diff --git a/lambdas/backend-api/src/__tests__/api/submit-routing-config.test.ts b/lambdas/backend-api/src/__tests__/api/submit-routing-config.test.ts
index e1cafc81e..4e57baa5b 100644
--- a/lambdas/backend-api/src/__tests__/api/submit-routing-config.test.ts
+++ b/lambdas/backend-api/src/__tests__/api/submit-routing-config.test.ts
@@ -28,6 +28,9 @@ describe('Submit Routing Config Handler', () => {
       const event = mock<APIGatewayProxyEvent>({
         requestContext: { authorizer: ctx },
         pathParameters: { templateId: 'id' },
+        headers: {
+          'X-Lock-Number': '0',
+        },
       });
 
       const result = await handler(event, mock<Context>(), jest.fn());
@@ -55,6 +58,9 @@ describe('Submit Routing Config Handler', () => {
       },
       body: JSON.stringify({ name: 'test' }),
       pathParameters: { routingConfigId: undefined },
+      headers: {
+        'X-Lock-Number': '0',
+      },
     });
 
     const result = await handler(event, mock<Context>(), jest.fn());
@@ -89,6 +95,9 @@ describe('Submit Routing Config Handler', () => {
         authorizer: { user: 'sub', clientId: 'nhs-notify-client-id' },
       },
       pathParameters: { routingConfigId: '1-2-3' },
+      headers: {
+        'X-Lock-Number': '0',
+      },
     });
 
     const result = await handler(event, mock<Context>(), jest.fn());
@@ -106,7 +115,8 @@ describe('Submit Routing Config Handler', () => {
       {
         userId: 'sub',
         clientId: 'nhs-notify-client-id',
-      }
+      },
+      '0'
     );
   });
 
@@ -124,6 +134,9 @@ describe('Submit Routing Config Handler', () => {
         authorizer: { user: 'sub', clientId: 'nhs-notify-client-id' },
       },
       pathParameters: { routingConfigId: '1-2-3' },
+      headers: {
+        'X-Lock-Number': '0',
+      },
     });
 
     const result = await handler(event, mock<Context>(), jest.fn());
@@ -138,7 +151,47 @@ describe('Submit Routing Config Handler', () => {
       {
         userId: 'sub',
         clientId: 'nhs-notify-client-id',
-      }
+      },
+      '0'
+    );
+  });
+
+  test('coerces missing lock number header to empty string', async () => {
+    const { handler, mocks } = setup();
+
+    mocks.routingConfigClient.submitRoutingConfig.mockResolvedValueOnce({
+      error: {
+        errorMeta: {
+          code: 409,
+          description:
+            'Lock number mismatch - Message Plan has been modified since last read',
+        },
+      },
+    });
+
+    const event = mock<APIGatewayProxyEvent>({
+      requestContext: {
+        authorizer: { user: 'sub', clientId: 'nhs-notify-client-id' },
+      },
+      pathParameters: { routingConfigId: '1-2-3' },
+      headers: {},
+    });
+
+    const result = await handler(event, mock<Context>(), jest.fn());
+
+    expect(result).toEqual({
+      statusCode: 409,
+      body: JSON.stringify({
+        statusCode: 409,
+        technicalMessage:
+          'Lock number mismatch - Message Plan has been modified since last read',
+      }),
+    });
+
+    expect(mocks.routingConfigClient.submitRoutingConfig).toHaveBeenCalledWith(
+      '1-2-3',
+      { userId: 'sub', clientId: 'nhs-notify-client-id' },
+      ''
     );
   });
 });
diff --git a/lambdas/backend-api/src/__tests__/api/submit.test.ts b/lambdas/backend-api/src/__tests__/api/submit.test.ts
index 3bf6ad637..02aa7b420 100644
--- a/lambdas/backend-api/src/__tests__/api/submit.test.ts
+++ b/lambdas/backend-api/src/__tests__/api/submit.test.ts
@@ -118,7 +118,8 @@ describe('Template API - Submit', () => {
       error: {
         errorMeta: {
           code: 409,
-          description: 'Invalid lock number',
+          description:
+            'Lock number mismatch - Template has been modified since last read',
         },
       },
     });
@@ -128,6 +129,7 @@ describe('Template API - Submit', () => {
         authorizer: { user: 'sub', clientId: 'nhs-notify-client-id' },
       },
       pathParameters: { templateId: '1-2-3' },
+      headers: {},
     });
 
     const result = await handler(event, mock<Context>(), jest.fn());
@@ -136,7 +138,8 @@ describe('Template API - Submit', () => {
       statusCode: 409,
       body: JSON.stringify({
         statusCode: 409,
-        technicalMessage: 'Invalid lock number',
+        technicalMessage:
+          'Lock number mismatch - Template has been modified since last read',
       }),
     });
 
diff --git a/lambdas/backend-api/src/__tests__/api/update-routing-config.test.ts b/lambdas/backend-api/src/__tests__/api/update-routing-config.test.ts
index 1b7b6831f..c62e05924 100644
--- a/lambdas/backend-api/src/__tests__/api/update-routing-config.test.ts
+++ b/lambdas/backend-api/src/__tests__/api/update-routing-config.test.ts
@@ -31,6 +31,9 @@ describe('Update Routing Config Handler', () => {
       const event = mock<APIGatewayProxyEvent>({
         requestContext: { authorizer: ctx },
         pathParameters: { templateId: 'id' },
+        headers: {
+          'X-Lock-Number': '0',
+        },
       });
 
       const result = await handler(event, mock<Context>(), jest.fn());
@@ -58,6 +61,9 @@ describe('Update Routing Config Handler', () => {
       },
       body: JSON.stringify({ name: 'test' }),
       pathParameters: { routingConfigId: undefined },
+      headers: {
+        'X-Lock-Number': '0',
+      },
     });
 
     const result = await handler(event, mock<Context>(), jest.fn());
@@ -84,6 +90,9 @@ describe('Update Routing Config Handler', () => {
       },
       body: undefined,
       pathParameters: { routingConfigId: 'id' },
+      headers: {
+        'X-Lock-Number': '0',
+      },
     });
 
     mocks.routingConfigClient.updateRoutingConfig.mockResolvedValueOnce({
@@ -111,7 +120,8 @@ describe('Update Routing Config Handler', () => {
       {
         userId: 'sub',
         clientId: 'nhs-notify-client-id',
-      }
+      },
+      '0'
     );
   });
 
@@ -147,6 +157,9 @@ describe('Update Routing Config Handler', () => {
       },
       body: JSON.stringify(update),
       pathParameters: { routingConfigId: '1-2-3' },
+      headers: {
+        'X-Lock-Number': '0',
+      },
     });
 
     const result = await handler(event, mock<Context>(), jest.fn());
@@ -165,7 +178,8 @@ describe('Update Routing Config Handler', () => {
       {
         userId: 'sub',
         clientId: 'nhs-notify-client-id',
-      }
+      },
+      '0'
     );
   });
 
@@ -198,6 +212,9 @@ describe('Update Routing Config Handler', () => {
       },
       body: JSON.stringify(update),
       pathParameters: { routingConfigId: '1-2-3' },
+      headers: {
+        'X-Lock-Number': '0',
+      },
     });
 
     const result = await handler(event, mock<Context>(), jest.fn());
@@ -213,7 +230,53 @@ describe('Update Routing Config Handler', () => {
       {
         userId: 'sub',
         clientId: 'nhs-notify-client-id',
-      }
+      },
+      '0'
+    );
+  });
+
+  test('coerces missing lock number header to empty string', async () => {
+    const { handler, mocks } = setup();
+
+    mocks.routingConfigClient.updateRoutingConfig.mockResolvedValueOnce({
+      error: {
+        errorMeta: {
+          code: 409,
+          description:
+            'Lock number mismatch - Message Plan has been modified since last read',
+        },
+      },
+    });
+
+    const update: UpdateRoutingConfig = {
+      name: 'new name',
+    };
+
+    const event = mock<APIGatewayProxyEvent>({
+      requestContext: {
+        authorizer: { user: 'sub', clientId: 'nhs-notify-client-id' },
+      },
+      body: JSON.stringify(update),
+      pathParameters: { routingConfigId: '1-2-3' },
+      headers: {},
+    });
+
+    const result = await handler(event, mock<Context>(), jest.fn());
+
+    expect(result).toEqual({
+      statusCode: 409,
+      body: JSON.stringify({
+        statusCode: 409,
+        technicalMessage:
+          'Lock number mismatch - Message Plan has been modified since last read',
+      }),
+    });
+
+    expect(mocks.routingConfigClient.updateRoutingConfig).toHaveBeenCalledWith(
+      '1-2-3',
+      update,
+      { userId: 'sub', clientId: 'nhs-notify-client-id' },
+      ''
     );
   });
 });
diff --git a/lambdas/backend-api/src/__tests__/api/update.test.ts b/lambdas/backend-api/src/__tests__/api/update.test.ts
index 2703a66db..d57aadcc1 100644
--- a/lambdas/backend-api/src/__tests__/api/update.test.ts
+++ b/lambdas/backend-api/src/__tests__/api/update.test.ts
@@ -246,7 +246,13 @@ describe('Template API - Update', () => {
     };
 
     mocks.templateClient.updateTemplate.mockResolvedValueOnce({
-      error: { errorMeta: { code: 409, description: 'Invalid lock number' } },
+      error: {
+        errorMeta: {
+          code: 409,
+          description:
+            'Lock number mismatch - Template has been modified since last read',
+        },
+      },
     });
 
     const event = mock<APIGatewayProxyEvent>({
@@ -255,6 +261,7 @@ describe('Template API - Update', () => {
       },
       body: JSON.stringify(update),
       pathParameters: { templateId: '1-2-3' },
+      headers: {},
     });
 
     const result = await handler(event, mock<Context>(), jest.fn());
@@ -263,7 +270,8 @@ describe('Template API - Update', () => {
       statusCode: 409,
       body: JSON.stringify({
         statusCode: 409,
-        technicalMessage: 'Invalid lock number',
+        technicalMessage:
+          'Lock number mismatch - Template has been modified since last read',
       }),
     });
 
diff --git a/lambdas/backend-api/src/__tests__/app/routing-config-client.test.ts b/lambdas/backend-api/src/__tests__/app/routing-config-client.test.ts
index e93cef558..35dc780e8 100644
--- a/lambdas/backend-api/src/__tests__/app/routing-config-client.test.ts
+++ b/lambdas/backend-api/src/__tests__/app/routing-config-client.test.ts
@@ -274,6 +274,7 @@ describe('RoutingConfigClient', () => {
         id: 'id',
         status: 'DRAFT',
         updatedAt: date.toISOString(),
+        lockNumber: 0,
       };
 
       mocks.clientConfigRepository.get.mockResolvedValueOnce({
@@ -522,11 +523,12 @@ describe('RoutingConfigClient', () => {
         data: completed,
       });
 
-      const result = await client.submitRoutingConfig(id, user);
+      const result = await client.submitRoutingConfig(id, user, '42');
 
       expect(mocks.routingConfigRepository.submit).toHaveBeenCalledWith(
         id,
-        user
+        user,
+        42
       );
 
       expect(result).toEqual({
@@ -546,7 +548,7 @@ describe('RoutingConfigClient', () => {
         },
       });
 
-      const result = await client.submitRoutingConfig('some-id', user);
+      const result = await client.submitRoutingConfig('some-id', user, '42');
 
       expect(mocks.routingConfigRepository.submit).not.toHaveBeenCalled();
 
@@ -567,7 +569,7 @@ describe('RoutingConfigClient', () => {
         data: { features: { routing: false } },
       });
 
-      const result = await client.submitRoutingConfig('some-id', user);
+      const result = await client.submitRoutingConfig('some-id', user, '42');
 
       expect(mocks.routingConfigRepository.submit).not.toHaveBeenCalled();
 
@@ -580,6 +582,28 @@ describe('RoutingConfigClient', () => {
         },
       });
     });
+
+    test('returns conflict error when lock number is invalid', async () => {
+      const { client, mocks } = setup();
+
+      const result = await client.submitRoutingConfig(
+        'some-id',
+        user,
+        'invalid-lock-number'
+      );
+
+      expect(mocks.routingConfigRepository.submit).not.toHaveBeenCalled();
+
+      expect(result).toEqual({
+        error: {
+          errorMeta: {
+            code: 409,
+            description:
+              'Lock number mismatch - Message Plan has been modified since last read',
+          },
+        },
+      });
+    });
   });
 
   describe('deleteRoutingConfig', () => {
@@ -601,11 +625,12 @@ describe('RoutingConfigClient', () => {
         data: deleted,
       });
 
-      const result = await client.deleteRoutingConfig(id, user);
+      const result = await client.deleteRoutingConfig(id, user, '42');
 
       expect(mocks.routingConfigRepository.delete).toHaveBeenCalledWith(
         id,
-        user
+        user,
+        42
       );
 
       expect(result).toEqual({
@@ -628,11 +653,12 @@ describe('RoutingConfigClient', () => {
 
       mocks.routingConfigRepository.delete.mockResolvedValueOnce(errorResponse);
 
-      const result = await client.deleteRoutingConfig(id, user);
+      const result = await client.deleteRoutingConfig(id, user, '42');
 
       expect(mocks.routingConfigRepository.delete).toHaveBeenCalledWith(
         id,
-        user
+        user,
+        42
       );
 
       expect(result).toEqual(errorResponse);
@@ -650,7 +676,7 @@ describe('RoutingConfigClient', () => {
         },
       });
 
-      const result = await client.deleteRoutingConfig('some-id', user);
+      const result = await client.deleteRoutingConfig('some-id', user, '42');
 
       expect(mocks.routingConfigRepository.delete).not.toHaveBeenCalled();
 
@@ -671,7 +697,7 @@ describe('RoutingConfigClient', () => {
         data: { features: { routing: false }, campaignIds: ['campaign'] },
       });
 
-      const result = await client.deleteRoutingConfig('some-id', user);
+      const result = await client.deleteRoutingConfig('some-id', user, '42');
 
       expect(mocks.routingConfigRepository.delete).not.toHaveBeenCalled();
 
@@ -684,6 +710,28 @@ describe('RoutingConfigClient', () => {
         },
       });
     });
+
+    test('returns conflict error when lock number is invalid', async () => {
+      const { client, mocks } = setup();
+
+      const result = await client.deleteRoutingConfig(
+        'some-id',
+        user,
+        'invalid-lock-number'
+      );
+
+      expect(mocks.routingConfigRepository.delete).not.toHaveBeenCalled();
+
+      expect(result).toEqual({
+        error: {
+          errorMeta: {
+            code: 409,
+            description:
+              'Lock number mismatch - Message Plan has been modified since last read',
+          },
+        },
+      });
+    });
   });
 
   describe('updateRoutingConfig', () => {
@@ -716,13 +764,15 @@ describe('RoutingConfigClient', () => {
       const result = await client.updateRoutingConfig(
         routingConfig.id,
         update,
-        user
+        user,
+        '42'
       );
 
       expect(mocks.routingConfigRepository.update).toHaveBeenCalledWith(
         routingConfig.id,
         update,
-        user
+        user,
+        42
       );
 
       expect(result).toEqual({
@@ -749,7 +799,8 @@ describe('RoutingConfigClient', () => {
       const result = await client.updateRoutingConfig(
         routingConfig.id,
         update,
-        user
+        user,
+        '42'
       );
 
       expect(mocks.routingConfigRepository.update).not.toHaveBeenCalled();
@@ -795,7 +846,8 @@ describe('RoutingConfigClient', () => {
       const result = await client.updateRoutingConfig(
         routingConfig.id,
         update,
-        user
+        user,
+        '42'
       );
 
       expect(mocks.routingConfigRepository.update).not.toHaveBeenCalled();
@@ -830,7 +882,8 @@ describe('RoutingConfigClient', () => {
       const result = await client.updateRoutingConfig(
         routingConfig.id,
         update,
-        user
+        user,
+        '42'
       );
 
       expect(mocks.routingConfigRepository.update).not.toHaveBeenCalled();
@@ -865,7 +918,8 @@ describe('RoutingConfigClient', () => {
       const result = await client.updateRoutingConfig(
         routingConfig.id,
         update,
-        user
+        user,
+        '42'
       );
 
       expect(mocks.routingConfigRepository.update).not.toHaveBeenCalled();
@@ -908,18 +962,51 @@ describe('RoutingConfigClient', () => {
       const result = await client.updateRoutingConfig(
         routingConfig.id,
         update,
-        user
+        user,
+        '42'
       );
 
       expect(mocks.routingConfigRepository.update).toHaveBeenCalledWith(
         routingConfig.id,
         update,
-        user
+        user,
+        42
       );
 
       expect(result).toEqual({
         data: updated,
       });
     });
+
+    test('returns conflict error when lock number is invalid', async () => {
+      const { client, mocks } = setup();
+
+      const update: UpdateRoutingConfig = {
+        campaignId: routingConfig.campaignId,
+        cascade: routingConfig.cascade,
+        cascadeGroupOverrides: routingConfig.cascadeGroupOverrides,
+        name: 'new name',
+      };
+
+      const result = await client.updateRoutingConfig(
+        routingConfig.id,
+        update,
+        user,
+        'invalid-lock-number'
+      );
+
+      expect(mocks.clientConfigRepository.get).not.toHaveBeenCalled();
+      expect(mocks.routingConfigRepository.update).not.toHaveBeenCalled();
+
+      expect(result).toEqual({
+        error: {
+          errorMeta: {
+            code: 409,
+            description:
+              'Lock number mismatch - Message Plan has been modified since last read',
+          },
+        },
+      });
+    });
   });
 });
diff --git a/lambdas/backend-api/src/__tests__/app/template-client.test.ts b/lambdas/backend-api/src/__tests__/app/template-client.test.ts
index 904ef0c7d..6bdb15bfa 100644
--- a/lambdas/backend-api/src/__tests__/app/template-client.test.ts
+++ b/lambdas/backend-api/src/__tests__/app/template-client.test.ts
@@ -1329,7 +1329,8 @@ describe('templateClient', () => {
             error: expect.objectContaining({
               errorMeta: {
                 code: 409,
-                description: 'Invalid lock number',
+                description:
+                  'Lock number mismatch - Template has been modified since last read',
               },
             }),
           });
@@ -1729,7 +1730,8 @@ describe('templateClient', () => {
         error: {
           errorMeta: {
             code: 409,
-            description: 'Invalid lock number',
+            description:
+              'Lock number mismatch - Template has been modified since last read',
           },
         },
       });
@@ -1853,7 +1855,8 @@ describe('templateClient', () => {
         error: {
           errorMeta: {
             code: 409,
-            description: 'Invalid lock number',
+            description:
+              'Lock number mismatch - Template has been modified since last read',
           },
         },
       });
@@ -2268,7 +2271,8 @@ describe('templateClient', () => {
             error: expect.objectContaining({
               errorMeta: {
                 code: 409,
-                description: 'Invalid lock number',
+                description:
+                  'Lock number mismatch - Template has been modified since last read',
               },
             }),
           });
diff --git a/lambdas/backend-api/src/__tests__/fixtures/routing-config.ts b/lambdas/backend-api/src/__tests__/fixtures/routing-config.ts
index ef237d7a7..a33ff518a 100644
--- a/lambdas/backend-api/src/__tests__/fixtures/routing-config.ts
+++ b/lambdas/backend-api/src/__tests__/fixtures/routing-config.ts
@@ -19,6 +19,7 @@ export const routingConfig: RoutingConfig = {
   name: 'Test config',
   createdAt: '2025-09-18T15:26:04.338Z',
   updatedAt: '2025-09-18T15:26:04.338Z',
+  lockNumber: 0,
 };
 
 export const makeRoutingConfig = (
diff --git a/lambdas/backend-api/src/__tests__/infra/routing-config-repository/repository.test.ts b/lambdas/backend-api/src/__tests__/infra/routing-config-repository/repository.test.ts
index 45690562a..f16f411ab 100644
--- a/lambdas/backend-api/src/__tests__/infra/routing-config-repository/repository.test.ts
+++ b/lambdas/backend-api/src/__tests__/infra/routing-config-repository/repository.test.ts
@@ -158,6 +158,7 @@ describe('RoutingConfigRepository', () => {
       id: generatedId,
       status: 'DRAFT',
       updatedAt: date.toISOString(),
+      lockNumber: 0,
     };
 
     const putPayload = {
@@ -240,19 +241,23 @@ describe('RoutingConfigRepository', () => {
 
       mocks.dynamo.on(UpdateCommand).resolves({ Attributes: completed });
 
-      const result = await repo.submit(routingConfig.id, user);
+      const result = await repo.submit(routingConfig.id, user, 2);
 
       expect(result).toEqual({ data: completed });
 
       expect(mocks.dynamo).toHaveReceivedCommandWith(UpdateCommand, {
-        ConditionExpression: '#status = :condition_1_status',
+        ConditionExpression:
+          '#status = :condition_1_status AND #lockNumber = :condition_2_lockNumber',
         ExpressionAttributeNames: {
           '#status': 'status',
           '#updatedAt': 'updatedAt',
           '#updatedBy': 'updatedBy',
+          '#lockNumber': 'lockNumber',
         },
         ExpressionAttributeValues: {
           ':condition_1_status': 'DRAFT',
+          ':condition_2_lockNumber': 2,
+          ':lockNumber': 1,
           ':status': 'COMPLETED',
           ':updatedAt': date.toISOString(),
           ':updatedBy': user.userId,
@@ -264,7 +269,7 @@ describe('RoutingConfigRepository', () => {
         ReturnValues: 'ALL_NEW',
         TableName: TABLE_NAME,
         UpdateExpression:
-          'SET #status = :status, #updatedAt = :updatedAt, #updatedBy = :updatedBy',
+          'SET #status = :status, #updatedAt = :updatedAt, #updatedBy = :updatedBy ADD #lockNumber :lockNumber',
       });
     });
 
@@ -275,7 +280,7 @@ describe('RoutingConfigRepository', () => {
 
       mocks.dynamo.on(UpdateCommand).rejects(err);
 
-      const result = await repo.submit(routingConfig.id, user);
+      const result = await repo.submit(routingConfig.id, user, 2);
 
       expect(result).toEqual({
         error: {
@@ -299,7 +304,7 @@ describe('RoutingConfigRepository', () => {
 
       mocks.dynamo.on(UpdateCommand).resolves({ Attributes: completedInvalid });
 
-      const result = await repo.submit(routingConfig.id, user);
+      const result = await repo.submit(routingConfig.id, user, 2);
 
       expect(result).toEqual({
         error: {
@@ -331,7 +336,7 @@ describe('RoutingConfigRepository', () => {
 
       mocks.dynamo.on(UpdateCommand).rejects(err);
 
-      const result = await repo.submit(routingConfig.id, user);
+      const result = await repo.submit(routingConfig.id, user, 2);
 
       expect(result).toEqual({
         error: {
@@ -354,7 +359,7 @@ describe('RoutingConfigRepository', () => {
 
       mocks.dynamo.on(UpdateCommand).rejects(err);
 
-      const result = await repo.submit(routingConfig.id, user);
+      const result = await repo.submit(routingConfig.id, user, 2);
 
       expect(result).toEqual({
         error: {
@@ -377,7 +382,7 @@ describe('RoutingConfigRepository', () => {
 
       mocks.dynamo.on(UpdateCommand).rejects(err);
 
-      const result = await repo.submit(routingConfig.id, user);
+      const result = await repo.submit(routingConfig.id, user, 2);
 
       expect(result).toEqual({
         error: {
@@ -389,6 +394,34 @@ describe('RoutingConfigRepository', () => {
         },
       });
     });
+
+    test("returns 409 failure if lock number doesn't match", async () => {
+      const { repo, mocks } = setup();
+
+      const err = new ConditionalCheckFailedException({
+        Item: {
+          status: { S: 'DRAFT' satisfies RoutingConfigStatus },
+          lockNumber: { N: '3' },
+        },
+        $metadata: {},
+        message: 'msg',
+      });
+
+      mocks.dynamo.on(UpdateCommand).rejects(err);
+
+      const result = await repo.submit(routingConfig.id, user, 2);
+
+      expect(result).toEqual({
+        error: {
+          actualError: err,
+          errorMeta: {
+            code: 409,
+            description:
+              'Lock number mismatch - Message Plan has been modified since last read',
+          },
+        },
+      });
+    });
   });
 
   describe('delete', () => {
@@ -402,13 +435,15 @@ describe('RoutingConfigRepository', () => {
 
       mocks.dynamo.on(UpdateCommand).resolves({ Attributes: deleted });
 
-      const result = await repo.delete(routingConfig.id, user);
+      const result = await repo.delete(routingConfig.id, user, 2);
 
       expect(result).toEqual({ data: deleted });
 
       expect(mocks.dynamo).toHaveReceivedCommandWith(UpdateCommand, {
-        ConditionExpression: '#status = :condition_1_status',
+        ConditionExpression:
+          '#status = :condition_1_status AND #lockNumber = :condition_2_lockNumber',
         ExpressionAttributeNames: {
+          '#lockNumber': 'lockNumber',
           '#status': 'status',
           '#updatedAt': 'updatedAt',
           '#updatedBy': 'updatedBy',
@@ -416,6 +451,8 @@ describe('RoutingConfigRepository', () => {
         },
         ExpressionAttributeValues: {
           ':condition_1_status': 'DRAFT',
+          ':condition_2_lockNumber': 2,
+          ':lockNumber': 1,
           ':status': 'DELETED',
           ':updatedAt': date.toISOString(),
           ':updatedBy': user.userId,
@@ -428,7 +465,7 @@ describe('RoutingConfigRepository', () => {
         ReturnValues: 'ALL_NEW',
         TableName: TABLE_NAME,
         UpdateExpression:
-          'SET #status = :status, #ttl = :ttl, #updatedAt = :updatedAt, #updatedBy = :updatedBy',
+          'SET #status = :status, #ttl = :ttl, #updatedAt = :updatedAt, #updatedBy = :updatedBy ADD #lockNumber :lockNumber',
       });
     });
 
@@ -439,7 +476,7 @@ describe('RoutingConfigRepository', () => {
 
       mocks.dynamo.on(UpdateCommand).rejects(err);
 
-      const result = await repo.delete(routingConfig.id, user);
+      const result = await repo.delete(routingConfig.id, user, 2);
 
       expect(result).toEqual({
         error: {
@@ -463,7 +500,7 @@ describe('RoutingConfigRepository', () => {
 
       mocks.dynamo.on(UpdateCommand).resolves({ Attributes: completedInvalid });
 
-      const result = await repo.delete(routingConfig.id, user);
+      const result = await repo.delete(routingConfig.id, user, 2);
 
       expect(result).toEqual({
         error: {
@@ -495,7 +532,7 @@ describe('RoutingConfigRepository', () => {
 
       mocks.dynamo.on(UpdateCommand).rejects(err);
 
-      const result = await repo.delete(routingConfig.id, user);
+      const result = await repo.delete(routingConfig.id, user, 2);
 
       expect(result).toEqual({
         error: {
@@ -518,7 +555,7 @@ describe('RoutingConfigRepository', () => {
 
       mocks.dynamo.on(UpdateCommand).rejects(err);
 
-      const result = await repo.delete(routingConfig.id, user);
+      const result = await repo.delete(routingConfig.id, user, 2);
 
       expect(result).toEqual({
         error: {
@@ -541,7 +578,7 @@ describe('RoutingConfigRepository', () => {
 
       mocks.dynamo.on(UpdateCommand).rejects(err);
 
-      const result = await repo.delete(routingConfig.id, user);
+      const result = await repo.delete(routingConfig.id, user, 2);
 
       expect(result).toEqual({
         error: {
@@ -553,6 +590,34 @@ describe('RoutingConfigRepository', () => {
         },
       });
     });
+
+    test("returns 409 failure if routing config lock number doesn't match", async () => {
+      const { repo, mocks } = setup();
+
+      const err = new ConditionalCheckFailedException({
+        Item: {
+          status: { S: 'DRAFT' satisfies RoutingConfigStatus },
+          lockNumber: { N: '3' },
+        },
+        $metadata: {},
+        message: 'msg',
+      });
+
+      mocks.dynamo.on(UpdateCommand).rejects(err);
+
+      const result = await repo.delete(routingConfig.id, user, 2);
+
+      expect(result).toEqual({
+        error: {
+          actualError: err,
+          errorMeta: {
+            code: 409,
+            description:
+              'Lock number mismatch - Message Plan has been modified since last read',
+          },
+        },
+      });
+    });
   });
 
   describe('update', () => {
@@ -573,16 +638,18 @@ describe('RoutingConfigRepository', () => {
 
       mocks.dynamo.on(UpdateCommand).resolves({ Attributes: updated });
 
-      const result = await repo.update(routingConfig.id, update, user);
+      const result = await repo.update(routingConfig.id, update, user, 2);
 
       expect(result).toEqual({ data: updated });
 
       expect(mocks.dynamo).toHaveReceivedCommandWith(UpdateCommand, {
-        ConditionExpression: '#status = :condition_1_status',
+        ConditionExpression:
+          '#status = :condition_1_status AND #lockNumber = :condition_2_lockNumber',
         ExpressionAttributeNames: {
           '#campaignId': 'campaignId',
           '#cascade': 'cascade',
           '#cascadeGroupOverrides': 'cascadeGroupOverrides',
+          '#lockNumber': 'lockNumber',
           '#name': 'name',
           '#status': 'status',
           '#updatedAt': 'updatedAt',
@@ -593,6 +660,8 @@ describe('RoutingConfigRepository', () => {
           ':cascade': update.cascade,
           ':cascadeGroupOverrides': update.cascadeGroupOverrides,
           ':condition_1_status': 'DRAFT',
+          ':condition_2_lockNumber': 2,
+          ':lockNumber': 1,
           ':name': update.name,
           ':updatedAt': date.toISOString(),
           ':updatedBy': user.userId,
@@ -604,7 +673,7 @@ describe('RoutingConfigRepository', () => {
         ReturnValues: 'ALL_NEW',
         TableName: TABLE_NAME,
         UpdateExpression:
-          'SET #name = :name, #campaignId = :campaignId, #cascade = :cascade, #cascadeGroupOverrides = :cascadeGroupOverrides, #updatedAt = :updatedAt, #updatedBy = :updatedBy',
+          'SET #name = :name, #campaignId = :campaignId, #cascade = :cascade, #cascadeGroupOverrides = :cascadeGroupOverrides, #updatedAt = :updatedAt, #updatedBy = :updatedBy ADD #lockNumber :lockNumber',
       });
     });
 
@@ -622,13 +691,15 @@ describe('RoutingConfigRepository', () => {
 
       mocks.dynamo.on(UpdateCommand).resolves({ Attributes: updated });
 
-      const result = await repo.update(routingConfig.id, update, user);
+      const result = await repo.update(routingConfig.id, update, user, 2);
 
       expect(result).toEqual({ data: updated });
 
       expect(mocks.dynamo).toHaveReceivedCommandWith(UpdateCommand, {
-        ConditionExpression: '#status = :condition_1_status',
+        ConditionExpression:
+          '#status = :condition_1_status AND #lockNumber = :condition_2_lockNumber',
         ExpressionAttributeNames: {
+          '#lockNumber': 'lockNumber',
           '#name': 'name',
           '#status': 'status',
           '#updatedAt': 'updatedAt',
@@ -636,6 +707,8 @@ describe('RoutingConfigRepository', () => {
         },
         ExpressionAttributeValues: {
           ':condition_1_status': 'DRAFT',
+          ':condition_2_lockNumber': 2,
+          ':lockNumber': 1,
           ':name': update.name,
           ':updatedAt': date.toISOString(),
           ':updatedBy': user.userId,
@@ -647,7 +720,7 @@ describe('RoutingConfigRepository', () => {
         ReturnValues: 'ALL_NEW',
         TableName: TABLE_NAME,
         UpdateExpression:
-          'SET #name = :name, #updatedAt = :updatedAt, #updatedBy = :updatedBy',
+          'SET #name = :name, #updatedAt = :updatedAt, #updatedBy = :updatedBy ADD #lockNumber :lockNumber',
       });
     });
 
@@ -665,13 +738,15 @@ describe('RoutingConfigRepository', () => {
 
       mocks.dynamo.on(UpdateCommand).resolves({ Attributes: updated });
 
-      const result = await repo.update(routingConfig.id, update, user);
+      const result = await repo.update(routingConfig.id, update, user, 2);
 
       expect(result).toEqual({ data: updated });
 
       expect(mocks.dynamo).toHaveReceivedCommandWith(UpdateCommand, {
-        ConditionExpression: '#status = :condition_1_status',
+        ConditionExpression:
+          '#status = :condition_1_status AND #lockNumber = :condition_2_lockNumber',
         ExpressionAttributeNames: {
+          '#lockNumber': 'lockNumber',
           '#campaignId': 'campaignId',
           '#status': 'status',
           '#updatedAt': 'updatedAt',
@@ -679,6 +754,8 @@ describe('RoutingConfigRepository', () => {
         },
         ExpressionAttributeValues: {
           ':condition_1_status': 'DRAFT',
+          ':condition_2_lockNumber': 2,
+          ':lockNumber': 1,
           ':campaignId': update.campaignId,
           ':updatedAt': date.toISOString(),
           ':updatedBy': user.userId,
@@ -690,7 +767,7 @@ describe('RoutingConfigRepository', () => {
         ReturnValues: 'ALL_NEW',
         TableName: TABLE_NAME,
         UpdateExpression:
-          'SET #campaignId = :campaignId, #updatedAt = :updatedAt, #updatedBy = :updatedBy',
+          'SET #campaignId = :campaignId, #updatedAt = :updatedAt, #updatedBy = :updatedBy ADD #lockNumber :lockNumber',
       });
     });
 
@@ -716,21 +793,25 @@ describe('RoutingConfigRepository', () => {
 
       mocks.dynamo.on(UpdateCommand).resolves({ Attributes: updated });
 
-      const result = await repo.update(routingConfig.id, update, user);
+      const result = await repo.update(routingConfig.id, update, user, 2);
 
       expect(result).toEqual({ data: updated });
 
       expect(mocks.dynamo).toHaveReceivedCommandWith(UpdateCommand, {
-        ConditionExpression: '#status = :condition_1_status',
+        ConditionExpression:
+          '#status = :condition_1_status AND #lockNumber = :condition_2_lockNumber',
         ExpressionAttributeNames: {
           '#cascade': 'cascade',
           '#cascadeGroupOverrides': 'cascadeGroupOverrides',
+          '#lockNumber': 'lockNumber',
           '#status': 'status',
           '#updatedAt': 'updatedAt',
           '#updatedBy': 'updatedBy',
         },
         ExpressionAttributeValues: {
           ':condition_1_status': 'DRAFT',
+          ':condition_2_lockNumber': 2,
+          ':lockNumber': 1,
           ':cascade': update.cascade,
           ':cascadeGroupOverrides': update.cascadeGroupOverrides,
           ':updatedAt': date.toISOString(),
@@ -743,7 +824,7 @@ describe('RoutingConfigRepository', () => {
         ReturnValues: 'ALL_NEW',
         TableName: TABLE_NAME,
         UpdateExpression:
-          'SET #cascade = :cascade, #cascadeGroupOverrides = :cascadeGroupOverrides, #updatedAt = :updatedAt, #updatedBy = :updatedBy',
+          'SET #cascade = :cascade, #cascadeGroupOverrides = :cascadeGroupOverrides, #updatedAt = :updatedAt, #updatedBy = :updatedBy ADD #lockNumber :lockNumber',
       });
     });
 
@@ -769,13 +850,15 @@ describe('RoutingConfigRepository', () => {
 
       mocks.dynamo.on(UpdateCommand).resolves({ Attributes: updated });
 
-      const result = await repo.update(routingConfig.id, update, user);
+      const result = await repo.update(routingConfig.id, update, user, 2);
 
       expect(result).toEqual({ data: updated });
 
       expect(mocks.dynamo).toHaveReceivedCommandWith(UpdateCommand, {
-        ConditionExpression: '#status = :condition_1_status',
+        ConditionExpression:
+          '#status = :condition_1_status AND #lockNumber = :condition_2_lockNumber',
         ExpressionAttributeNames: {
+          '#lockNumber': 'lockNumber',
           '#name': 'name',
           '#status': 'status',
           '#updatedAt': 'updatedAt',
@@ -783,6 +866,8 @@ describe('RoutingConfigRepository', () => {
         },
         ExpressionAttributeValues: {
           ':condition_1_status': 'DRAFT',
+          ':condition_2_lockNumber': 2,
+          ':lockNumber': 1,
           ':name': update.name,
           ':updatedAt': date.toISOString(),
           ':updatedBy': user.userId,
@@ -794,7 +879,7 @@ describe('RoutingConfigRepository', () => {
         ReturnValues: 'ALL_NEW',
         TableName: TABLE_NAME,
         UpdateExpression:
-          'SET #name = :name, #updatedAt = :updatedAt, #updatedBy = :updatedBy',
+          'SET #name = :name, #updatedAt = :updatedAt, #updatedBy = :updatedBy ADD #lockNumber :lockNumber',
       });
     });
 
@@ -813,13 +898,15 @@ describe('RoutingConfigRepository', () => {
 
       mocks.dynamo.on(UpdateCommand).resolves({ Attributes: updated });
 
-      const result = await repo.update(routingConfig.id, update, user);
+      const result = await repo.update(routingConfig.id, update, user, 2);
 
       expect(result).toEqual({ data: updated });
 
       expect(mocks.dynamo).toHaveReceivedCommandWith(UpdateCommand, {
-        ConditionExpression: '#status = :condition_1_status',
+        ConditionExpression:
+          '#status = :condition_1_status AND #lockNumber = :condition_2_lockNumber',
         ExpressionAttributeNames: {
+          '#lockNumber': 'lockNumber',
           '#name': 'name',
           '#status': 'status',
           '#updatedAt': 'updatedAt',
@@ -827,6 +914,8 @@ describe('RoutingConfigRepository', () => {
         },
         ExpressionAttributeValues: {
           ':condition_1_status': 'DRAFT',
+          ':condition_2_lockNumber': 2,
+          ':lockNumber': 1,
           ':name': update.name,
           ':updatedAt': date.toISOString(),
           ':updatedBy': user.userId,
@@ -838,7 +927,7 @@ describe('RoutingConfigRepository', () => {
         ReturnValues: 'ALL_NEW',
         TableName: TABLE_NAME,
         UpdateExpression:
-          'SET #name = :name, #updatedAt = :updatedAt, #updatedBy = :updatedBy',
+          'SET #name = :name, #updatedAt = :updatedAt, #updatedBy = :updatedBy ADD #lockNumber :lockNumber',
       });
     });
 
@@ -855,16 +944,18 @@ describe('RoutingConfigRepository', () => {
 
       mocks.dynamo.on(UpdateCommand).resolves({ Attributes: routingConfig });
 
-      const result = await repo.update(routingConfig.id, update, user);
+      const result = await repo.update(routingConfig.id, update, user, 2);
 
       expect(result).toEqual({ data: routingConfig });
 
       expect(mocks.dynamo).toHaveReceivedCommandWith(UpdateCommand, {
-        ConditionExpression: '#status = :condition_1_status',
+        ConditionExpression:
+          '#status = :condition_1_status AND #lockNumber = :condition_2_lockNumber',
         ExpressionAttributeNames: {
           '#campaignId': 'campaignId',
           '#cascade': 'cascade',
           '#cascadeGroupOverrides': 'cascadeGroupOverrides',
+          '#lockNumber': 'lockNumber',
           '#name': 'name',
           '#status': 'status',
           '#updatedAt': 'updatedAt',
@@ -875,6 +966,8 @@ describe('RoutingConfigRepository', () => {
           ':cascade': update.cascade,
           ':cascadeGroupOverrides': update.cascadeGroupOverrides,
           ':condition_1_status': 'DRAFT',
+          ':condition_2_lockNumber': 2,
+          ':lockNumber': 1,
           ':name': update.name,
           ':updatedAt': date.toISOString(),
           ':updatedBy': user.userId,
@@ -886,7 +979,7 @@ describe('RoutingConfigRepository', () => {
         ReturnValues: 'ALL_NEW',
         TableName: TABLE_NAME,
         UpdateExpression:
-          'SET #name = :name, #campaignId = :campaignId, #cascade = :cascade, #cascadeGroupOverrides = :cascadeGroupOverrides, #updatedAt = :updatedAt, #updatedBy = :updatedBy',
+          'SET #name = :name, #campaignId = :campaignId, #cascade = :cascade, #cascadeGroupOverrides = :cascadeGroupOverrides, #updatedAt = :updatedAt, #updatedBy = :updatedBy ADD #lockNumber :lockNumber',
       });
     });
 
@@ -905,7 +998,8 @@ describe('RoutingConfigRepository', () => {
           name: routingConfig.name,
           campaignId: routingConfig.campaignId,
         },
-        user
+        user,
+        2
       );
 
       expect(result).toEqual({
@@ -937,7 +1031,8 @@ describe('RoutingConfigRepository', () => {
           name: routingConfig.name,
           campaignId: routingConfig.campaignId,
         },
-        user
+        user,
+        2
       );
 
       expect(result).toEqual({
@@ -971,7 +1066,12 @@ describe('RoutingConfigRepository', () => {
 
       mocks.dynamo.on(UpdateCommand).rejects(err);
 
-      const result = await repo.submit(routingConfig.id, user);
+      const result = await repo.update(
+        routingConfig.id,
+        { name: 'new-name' },
+        user,
+        2
+      );
 
       expect(result).toEqual({
         error: {
@@ -994,7 +1094,12 @@ describe('RoutingConfigRepository', () => {
 
       mocks.dynamo.on(UpdateCommand).rejects(err);
 
-      const result = await repo.submit(routingConfig.id, user);
+      const result = await repo.update(
+        routingConfig.id,
+        { name: 'new-name' },
+        user,
+        2
+      );
 
       expect(result).toEqual({
         error: {
@@ -1017,7 +1122,12 @@ describe('RoutingConfigRepository', () => {
 
       mocks.dynamo.on(UpdateCommand).rejects(err);
 
-      const result = await repo.submit(routingConfig.id, user);
+      const result = await repo.update(
+        routingConfig.id,
+        { name: 'new name' },
+        user,
+        2
+      );
 
       expect(result).toEqual({
         error: {
@@ -1029,5 +1139,38 @@ describe('RoutingConfigRepository', () => {
         },
       });
     });
+
+    test("returns 409 failure if routing config lock number doesn't match", async () => {
+      const { repo, mocks } = setup();
+
+      const err = new ConditionalCheckFailedException({
+        Item: {
+          status: { S: 'DRAFT' satisfies RoutingConfigStatus },
+          lockNumber: { N: '3' },
+        },
+        $metadata: {},
+        message: 'msg',
+      });
+
+      mocks.dynamo.on(UpdateCommand).rejects(err);
+
+      const result = await repo.update(
+        routingConfig.id,
+        { name: 'new-name' },
+        user,
+        2
+      );
+
+      expect(result).toEqual({
+        error: {
+          actualError: err,
+          errorMeta: {
+            code: 409,
+            description:
+              'Lock number mismatch - Message Plan has been modified since last read',
+          },
+        },
+      });
+    });
   });
 });
diff --git a/lambdas/backend-api/src/__tests__/infra/template-repository/repository.test.ts b/lambdas/backend-api/src/__tests__/infra/template-repository/repository.test.ts
index ec1525d69..27b2bb7e6 100644
--- a/lambdas/backend-api/src/__tests__/infra/template-repository/repository.test.ts
+++ b/lambdas/backend-api/src/__tests__/infra/template-repository/repository.test.ts
@@ -488,7 +488,8 @@ describe('templateRepository', () => {
           },
           errorCode: 409,
           errorMeta: {
-            description: 'Invalid lock number',
+            description:
+              'Lock number mismatch - Template has been modified since last read',
           },
         },
       ];
@@ -650,7 +651,8 @@ describe('templateRepository', () => {
           lockNumber: 1,
         }),
         code: 409,
-        message: 'Invalid lock number',
+        message:
+          'Lock number mismatch - Template has been modified since last read',
         returnActualError: true,
       },
     ])(
@@ -845,7 +847,10 @@ describe('templateRepository', () => {
             lockNumber: { N: '2' },
           },
           errorCode: 409,
-          errorMeta: { description: 'Invalid lock number' },
+          errorMeta: {
+            description:
+              'Lock number mismatch - Template has been modified since last read',
+          },
         },
       ];
 
@@ -1781,7 +1786,8 @@ describe('templateRepository', () => {
           actualError: err,
           errorMeta: {
             code: 409,
-            description: 'Invalid lock number',
+            description:
+              'Lock number mismatch - Template has been modified since last read',
           },
         },
       });
diff --git a/lambdas/backend-api/src/api/delete-routing-config.ts b/lambdas/backend-api/src/api/delete-routing-config.ts
index f4ab06f28..612c7637f 100644
--- a/lambdas/backend-api/src/api/delete-routing-config.ts
+++ b/lambdas/backend-api/src/api/delete-routing-config.ts
@@ -1,7 +1,8 @@
 import type { APIGatewayProxyHandler } from 'aws-lambda';
-import { apiFailure, noContent } from './responses';
-import type { RoutingConfigClient } from '../app/routing-config-client';
 import { logger } from 'nhs-notify-web-template-management-utils/logger';
+import { apiFailure, noContent } from '@backend-api/api/responses';
+import type { RoutingConfigClient } from '@backend-api/app/routing-config-client';
+import { toHeaders } from '@backend-api/utils/headers';
 
 export function createHandler({
   routingConfigClient,
@@ -22,7 +23,8 @@ export function createHandler({
 
     const { error } = await routingConfigClient.deleteRoutingConfig(
       routingConfigId,
-      user
+      user,
+      toHeaders(event.headers).get('X-Lock-Number') ?? ''
     );
 
     if (error) {
diff --git a/lambdas/backend-api/src/api/delete.ts b/lambdas/backend-api/src/api/delete.ts
index 67f74e485..e2057bfcf 100644
--- a/lambdas/backend-api/src/api/delete.ts
+++ b/lambdas/backend-api/src/api/delete.ts
@@ -1,6 +1,7 @@
 import type { APIGatewayProxyHandler } from 'aws-lambda';
-import { apiFailure, noContent } from './responses';
-import { TemplateClient } from '../app/template-client';
+import { apiFailure, noContent } from '@backend-api/api/responses';
+import type { TemplateClient } from '@backend-api/app/template-client';
+import { toHeaders } from '@backend-api/utils/headers';
 
 export function createHandler({
   templateClient,
@@ -22,7 +23,7 @@ export function createHandler({
         userId,
         clientId,
       },
-      event.headers['X-Lock-Number'] ?? ''
+      toHeaders(event.headers).get('X-Lock-Number') ?? ''
     );
 
     if (error) {
diff --git a/lambdas/backend-api/src/api/proof.ts b/lambdas/backend-api/src/api/proof.ts
index b8ee6923f..b635037df 100644
--- a/lambdas/backend-api/src/api/proof.ts
+++ b/lambdas/backend-api/src/api/proof.ts
@@ -1,6 +1,7 @@
 import type { APIGatewayProxyHandler } from 'aws-lambda';
-import { apiFailure, apiSuccess } from './responses';
-import { TemplateClient } from '../app/template-client';
+import { apiFailure, apiSuccess } from '@backend-api/api/responses';
+import { TemplateClient } from '@backend-api/app/template-client';
+import { toHeaders } from '@backend-api/utils/headers';
 
 export function createHandler({
   templateClient,
@@ -22,7 +23,7 @@ export function createHandler({
         userId,
         clientId,
       },
-      event.headers['X-Lock-Number'] ?? ''
+      toHeaders(event.headers).get('X-Lock-Number') ?? ''
     );
 
     if (error) {
diff --git a/lambdas/backend-api/src/api/submit-routing-config.ts b/lambdas/backend-api/src/api/submit-routing-config.ts
index d530cdb64..710b110e2 100644
--- a/lambdas/backend-api/src/api/submit-routing-config.ts
+++ b/lambdas/backend-api/src/api/submit-routing-config.ts
@@ -1,7 +1,8 @@
 import type { APIGatewayProxyHandler } from 'aws-lambda';
-import { apiFailure, apiSuccess } from './responses';
-import type { RoutingConfigClient } from '../app/routing-config-client';
 import { logger } from 'nhs-notify-web-template-management-utils/logger';
+import { apiFailure, apiSuccess } from '@backend-api/api/responses';
+import type { RoutingConfigClient } from '@backend-api/app/routing-config-client';
+import { toHeaders } from '@backend-api/utils/headers';
 
 export function createHandler({
   routingConfigClient,
@@ -22,7 +23,8 @@ export function createHandler({
 
     const { data, error } = await routingConfigClient.submitRoutingConfig(
       routingConfigId,
-      user
+      user,
+      toHeaders(event.headers).get('X-Lock-Number') ?? ''
     );
 
     if (error) {
diff --git a/lambdas/backend-api/src/api/submit.ts b/lambdas/backend-api/src/api/submit.ts
index 0c2318ba9..841f9dc19 100644
--- a/lambdas/backend-api/src/api/submit.ts
+++ b/lambdas/backend-api/src/api/submit.ts
@@ -1,7 +1,8 @@
 import type { APIGatewayProxyHandler } from 'aws-lambda';
-import { apiFailure, apiSuccess } from './responses';
-import { TemplateClient } from '../app/template-client';
-import { EmailClient } from 'nhs-notify-web-template-management-utils/email-client';
+import type { EmailClient } from 'nhs-notify-web-template-management-utils/email-client';
+import { apiFailure, apiSuccess } from '@backend-api/api/responses';
+import type { TemplateClient } from '@backend-api/app/template-client';
+import { toHeaders } from '@backend-api/utils/headers';
 
 export function createHandler({
   templateClient,
@@ -25,7 +26,7 @@ export function createHandler({
         userId,
         clientId,
       },
-      event.headers['X-Lock-Number'] ?? ''
+      toHeaders(event.headers).get('X-Lock-Number') ?? ''
     );
 
     if (error) {
diff --git a/lambdas/backend-api/src/api/update-routing-config.ts b/lambdas/backend-api/src/api/update-routing-config.ts
index 501e660b9..515ae1793 100644
--- a/lambdas/backend-api/src/api/update-routing-config.ts
+++ b/lambdas/backend-api/src/api/update-routing-config.ts
@@ -1,7 +1,8 @@
 import type { APIGatewayProxyHandler } from 'aws-lambda';
-import { apiFailure, apiSuccess } from './responses';
-import { RoutingConfigClient } from '../app/routing-config-client';
 import { logger } from 'nhs-notify-web-template-management-utils/logger';
+import { apiFailure, apiSuccess } from '@backend-api/api/responses';
+import type { RoutingConfigClient } from '@backend-api/app/routing-config-client';
+import { toHeaders } from '@backend-api/utils/headers';
 
 export function createHandler({
   routingConfigClient,
@@ -28,7 +29,8 @@ export function createHandler({
     const { data, error } = await routingConfigClient.updateRoutingConfig(
       routingConfigId,
       payload,
-      { userId, clientId }
+      { userId, clientId },
+      toHeaders(event.headers).get('X-Lock-Number') ?? ''
     );
 
     if (error) {
diff --git a/lambdas/backend-api/src/api/update.ts b/lambdas/backend-api/src/api/update.ts
index 185c4dcab..a7f69e263 100644
--- a/lambdas/backend-api/src/api/update.ts
+++ b/lambdas/backend-api/src/api/update.ts
@@ -1,6 +1,7 @@
 import type { APIGatewayProxyHandler } from 'aws-lambda';
-import { apiFailure, apiSuccess } from './responses';
-import { TemplateClient } from '../app/template-client';
+import { apiFailure, apiSuccess } from '@backend-api/api/responses';
+import type { TemplateClient } from '@backend-api/app/template-client';
+import { toHeaders } from '@backend-api/utils/headers';
 
 export function createHandler({
   templateClient,
@@ -22,7 +23,7 @@ export function createHandler({
       templateId,
       dto,
       { userId, clientId },
-      event.headers['X-Lock-Number'] ?? ''
+      toHeaders(event.headers).get('X-Lock-Number') ?? ''
     );
 
     if (error) {
diff --git a/lambdas/backend-api/src/app/routing-config-client.ts b/lambdas/backend-api/src/app/routing-config-client.ts
index 81c2dedfe..2ed233a2a 100644
--- a/lambdas/backend-api/src/app/routing-config-client.ts
+++ b/lambdas/backend-api/src/app/routing-config-client.ts
@@ -2,6 +2,7 @@ import { failure } from '@backend-api/utils/result';
 import {
   $CreateRoutingConfig,
   $ListRoutingConfigFilters,
+  $LockNumber,
   $UpdateRoutingConfig,
   ErrorCase,
   type ListRoutingConfigFilters,
@@ -57,8 +58,18 @@ export class RoutingConfigClient {
   async updateRoutingConfig(
     routingConfigId: string,
     payload: unknown,
-    user: User
+    user: User,
+    lockNumber: number | string
   ): Promise<Result<RoutingConfig>> {
+    const lockNumberValidation = $LockNumber.safeParse(lockNumber);
+
+    if (!lockNumberValidation.success) {
+      return failure(
+        ErrorCase.CONFLICT,
+        'Lock number mismatch - Message Plan has been modified since last read'
+      );
+    }
+
     const clientConfigurationResult = await this.clientConfigRepository.get(
       user.clientId
     );
@@ -93,14 +104,25 @@ export class RoutingConfigClient {
     return this.routingConfigRepository.update(
       routingConfigId,
       validated,
-      user
+      user,
+      lockNumberValidation.data
     );
   }
 
   async submitRoutingConfig(
     routingConfigId: string,
-    user: User
+    user: User,
+    lockNumber: number | string
   ): Promise<Result<RoutingConfig>> {
+    const lockNumberValidation = $LockNumber.safeParse(lockNumber);
+
+    if (!lockNumberValidation.success) {
+      return failure(
+        ErrorCase.CONFLICT,
+        'Lock number mismatch - Message Plan has been modified since last read'
+      );
+    }
+
     const clientConfigurationResult = await this.clientConfigRepository.get(
       user.clientId
     );
@@ -114,13 +136,27 @@ export class RoutingConfigClient {
       );
     }
 
-    return this.routingConfigRepository.submit(routingConfigId, user);
+    return this.routingConfigRepository.submit(
+      routingConfigId,
+      user,
+      lockNumberValidation.data
+    );
   }
 
   async deleteRoutingConfig(
     routingConfigId: string,
-    user: User
+    user: User,
+    lockNumber: number | string
   ): Promise<Result<undefined>> {
+    const lockNumberValidation = $LockNumber.safeParse(lockNumber);
+
+    if (!lockNumberValidation.success) {
+      return failure(
+        ErrorCase.CONFLICT,
+        'Lock number mismatch - Message Plan has been modified since last read'
+      );
+    }
+
     const clientConfigurationResult = await this.clientConfigRepository.get(
       user.clientId
     );
@@ -136,7 +172,8 @@ export class RoutingConfigClient {
 
     const result = await this.routingConfigRepository.delete(
       routingConfigId,
-      user
+      user,
+      lockNumberValidation.data
     );
 
     if (result.error) return result;
diff --git a/lambdas/backend-api/src/app/template-client.ts b/lambdas/backend-api/src/app/template-client.ts
index b1fd904e8..f0f0e568e 100644
--- a/lambdas/backend-api/src/app/template-client.ts
+++ b/lambdas/backend-api/src/app/template-client.ts
@@ -275,7 +275,10 @@ export class TemplateClient {
         z.treeifyError(lockNumberValidation.error)
       );
 
-      return failure(ErrorCase.CONFLICT, 'Invalid lock number');
+      return failure(
+        ErrorCase.CONFLICT,
+        'Lock number mismatch - Template has been modified since last read'
+      );
     }
 
     const updateResult = await this.templateRepository.update(
@@ -318,7 +321,10 @@ export class TemplateClient {
         z.treeifyError(lockNumberValidation.error)
       );
 
-      return failure(ErrorCase.CONFLICT, 'Invalid lock number');
+      return failure(
+        ErrorCase.CONFLICT,
+        'Lock number mismatch - Template has been modified since last read'
+      );
     }
 
     const submitResult = await this.templateRepository.submit(
@@ -362,7 +368,10 @@ export class TemplateClient {
         z.treeifyError(lockNumberValidation.error)
       );
 
-      return failure(ErrorCase.CONFLICT, 'Invalid lock number');
+      return failure(
+        ErrorCase.CONFLICT,
+        'Lock number mismatch - Template has been modified since last read'
+      );
     }
 
     const deleteResult = await this.templateRepository.delete(
@@ -460,7 +469,10 @@ export class TemplateClient {
         z.treeifyError(lockNumberValidation.error)
       );
 
-      return failure(ErrorCase.CONFLICT, 'Invalid lock number');
+      return failure(
+        ErrorCase.CONFLICT,
+        'Lock number mismatch - Template has been modified since last read'
+      );
     }
 
     const clientConfigurationResult = await this.clientConfigRepository.get(
diff --git a/lambdas/backend-api/src/infra/routing-config-repository/repository.ts b/lambdas/backend-api/src/infra/routing-config-repository/repository.ts
index e760b016a..d0533623a 100644
--- a/lambdas/backend-api/src/infra/routing-config-repository/repository.ts
+++ b/lambdas/backend-api/src/infra/routing-config-repository/repository.ts
@@ -23,6 +23,7 @@ import { RoutingConfigQuery } from './query';
 import { RoutingConfigUpdateBuilder } from 'nhs-notify-entity-update-command-builder';
 import { ConditionalCheckFailedException } from '@aws-sdk/client-dynamodb';
 import { calculateTTL } from '@backend-api/utils/calculate-ttl';
+import { unmarshall } from '@aws-sdk/util-dynamodb';
 
 export class RoutingConfigRepository {
   private updateCmdOpts = {
@@ -78,7 +79,8 @@ export class RoutingConfigRepository {
   async update(
     id: string,
     updateData: UpdateRoutingConfig,
-    user: User
+    user: User,
+    lockNumber: number
   ): Promise<ApplicationResult<RoutingConfig>> {
     const { campaignId, cascade, cascadeGroupOverrides, name } = updateData;
 
@@ -102,7 +104,11 @@ export class RoutingConfigRepository {
         .setCascade(cascade)
         .setCascadeGroupOverrides(cascadeGroupOverrides);
     }
-    update.setUpdatedByUserAt(user.userId).expectStatus('DRAFT');
+    update
+      .setUpdatedByUserAt(user.userId)
+      .expectStatus('DRAFT')
+      .expectLockNumber(lockNumber)
+      .incrementLockNumber();
 
     try {
       const result = await this.client.send(new UpdateCommand(update.build()));
@@ -119,13 +125,14 @@ export class RoutingConfigRepository {
 
       return success(parsed.data);
     } catch (error) {
-      return this.handleUpdateError(error);
+      return this.handleUpdateError(error, lockNumber);
     }
   }
 
   async submit(
     id: string,
-    user: User
+    user: User,
+    lockNumber: number
   ): Promise<ApplicationResult<RoutingConfig>> {
     const cmdInput = new RoutingConfigUpdateBuilder(
       this.tableName,
@@ -136,6 +143,8 @@ export class RoutingConfigRepository {
       .setStatus('COMPLETED')
       .expectStatus('DRAFT')
       .setUpdatedByUserAt(user.userId)
+      .expectLockNumber(lockNumber)
+      .incrementLockNumber()
       .build();
 
     try {
@@ -153,13 +162,14 @@ export class RoutingConfigRepository {
 
       return success(parsed.data);
     } catch (error) {
-      return this.handleUpdateError(error);
+      return this.handleUpdateError(error, lockNumber);
     }
   }
 
   async delete(
     id: string,
-    user: User
+    user: User,
+    lockNumber: number
   ): Promise<ApplicationResult<RoutingConfig>> {
     const cmdInput = new RoutingConfigUpdateBuilder(
       this.tableName,
@@ -171,6 +181,8 @@ export class RoutingConfigRepository {
       .setTtl(calculateTTL())
       .expectStatus('DRAFT')
       .setUpdatedByUserAt(user.userId)
+      .expectLockNumber(lockNumber)
+      .incrementLockNumber()
       .build();
 
     try {
@@ -188,7 +200,7 @@ export class RoutingConfigRepository {
 
       return success(parsed.data);
     } catch (error) {
-      return this.handleUpdateError(error);
+      return this.handleUpdateError(error, lockNumber);
     }
   }
 
@@ -231,20 +243,31 @@ export class RoutingConfigRepository {
     );
   }
 
-  private handleUpdateError(err: unknown) {
+  private handleUpdateError(err: unknown, expectedLockNumber: number) {
     if (err instanceof ConditionalCheckFailedException) {
-      const status = err?.Item?.status.S;
+      const item = unmarshall(err.Item ?? {});
 
-      if (!status || status === ('DELETED' satisfies RoutingConfigStatus)) {
+      if (
+        !err.Item ||
+        item.status === ('DELETED' satisfies RoutingConfigStatus)
+      ) {
         return failure(ErrorCase.NOT_FOUND, `Routing configuration not found`);
       }
 
-      if (status === ('COMPLETED' satisfies RoutingConfigStatus)) {
+      if (item.status === ('COMPLETED' satisfies RoutingConfigStatus)) {
         return failure(
           ErrorCase.ALREADY_SUBMITTED,
           `Routing configuration with status COMPLETED cannot be updated`
         );
       }
+
+      if (item.lockNumber !== expectedLockNumber) {
+        return failure(
+          ErrorCase.CONFLICT,
+          'Lock number mismatch - Message Plan has been modified since last read',
+          err
+        );
+      }
     }
 
     return failure(ErrorCase.INTERNAL, 'Failed to update routing config', err);
diff --git a/lambdas/backend-api/src/infra/template-repository/repository.ts b/lambdas/backend-api/src/infra/template-repository/repository.ts
index a738f75dd..d19a9b681 100644
--- a/lambdas/backend-api/src/infra/template-repository/repository.ts
+++ b/lambdas/backend-api/src/infra/template-repository/repository.ts
@@ -196,7 +196,11 @@ export class TemplateRepository {
         }
 
         if (oldItem.lockNumber !== lockNumber) {
-          return failure(ErrorCase.CONFLICT, 'Invalid lock number', error);
+          return failure(
+            ErrorCase.CONFLICT,
+            'Lock number mismatch - Template has been modified since last read',
+            error
+          );
         }
       }
 
@@ -240,7 +244,11 @@ export class TemplateRepository {
         const oldItem = unmarshall(error.Item);
 
         if (oldItem.lockNumber !== lockNumber) {
-          return failure(ErrorCase.CONFLICT, 'Invalid lock number', error);
+          return failure(
+            ErrorCase.CONFLICT,
+            'Lock number mismatch - Template has been modified since last read',
+            error
+          );
         }
 
         return failure(
@@ -609,7 +617,11 @@ export class TemplateRepository {
         const oldItem = unmarshall(error.Item);
 
         if (oldItem.lockNumber !== lockNumber) {
-          return failure(ErrorCase.CONFLICT, 'Invalid lock number', error);
+          return failure(
+            ErrorCase.CONFLICT,
+            'Lock number mismatch - Template has been modified since last read',
+            error
+          );
         }
 
         return failure(
@@ -731,7 +743,11 @@ export class TemplateRepository {
       }
 
       if (oldItem.lockNumber !== lockNumber) {
-        return failure(ErrorCase.CONFLICT, 'Invalid lock number', error);
+        return failure(
+          ErrorCase.CONFLICT,
+          'Lock number mismatch - Template has been modified since last read',
+          error
+        );
       }
     }
     return failure(ErrorCase.INTERNAL, 'Failed to update template', error);
diff --git a/lambdas/backend-api/src/utils/headers.ts b/lambdas/backend-api/src/utils/headers.ts
new file mode 100644
index 000000000..90a0b1c11
--- /dev/null
+++ b/lambdas/backend-api/src/utils/headers.ts
@@ -0,0 +1,9 @@
+import type { APIGatewayProxyEventHeaders } from 'aws-lambda';
+
+export function toHeaders(headers: APIGatewayProxyEventHeaders): Headers {
+  return new Headers(
+    Object.entries(headers).filter(
+      (entry): entry is [string, string] => entry[1] !== undefined
+    )
+  );
+}
diff --git a/lambdas/backend-client/src/__tests__/routing-config-api-client.test.ts b/lambdas/backend-client/src/__tests__/routing-config-api-client.test.ts
index 997103811..508778f01 100644
--- a/lambdas/backend-client/src/__tests__/routing-config-api-client.test.ts
+++ b/lambdas/backend-client/src/__tests__/routing-config-api-client.test.ts
@@ -4,11 +4,9 @@ import {
   httpClient,
 } from '../routing-config-api-client';
 import { RoutingConfig, RoutingConfigStatus } from '../types/generated';
-import { ErrorCase } from '../types/error-cases';
 
 const validRoutingConfigId = '2a4b6c8d-0e1f-4a2b-9c3d-5e6f7a8b9c0d';
 const notFoundRoutingConfigId = '3b5d7f9a-1c2e-4b3d-8f0a-6e7d8c9b0a1f';
-const invalidRoutingConfigId = 'not-a-uuid';
 
 describe('RoutingConfigurationApiClient', () => {
   const axiosMock = new MockAdapter(httpClient);
@@ -141,21 +139,6 @@ describe('RoutingConfigurationApiClient', () => {
       expect(axiosMock.history.get.length).toBe(1);
     });
 
-    it('should return error for invalid routing config ID', async () => {
-      const response = await client.get('mock-token', invalidRoutingConfigId);
-
-      expect(response.error).toEqual({
-        errorMeta: {
-          code: ErrorCase.VALIDATION_FAILED,
-          description: 'Invalid routing configuration ID format',
-          details: { id: invalidRoutingConfigId },
-        },
-        actualError: undefined,
-      });
-      expect(response.data).toBeUndefined();
-      expect(axiosMock.history.get.length).toBe(0);
-    });
-
     it('should return routing configuration on success', async () => {
       const data = {
         id: validRoutingConfigId,
@@ -230,6 +213,7 @@ describe('RoutingConfigurationApiClient', () => {
         name: 'name',
         status: 'DRAFT',
         updatedAt: new Date().toISOString(),
+        lockNumber: 0,
       };
 
       axiosMock.onPost('/v1/routing-configuration').reply(201, {
@@ -261,7 +245,7 @@ describe('RoutingConfigurationApiClient', () => {
   describe('update', () => {
     it('should return error when failing to update via API', async () => {
       axiosMock
-        .onPut(`/v1/routing-configuration/${notFoundRoutingConfigId}`)
+        .onPatch(`/v1/routing-configuration/${notFoundRoutingConfigId}`)
         .reply(404, {
           statusCode: 404,
           technicalMessage: 'Not Found',
@@ -279,7 +263,8 @@ describe('RoutingConfigurationApiClient', () => {
       const response = await client.update(
         'test-token',
         notFoundRoutingConfigId,
-        body
+        body,
+        42
       );
 
       expect(response.error).toEqual({
@@ -290,34 +275,7 @@ describe('RoutingConfigurationApiClient', () => {
         },
       });
       expect(response.data).toBeUndefined();
-      expect(axiosMock.history.put.length).toBe(1);
-    });
-
-    it('should return error for invalid routing config ID', async () => {
-      const body = {
-        id: invalidRoutingConfigId,
-        name: 'Test plan',
-        campaignId: 'campaign-1',
-        cascade: [],
-        cascadeGroupOverrides: [],
-      };
-
-      const response = await client.update(
-        'mock-token',
-        invalidRoutingConfigId,
-        body
-      );
-
-      expect(response.error).toEqual({
-        errorMeta: {
-          code: ErrorCase.VALIDATION_FAILED,
-          description: 'Invalid routing configuration ID format',
-          details: { id: invalidRoutingConfigId },
-        },
-        actualError: undefined,
-      });
-      expect(response.data).toBeUndefined();
-      expect(axiosMock.history.get.length).toBe(0);
+      expect(axiosMock.history.patch.length).toBe(1);
     });
 
     it('should return updated routing configuration on success', async () => {
@@ -330,7 +288,7 @@ describe('RoutingConfigurationApiClient', () => {
       };
 
       axiosMock
-        .onPut(`/v1/routing-configuration/${validRoutingConfigId}`)
+        .onPatch(`/v1/routing-configuration/${validRoutingConfigId}`)
         .reply(200, {
           data: body,
         });
@@ -338,12 +296,13 @@ describe('RoutingConfigurationApiClient', () => {
       const response = await client.update(
         'test-token',
         validRoutingConfigId,
-        body
+        body,
+        42
       );
 
       expect(response.error).toBeUndefined();
       expect(response.data).toEqual(body);
-      expect(axiosMock.history.put.length).toBe(1);
+      expect(axiosMock.history.patch.length).toBe(1);
     });
   });
 });
diff --git a/lambdas/backend-client/src/routing-config-api-client.ts b/lambdas/backend-client/src/routing-config-api-client.ts
index e8f5158a1..3dda5f2a9 100644
--- a/lambdas/backend-client/src/routing-config-api-client.ts
+++ b/lambdas/backend-client/src/routing-config-api-client.ts
@@ -8,18 +8,14 @@ import type {
   RoutingConfigSuccess,
   RoutingConfigSuccessList,
   PostV1RoutingConfigurationData,
-  PutV1RoutingConfigurationByRoutingConfigIdData,
+  PatchV1RoutingConfigurationByRoutingConfigIdData,
   UpdateRoutingConfig,
 } from './types/generated';
-import { ErrorCase } from './types/error-cases';
 import { catchAxiosError, createAxiosClient } from './axios-client';
 import { Result } from './types/result';
 import { OpenApiToTemplate } from './types/open-api-helper';
-import { z } from 'zod';
 import { RoutingConfigFilter } from './types/filters';
 
-const uuidSchema = z.uuidv4();
-
 export const httpClient = createAxiosClient();
 
 export const routingConfigurationApiClient = {
@@ -75,22 +71,10 @@ export const routingConfigurationApiClient = {
     token: string,
     id: RoutingConfig['id']
   ): Promise<Result<RoutingConfig>> {
-    if (!uuidSchema.safeParse(id).success) {
-      return {
-        error: {
-          errorMeta: {
-            code: ErrorCase.VALIDATION_FAILED,
-            description: 'Invalid routing configuration ID format',
-            details: { id },
-          },
-          actualError: undefined,
-        },
-      };
-    }
-
-    const url = `/v1/routing-configuration/${id}` satisfies OpenApiToTemplate<
-      GetV1RoutingConfigurationByRoutingConfigIdData['url']
-    >;
+    const url =
+      `/v1/routing-configuration/${encodeURIComponent(id)}` satisfies OpenApiToTemplate<
+        GetV1RoutingConfigurationByRoutingConfigIdData['url']
+      >;
 
     const { data, error } = await catchAxiosError(
       httpClient.get<RoutingConfigSuccess>(url, {
@@ -129,27 +113,17 @@ export const routingConfigurationApiClient = {
   async update(
     token: string,
     id: RoutingConfig['id'],
-    routingConfig: UpdateRoutingConfig
+    routingConfig: UpdateRoutingConfig,
+    lockNumber: number
   ): Promise<Result<RoutingConfig>> {
-    if (!uuidSchema.safeParse(id).success) {
-      return {
-        error: {
-          errorMeta: {
-            code: ErrorCase.VALIDATION_FAILED,
-            description: 'Invalid routing configuration ID format',
-            details: { id },
-          },
-          actualError: undefined,
-        },
-      };
-    }
-    const url = `/v1/routing-configuration/${id}` satisfies OpenApiToTemplate<
-      PutV1RoutingConfigurationByRoutingConfigIdData['url']
-    >;
+    const url =
+      `/v1/routing-configuration/${encodeURIComponent(id)}` satisfies OpenApiToTemplate<
+        PatchV1RoutingConfigurationByRoutingConfigIdData['url']
+      >;
 
     const { data, error } = await catchAxiosError(
-      httpClient.put<RoutingConfigSuccess>(url, routingConfig, {
-        headers: { Authorization: token },
+      httpClient.patch<RoutingConfigSuccess>(url, routingConfig, {
+        headers: { Authorization: token, 'X-Lock-Number': String(lockNumber) },
       })
     );
 
diff --git a/lambdas/backend-client/src/schemas/routing-config.ts b/lambdas/backend-client/src/schemas/routing-config.ts
index 42526aa73..450418e99 100644
--- a/lambdas/backend-client/src/schemas/routing-config.ts
+++ b/lambdas/backend-client/src/schemas/routing-config.ts
@@ -18,7 +18,7 @@ import type {
   UpdateRoutingConfig,
 } from '../types/generated';
 import { schemaFor } from './schema-for';
-import { $Language, $LetterType } from './template';
+import { $Language, $LetterType, $LockNumber } from './template';
 import {
   CASCADE_GROUP_NAME_LIST,
   CHANNEL_LIST,
@@ -158,7 +158,10 @@ const $RoutingConfigStatusActive = schemaFor<RoutingConfigStatusActive>()(
   $RoutingConfigStatus.exclude(['DELETED'])
 );
 
-export const $RoutingConfig = schemaFor<RoutingConfig>()(
+export const $RoutingConfig = schemaFor<
+  RoutingConfig,
+  Omit<RoutingConfig, 'lockNumber'>
+>()(
   z.object({
     campaignId: z.string(),
     cascade: z.array($CascadeItem).nonempty(),
@@ -170,6 +173,7 @@ export const $RoutingConfig = schemaFor<RoutingConfig>()(
     status: $RoutingConfigStatus,
     createdAt: z.string(),
     updatedAt: z.string(),
+    lockNumber: $LockNumber.default(0),
   })
 );
 
diff --git a/lambdas/backend-client/src/schemas/template.ts b/lambdas/backend-client/src/schemas/template.ts
index 534e8af19..af4966b80 100644
--- a/lambdas/backend-client/src/schemas/template.ts
+++ b/lambdas/backend-client/src/schemas/template.ts
@@ -135,9 +135,9 @@ export const $CreateUpdateTemplate = schemaFor<CreateUpdateTemplate>()(
 export const $LockNumber = z.coerce
   .string()
   .trim()
-  .min(1)
+  .min(1) // min string length is 1
   .transform(Number)
-  .pipe(z.number().int().min(0));
+  .pipe(z.number().int().min(0)); // min integer value is 0
 
 const $TemplateStatus = schemaFor<TemplateStatus>()(
   z.enum(TEMPLATE_STATUS_LIST)
diff --git a/lambdas/backend-client/src/types/generated/types.gen.ts b/lambdas/backend-client/src/types/generated/types.gen.ts
index ec6779568..0cfc8232a 100644
--- a/lambdas/backend-client/src/types/generated/types.gen.ts
+++ b/lambdas/backend-client/src/types/generated/types.gen.ts
@@ -206,6 +206,7 @@ export type RoutingConfig = {
   createdAt: string;
   defaultCascadeGroup: string;
   id: string;
+  lockNumber: number;
   name: string;
   status: RoutingConfigStatus;
   updatedAt: string;
@@ -372,6 +373,12 @@ export type PostV1RoutingConfigurationResponse =
 
 export type DeleteV1RoutingConfigurationByRoutingConfigIdData = {
   body?: never;
+  headers: {
+    /**
+     * Lock number of the current version of the routing configuration
+     */
+    'X-Lock-Number': number;
+  };
   path: {
     /**
      * ID of routing configuration to delete
@@ -434,11 +441,17 @@ export type GetV1RoutingConfigurationByRoutingConfigIdResponses = {
 export type GetV1RoutingConfigurationByRoutingConfigIdResponse =
   GetV1RoutingConfigurationByRoutingConfigIdResponses[keyof GetV1RoutingConfigurationByRoutingConfigIdResponses];
 
-export type PutV1RoutingConfigurationByRoutingConfigIdData = {
+export type PatchV1RoutingConfigurationByRoutingConfigIdData = {
   /**
    * Routing configuration update to apply
    */
   body: UpdateRoutingConfig;
+  headers: {
+    /**
+     * Lock number of the current version of the routing configuration
+     */
+    'X-Lock-Number': number;
+  };
   path: {
     /**
      * ID of routing configuration to update
@@ -449,28 +462,34 @@ export type PutV1RoutingConfigurationByRoutingConfigIdData = {
   url: '/v1/routing-configuration/{routingConfigId}';
 };
 
-export type PutV1RoutingConfigurationByRoutingConfigIdErrors = {
+export type PatchV1RoutingConfigurationByRoutingConfigIdErrors = {
   /**
    * Error
    */
   default: Failure;
 };
 
-export type PutV1RoutingConfigurationByRoutingConfigIdError =
-  PutV1RoutingConfigurationByRoutingConfigIdErrors[keyof PutV1RoutingConfigurationByRoutingConfigIdErrors];
+export type PatchV1RoutingConfigurationByRoutingConfigIdError =
+  PatchV1RoutingConfigurationByRoutingConfigIdErrors[keyof PatchV1RoutingConfigurationByRoutingConfigIdErrors];
 
-export type PutV1RoutingConfigurationByRoutingConfigIdResponses = {
+export type PatchV1RoutingConfigurationByRoutingConfigIdResponses = {
   /**
    * 200 response
    */
   200: RoutingConfigSuccess;
 };
 
-export type PutV1RoutingConfigurationByRoutingConfigIdResponse =
-  PutV1RoutingConfigurationByRoutingConfigIdResponses[keyof PutV1RoutingConfigurationByRoutingConfigIdResponses];
+export type PatchV1RoutingConfigurationByRoutingConfigIdResponse =
+  PatchV1RoutingConfigurationByRoutingConfigIdResponses[keyof PatchV1RoutingConfigurationByRoutingConfigIdResponses];
 
 export type PatchV1RoutingConfigurationByRoutingConfigIdSubmitData = {
   body?: never;
+  headers: {
+    /**
+     * Lock number of the current version of the routing configuration
+     */
+    'X-Lock-Number': number;
+  };
   path: {
     /**
      * ID of routing configuration to finalise
diff --git a/tests/test-team/fixtures/accessibility-analyze.ts b/tests/test-team/fixtures/accessibility-analyze.ts
index 8050924aa..d090ef17b 100644
--- a/tests/test-team/fixtures/accessibility-analyze.ts
+++ b/tests/test-team/fixtures/accessibility-analyze.ts
@@ -6,7 +6,6 @@ import { expect } from '@playwright/test';
 type Analyze = <T extends TemplateMgmtBasePage>(
   page: T,
   opts?: {
-    ids?: string[];
     beforeAnalyze?: (page: T) => Promise<void>;
   }
 ) => Promise<void>;
@@ -28,26 +27,17 @@ const makeAxeBuilder = (page: Page) =>
     .disableRules(DISABLED_RULES);
 
 export const test = base.extend<AccessibilityFixture>({
-  analyze: async ({ baseURL, page }, use) => {
+  analyze: async ({ page }, use) => {
     const analyze: Analyze = async (pageUnderTest, opts) => {
-      const { ids, beforeAnalyze } = opts ?? {};
+      const { beforeAnalyze } = opts ?? {};
 
-      await pageUnderTest.loadPage(...(ids ?? []));
+      await pageUnderTest.loadPage();
 
       if (beforeAnalyze) {
         await beforeAnalyze(pageUnderTest);
       }
 
-      const pageUrlSegments = (
-        pageUnderTest.constructor as typeof TemplateMgmtBasePage
-      ).pageUrlSegments;
-
-      await expect(page).toHaveURL(
-        // eslint-disable-next-line security/detect-non-literal-regexp
-        new RegExp(
-          `${baseURL}/templates/${pageUrlSegments.join('/[^/]+/')}(.*)`
-        )
-      );
+      await expect(page).toHaveURL(pageUnderTest.getUrl());
 
       const results = await makeAxeBuilder(page).analyze();
 
diff --git a/tests/test-team/helpers/factories/routing-config-factory.ts b/tests/test-team/helpers/factories/routing-config-factory.ts
index 835160459..1d234a70d 100644
--- a/tests/test-team/helpers/factories/routing-config-factory.ts
+++ b/tests/test-team/helpers/factories/routing-config-factory.ts
@@ -41,6 +41,7 @@ export const RoutingConfigFactory = {
       status: 'DRAFT',
       createdAt: new Date().toISOString(),
       updatedAt: new Date().toISOString(),
+      lockNumber: 0,
       defaultCascadeGroup: 'standard',
       ...routingConfig,
       ...apiPayload,
diff --git a/tests/test-team/helpers/template-mgmt-common.steps.ts b/tests/test-team/helpers/template-mgmt-common.steps.ts
index f420422ec..7f5ac4495 100644
--- a/tests/test-team/helpers/template-mgmt-common.steps.ts
+++ b/tests/test-team/helpers/template-mgmt-common.steps.ts
@@ -1,10 +1,8 @@
 import { test, expect } from '@playwright/test';
-import { TemplateMgmtBasePage } from '../pages/template-mgmt-base-page';
+import type { TemplateMgmtBasePage } from 'pages/template-mgmt-base-page';
 
 type CommonStepsProps = {
   page: TemplateMgmtBasePage;
-  id?: string;
-  additionalIds?: string[];
   baseURL?: string;
 };
 
@@ -36,24 +34,11 @@ const expectedFooterLinks: Record<string, FooterLinkSpec> = {
   },
 };
 
-const loadPageFromIds = async (
-  page: TemplateMgmtBasePage,
-  id?: string,
-  additionalIds?: string[]
-) => {
-  if (id) {
-    return await page.loadPage(id, ...(additionalIds ?? []));
-  }
-  return await page.loadPage();
-};
-
-export function assertSkipToMainContent({
-  page,
-  id,
-  additionalIds,
-}: CommonStepsProps) {
+export function assertSkipToMainContent(props: CommonStepsProps) {
   return test.step('when user clicks "skip to main content", then page heading is focused', async () => {
-    await loadPageFromIds(page, id, additionalIds);
+    const { page } = props;
+
+    await page.loadPage();
 
     await page.page.keyboard.press('Tab');
 
@@ -71,13 +56,11 @@ export function assertSkipToMainContent({
   });
 }
 
-export function assertHeaderWhenSignedOut({
-  page,
-  id,
-  additionalIds,
-}: CommonStepsProps) {
+export function assertHeaderWhenSignedOut(props: CommonStepsProps) {
   return test.step('when user is signed out, then header displays sign in link only', async () => {
-    await loadPageFromIds(page, id, additionalIds);
+    const { page } = props;
+
+    await page.loadPage();
 
     await expect(page.signInLink).toBeVisible();
     await expect(page.signOutLink).toBeHidden();
@@ -87,18 +70,16 @@ export function assertHeaderWhenSignedOut({
   });
 }
 
-export function assertHeaderWhenSignedIn({
-  page,
-  id,
-  additionalIds,
-  expectedDisplayName,
-  expectedClientName,
-}: CommonStepsProps & {
-  expectedDisplayName: string;
-  expectedClientName: string;
-}) {
+export function assertHeaderWhenSignedIn(
+  props: CommonStepsProps & {
+    expectedDisplayName: string;
+    expectedClientName: string;
+  }
+) {
   return test.step('when user is signed in, then header shows display name and client name', async () => {
-    await loadPageFromIds(page, id, additionalIds);
+    const { page, expectedClientName, expectedDisplayName } = props;
+
+    await page.loadPage();
 
     await expect(page.signOutLink).toBeVisible();
     await expect(page.signInLink).toBeHidden();
@@ -117,13 +98,11 @@ export function assertHeaderWhenSignedIn({
   });
 }
 
-export function assertHeaderLogoLink({
-  page,
-  id,
-  additionalIds,
-}: CommonStepsProps & { additionalIds?: string[] }) {
+export function assertHeaderLogoLink(props: CommonStepsProps) {
   return test.step('header logo is visible, correctly labelled and structured', async () => {
-    await loadPageFromIds(page, id, additionalIds);
+    const { page } = props;
+
+    await page.loadPage();
 
     const logoLink = page.headerLogoLink;
 
@@ -143,13 +122,13 @@ export function assertHeaderLogoLink({
   });
 }
 
-export function assertClickHeaderLogoRedirectsToStartPage({
-  page,
-  id,
-  baseURL,
-}: CommonStepsProps) {
+export function assertClickHeaderLogoRedirectsToStartPage(
+  props: CommonStepsProps
+) {
   return test.step('when user clicks header logo, they are redirected to start page', async () => {
-    await assertHeaderLogoLink({ page, id });
+    await assertHeaderLogoLink(props);
+
+    const { page, baseURL } = props;
 
     await page.headerLogoLink.click();
 
@@ -159,13 +138,11 @@ export function assertClickHeaderLogoRedirectsToStartPage({
   });
 }
 
-export function assertSignInLink({
-  page,
-  id,
-  additionalIds,
-}: CommonStepsProps & { additionalIds?: string[] }) {
+export function assertSignInLink(props: CommonStepsProps) {
   return test.step('when user clicks "Sign in", then user is redirected to "sign in page"', async () => {
-    await loadPageFromIds(page, id, additionalIds);
+    const { page } = props;
+
+    await page.loadPage();
 
     const link = page.signInLink;
 
@@ -176,13 +153,11 @@ export function assertSignInLink({
   });
 }
 
-export function assertSignOutLink({
-  page,
-  id,
-  additionalIds,
-}: CommonStepsProps & { additionalIds?: string[] }) {
+export function assertSignOutLink(props: CommonStepsProps) {
   return test.step('"Sign out", should direct user to signout', async () => {
-    await loadPageFromIds(page, id, additionalIds);
+    const { page } = props;
+
+    await page.loadPage();
 
     const link = page.signOutLink;
 
@@ -190,18 +165,17 @@ export function assertSignOutLink({
   });
 }
 
-export function assertHeaderNavigationLinksWhenSignedIn({
-  page,
-  id,
-  additionalIds,
-  routingEnabled,
-}: CommonStepsProps & { routingEnabled: boolean }) {
+export function assertHeaderNavigationLinksWhenSignedIn(
+  props: CommonStepsProps & { routingEnabled: boolean }
+) {
+  const { page, routingEnabled } = props;
+
   const description = routingEnabled
     ? 'Templates and Message plans links'
     : 'Templates link only';
 
   return test.step(`header shows ${description} when routing is ${routingEnabled ? 'enabled' : 'disabled'}`, async () => {
-    await loadPageFromIds(page, id, additionalIds);
+    await page.loadPage();
 
     const nav = page.headerNavigationLinks;
 
@@ -215,27 +189,25 @@ export function assertHeaderNavigationLinksWhenSignedIn({
   });
 }
 
-export function assertHeaderNavigationLinksWhenSignedOut({
-  page,
-  id,
-  additionalIds,
-}: CommonStepsProps) {
+export function assertHeaderNavigationLinksWhenSignedOut(
+  props: CommonStepsProps
+) {
   return test.step('header does not display navigation links when signed out', async () => {
-    await loadPageFromIds(page, id, additionalIds);
+    const { page } = props;
+
+    await page.loadPage();
 
     await expect(page.headerNavigationLinks).toHaveCount(0);
   });
 }
 
-export function assertGoBackLink({
-  page,
-  id,
-  baseURL,
-  expectedUrl,
-  additionalIds,
-}: CommonStepsProps & { expectedUrl: string }) {
+export function assertGoBackLink(
+  props: CommonStepsProps & { expectedUrl: string }
+) {
   return test.step('when user clicks "Go back", then user is redirected to previous page', async () => {
-    await loadPageFromIds(page, id, additionalIds);
+    const { page, baseURL, expectedUrl } = props;
+
+    await page.loadPage();
 
     await page.goBackLink.click();
 
@@ -245,25 +217,21 @@ export function assertGoBackLink({
   });
 }
 
-export function assertGoBackLinkNotPresent({
-  page,
-  id,
-  additionalIds,
-}: CommonStepsProps) {
+export function assertGoBackLinkNotPresent(props: CommonStepsProps) {
   return test.step('should not display "Go Back" link on page', async () => {
-    await loadPageFromIds(page, id, additionalIds);
+    const { page } = props;
+
+    await page.loadPage();
 
     await expect(page.goBackLink).toBeHidden();
   });
 }
 
-export function assertFooterLinks({
-  page,
-  id,
-  additionalIds,
-}: CommonStepsProps) {
+export function assertFooterLinks(props: CommonStepsProps) {
   return test.step('when page loads, then Page Footer should have the correct links', async () => {
-    await loadPageFromIds(page, id, additionalIds);
+    const { page } = props;
+
+    await page.loadPage();
 
     const promises = Object.values(expectedFooterLinks).map((linkSpec) =>
       expect(
diff --git a/tests/test-team/pages/email/template-mgmt-create-email-page.ts b/tests/test-team/pages/email/template-mgmt-create-email-page.ts
index a12300cc4..048e72633 100644
--- a/tests/test-team/pages/email/template-mgmt-create-email-page.ts
+++ b/tests/test-team/pages/email/template-mgmt-create-email-page.ts
@@ -1,9 +1,9 @@
 import { Locator, Page } from '@playwright/test';
 import { TemplateMgmtMessageFormatting } from '../template-mgmt-message-formatting';
-import { TemplateMgmtBasePageNonDynamic } from '../template-mgmt-base-page-non-dynamic';
+import { TemplateMgmtBasePage } from '../template-mgmt-base-page';
 
-export class TemplateMgmtCreateEmailPage extends TemplateMgmtBasePageNonDynamic {
-  static readonly pageUrlSegments = ['create-email-template'];
+export class TemplateMgmtCreateEmailPage extends TemplateMgmtBasePage {
+  static readonly pathTemplate = '/create-email-template';
 
   public readonly nameInput: Locator;
 
diff --git a/tests/test-team/pages/email/template-mgmt-edit-email-page.ts b/tests/test-team/pages/email/template-mgmt-edit-email-page.ts
index 075db611f..586e20524 100644
--- a/tests/test-team/pages/email/template-mgmt-edit-email-page.ts
+++ b/tests/test-team/pages/email/template-mgmt-edit-email-page.ts
@@ -1,9 +1,9 @@
 import { Locator, Page } from '@playwright/test';
 import { TemplateMgmtMessageFormatting } from '../template-mgmt-message-formatting';
-import { TemplateMgmtBasePageDynamic } from '../template-mgmt-base-page-dynamic';
+import { TemplateMgmtBasePage } from '../template-mgmt-base-page';
 
-export class TemplateMgmtEditEmailPage extends TemplateMgmtBasePageDynamic {
-  static readonly pageUrlSegments = ['edit-email-template'];
+export class TemplateMgmtEditEmailPage extends TemplateMgmtBasePage {
+  static readonly pathTemplate = '/edit-email-template/:templateId';
 
   public readonly nameInput: Locator;
 
diff --git a/tests/test-team/pages/email/template-mgmt-preview-email-page.ts b/tests/test-team/pages/email/template-mgmt-preview-email-page.ts
index d3b146b4a..5331ef865 100644
--- a/tests/test-team/pages/email/template-mgmt-preview-email-page.ts
+++ b/tests/test-team/pages/email/template-mgmt-preview-email-page.ts
@@ -2,7 +2,7 @@ import { Locator, Page } from '@playwright/test';
 import { TemplateMgmtPreviewBasePage } from '../template-mgmt-preview-base-page';
 
 export class TemplateMgmtPreviewEmailPage extends TemplateMgmtPreviewBasePage {
-  static readonly pageUrlSegments = ['preview-email-template'];
+  static readonly pathTemplate = '/preview-email-template/:templateId';
 
   public readonly editRadioOption: Locator;
 
diff --git a/tests/test-team/pages/email/template-mgmt-preview-submitted-email-page.ts b/tests/test-team/pages/email/template-mgmt-preview-submitted-email-page.ts
index 6bacccc23..54611cd2c 100644
--- a/tests/test-team/pages/email/template-mgmt-preview-submitted-email-page.ts
+++ b/tests/test-team/pages/email/template-mgmt-preview-submitted-email-page.ts
@@ -1,8 +1,9 @@
 import { Locator, Page } from '@playwright/test';
-import { TemplateMgmtPreviewSubmitedBasePage } from '../template-mgmt-preview-submitted-base-page';
+import { TemplateMgmtPreviewSubmittedBasePage } from '../template-mgmt-preview-submitted-base-page';
 
-export class TemplateMgmtPreviewSubmittedEmailPage extends TemplateMgmtPreviewSubmitedBasePage {
-  static readonly pageUrlSegments = ['preview-submitted-email-template'];
+export class TemplateMgmtPreviewSubmittedEmailPage extends TemplateMgmtPreviewSubmittedBasePage {
+  static readonly pathTemplate =
+    '/preview-submitted-email-template/:templateId';
 
   public readonly subjectLineText: Locator;
 
diff --git a/tests/test-team/pages/email/template-mgmt-submit-email-page.ts b/tests/test-team/pages/email/template-mgmt-submit-email-page.ts
index 618d03e2d..aab5a4b17 100644
--- a/tests/test-team/pages/email/template-mgmt-submit-email-page.ts
+++ b/tests/test-team/pages/email/template-mgmt-submit-email-page.ts
@@ -1,5 +1,5 @@
 import { TemplateMgmtSubmitBasePage } from '../template-mgmt-submit-base-page';
 
 export class TemplateMgmtSubmitEmailPage extends TemplateMgmtSubmitBasePage {
-  static readonly pageUrlSegments = ['submit-email-template'];
+  static readonly pathTemplate = '/submit-email-template/:templateId';
 }
diff --git a/tests/test-team/pages/email/template-mgmt-template-submitted-email-page.ts b/tests/test-team/pages/email/template-mgmt-template-submitted-email-page.ts
index a9cfc69d2..460601a19 100644
--- a/tests/test-team/pages/email/template-mgmt-template-submitted-email-page.ts
+++ b/tests/test-team/pages/email/template-mgmt-template-submitted-email-page.ts
@@ -1,5 +1,5 @@
 import { TemplateMgmtTemplateSubmittedBasePage } from '../template-mgmt-template-submitted-base-page';
 
 export class TemplateMgmtTemplateSubmittedEmailPage extends TemplateMgmtTemplateSubmittedBasePage {
-  static readonly pageUrlSegments = ['email-template-submitted'];
+  static readonly pathTemplate = '/email-template-submitted/:templateId';
 }
diff --git a/tests/test-team/pages/letter/template-mgmt-preview-letter-page.ts b/tests/test-team/pages/letter/template-mgmt-preview-letter-page.ts
index 3fd33ca4c..d4a5367f2 100644
--- a/tests/test-team/pages/letter/template-mgmt-preview-letter-page.ts
+++ b/tests/test-team/pages/letter/template-mgmt-preview-letter-page.ts
@@ -2,7 +2,7 @@ import { Locator, Page } from '@playwright/test';
 import { TemplateMgmtPreviewBasePage } from '../template-mgmt-preview-base-page';
 
 export class TemplateMgmtPreviewLetterPage extends TemplateMgmtPreviewBasePage {
-  static readonly pageUrlSegments = ['preview-letter-template'];
+  static readonly pathTemplate = '/preview-letter-template/:templateId';
 
   public static readonly urlRegexp = new RegExp(
     /\/templates\/preview-letter-template\/([\dA-Fa-f-]+)(?:\?from=edit)?$/
diff --git a/tests/test-team/pages/letter/template-mgmt-preview-submitted-letter-page.ts b/tests/test-team/pages/letter/template-mgmt-preview-submitted-letter-page.ts
index 592895903..1874743ff 100644
--- a/tests/test-team/pages/letter/template-mgmt-preview-submitted-letter-page.ts
+++ b/tests/test-team/pages/letter/template-mgmt-preview-submitted-letter-page.ts
@@ -1,5 +1,6 @@
-import { TemplateMgmtPreviewSubmitedBasePage } from '../template-mgmt-preview-submitted-base-page';
+import { TemplateMgmtPreviewSubmittedBasePage } from '../template-mgmt-preview-submitted-base-page';
 
-export class TemplateMgmtPreviewSubmittedLetterPage extends TemplateMgmtPreviewSubmitedBasePage {
-  static readonly pageUrlSegments = ['preview-submitted-letter-template'];
+export class TemplateMgmtPreviewSubmittedLetterPage extends TemplateMgmtPreviewSubmittedBasePage {
+  static readonly pathTemplate =
+    '/preview-submitted-letter-template/:templateId';
 }
diff --git a/tests/test-team/pages/letter/template-mgmt-submit-letter-page.ts b/tests/test-team/pages/letter/template-mgmt-submit-letter-page.ts
index 858b7b474..9fc4e5367 100644
--- a/tests/test-team/pages/letter/template-mgmt-submit-letter-page.ts
+++ b/tests/test-team/pages/letter/template-mgmt-submit-letter-page.ts
@@ -1,9 +1,9 @@
 import { TemplateMgmtSubmitBasePage } from '../template-mgmt-submit-base-page';
 
 export class TemplateMgmtSubmitLetterPage extends TemplateMgmtSubmitBasePage {
-  static readonly pageUrlSegments = ['submit-letter-template'];
+  static readonly pathTemplate = '/submit-letter-template/:templateId';
 
   public static readonly urlRegexp = new RegExp(
-    /\/templates\/submit-letter-template\/([\dA-Fa-f-]+)$/
+    /\/templates\/submit-letter-template\/([\dA-Fa-f-]+)\?lockNumber=\d+$/
   );
 }
diff --git a/tests/test-team/pages/letter/template-mgmt-template-submitted-letter-page.ts b/tests/test-team/pages/letter/template-mgmt-template-submitted-letter-page.ts
index 85e8b6173..f347e43eb 100644
--- a/tests/test-team/pages/letter/template-mgmt-template-submitted-letter-page.ts
+++ b/tests/test-team/pages/letter/template-mgmt-template-submitted-letter-page.ts
@@ -1,7 +1,7 @@
 import { TemplateMgmtTemplateSubmittedBasePage } from '../template-mgmt-template-submitted-base-page';
 
 export class TemplateMgmtTemplateSubmittedLetterPage extends TemplateMgmtTemplateSubmittedBasePage {
-  static readonly pageUrlSegments = ['letter-template-submitted'];
+  static readonly pathTemplate = '/letter-template-submitted/:templateId';
 
   public static readonly urlRegexp = new RegExp(
     /\/templates\/letter-template-submitted\/([\dA-Fa-f-]+)$/
diff --git a/tests/test-team/pages/letter/template-mgmt-upload-letter-missing-campaign-client-id-page.ts b/tests/test-team/pages/letter/template-mgmt-upload-letter-missing-campaign-client-id-page.ts
index 8458bc8c1..38f7a4e3c 100644
--- a/tests/test-team/pages/letter/template-mgmt-upload-letter-missing-campaign-client-id-page.ts
+++ b/tests/test-team/pages/letter/template-mgmt-upload-letter-missing-campaign-client-id-page.ts
@@ -1,10 +1,9 @@
 import { Locator, Page } from '@playwright/test';
-import { TemplateMgmtBasePageNonDynamic } from '../template-mgmt-base-page-non-dynamic';
+import { TemplateMgmtBasePage } from '../template-mgmt-base-page';
 
-export class TemplateMgmtUploadLetterMissingCampaignClientIdPage extends TemplateMgmtBasePageNonDynamic {
-  static readonly pageUrlSegments = [
-    'upload-letter-template/client-id-and-campaign-id-required',
-  ];
+export class TemplateMgmtUploadLetterMissingCampaignClientIdPage extends TemplateMgmtBasePage {
+  static readonly pathTemplate =
+    '/upload-letter-template/client-id-and-campaign-id-required';
 
   public readonly errorDetailsInsetText: Locator;
   public readonly goBackLink: Locator;
diff --git a/tests/test-team/pages/letter/template-mgmt-upload-letter-page.ts b/tests/test-team/pages/letter/template-mgmt-upload-letter-page.ts
index 59eb507db..548d4d5dc 100644
--- a/tests/test-team/pages/letter/template-mgmt-upload-letter-page.ts
+++ b/tests/test-team/pages/letter/template-mgmt-upload-letter-page.ts
@@ -1,8 +1,8 @@
 import { Locator, Page } from '@playwright/test';
-import { TemplateMgmtBasePageNonDynamic } from '../template-mgmt-base-page-non-dynamic';
+import { TemplateMgmtBasePage } from '../template-mgmt-base-page';
 
-export class TemplateMgmtUploadLetterPage extends TemplateMgmtBasePageNonDynamic {
-  static readonly pageUrlSegments = ['upload-letter-template'];
+export class TemplateMgmtUploadLetterPage extends TemplateMgmtBasePage {
+  static readonly pathTemplate = '/upload-letter-template';
 
   public readonly nameInput: Locator;
 
diff --git a/tests/test-team/pages/nhs-app/template-mgmt-create-nhs-app-page.ts b/tests/test-team/pages/nhs-app/template-mgmt-create-nhs-app-page.ts
index 9e9200766..652498429 100644
--- a/tests/test-team/pages/nhs-app/template-mgmt-create-nhs-app-page.ts
+++ b/tests/test-team/pages/nhs-app/template-mgmt-create-nhs-app-page.ts
@@ -1,9 +1,9 @@
 import { expect, Locator, Page } from '@playwright/test';
 import { TemplateMgmtMessageFormatting } from '../template-mgmt-message-formatting';
-import { TemplateMgmtBasePageNonDynamic } from '../template-mgmt-base-page-non-dynamic';
+import { TemplateMgmtBasePage } from '../template-mgmt-base-page';
 
-export class TemplateMgmtCreateNhsAppPage extends TemplateMgmtBasePageNonDynamic {
-  static readonly pageUrlSegments = ['create-nhs-app-template'];
+export class TemplateMgmtCreateNhsAppPage extends TemplateMgmtBasePage {
+  static readonly pathTemplate = '/create-nhs-app-template';
 
   public readonly nameInput: Locator;
 
diff --git a/tests/test-team/pages/nhs-app/template-mgmt-edit-nhs-app-page.ts b/tests/test-team/pages/nhs-app/template-mgmt-edit-nhs-app-page.ts
index 97fa5a8f3..9f4d70f4b 100644
--- a/tests/test-team/pages/nhs-app/template-mgmt-edit-nhs-app-page.ts
+++ b/tests/test-team/pages/nhs-app/template-mgmt-edit-nhs-app-page.ts
@@ -1,9 +1,9 @@
 import { Locator, Page, expect } from '@playwright/test';
 import { TemplateMgmtMessageFormatting } from '../template-mgmt-message-formatting';
-import { TemplateMgmtBasePageDynamic } from '../template-mgmt-base-page-dynamic';
+import { TemplateMgmtBasePage } from '../template-mgmt-base-page';
 
-export class TemplateMgmtEditNhsAppPage extends TemplateMgmtBasePageDynamic {
-  static readonly pageUrlSegments = ['edit-nhs-app-template'];
+export class TemplateMgmtEditNhsAppPage extends TemplateMgmtBasePage {
+  static readonly pathTemplate = '/edit-nhs-app-template/:templateId';
 
   public readonly nameInput: Locator;
 
@@ -49,12 +49,12 @@ export class TemplateMgmtEditNhsAppPage extends TemplateMgmtBasePageDynamic {
     await expect(characterCountLocator).toBeVisible();
   }
 
-  async loadPage(templateId: string) {
-    await super.loadPage(templateId);
+  async loadPage() {
+    await super.loadPage();
     await this.waitForPageToLoad();
   }
 
-  async attemptToLoadPageExpectFailure(templateId: string) {
-    await super.loadPage(templateId);
+  async attemptToLoadPageExpectFailure() {
+    await super.loadPage();
   }
 }
diff --git a/tests/test-team/pages/nhs-app/template-mgmt-preview-nhs-app-page.ts b/tests/test-team/pages/nhs-app/template-mgmt-preview-nhs-app-page.ts
index 75f1de0c8..2e3ac1678 100644
--- a/tests/test-team/pages/nhs-app/template-mgmt-preview-nhs-app-page.ts
+++ b/tests/test-team/pages/nhs-app/template-mgmt-preview-nhs-app-page.ts
@@ -2,7 +2,7 @@ import { Locator, Page } from '@playwright/test';
 import { TemplateMgmtPreviewBasePage } from '../template-mgmt-preview-base-page';
 
 export class TemplateMgmtPreviewNhsAppPage extends TemplateMgmtPreviewBasePage {
-  static readonly pageUrlSegments = ['preview-nhs-app-template'];
+  static readonly pathTemplate = '/preview-nhs-app-template/:templateId';
 
   public readonly editRadioOption: Locator;
 
diff --git a/tests/test-team/pages/nhs-app/template-mgmt-preview-submitted-nhs-app-page.ts b/tests/test-team/pages/nhs-app/template-mgmt-preview-submitted-nhs-app-page.ts
index 594ecf3f6..9e729e36d 100644
--- a/tests/test-team/pages/nhs-app/template-mgmt-preview-submitted-nhs-app-page.ts
+++ b/tests/test-team/pages/nhs-app/template-mgmt-preview-submitted-nhs-app-page.ts
@@ -1,8 +1,9 @@
 import { Locator, Page } from '@playwright/test';
-import { TemplateMgmtPreviewSubmitedBasePage } from '../template-mgmt-preview-submitted-base-page';
+import { TemplateMgmtPreviewSubmittedBasePage } from '../template-mgmt-preview-submitted-base-page';
 
-export class TemplateMgmtPreviewSubmittedNhsAppPage extends TemplateMgmtPreviewSubmitedBasePage {
-  static readonly pageUrlSegments = ['preview-submitted-nhs-app-template'];
+export class TemplateMgmtPreviewSubmittedNhsAppPage extends TemplateMgmtPreviewSubmittedBasePage {
+  static readonly pathTemplate =
+    '/preview-submitted-nhs-app-template/:templateId';
 
   public readonly messageText: Locator;
 
diff --git a/tests/test-team/pages/nhs-app/template-mgmt-submit-nhs-app-page.ts b/tests/test-team/pages/nhs-app/template-mgmt-submit-nhs-app-page.ts
index db2572db5..d377341db 100644
--- a/tests/test-team/pages/nhs-app/template-mgmt-submit-nhs-app-page.ts
+++ b/tests/test-team/pages/nhs-app/template-mgmt-submit-nhs-app-page.ts
@@ -1,5 +1,5 @@
 import { TemplateMgmtSubmitBasePage } from '../template-mgmt-submit-base-page';
 
 export class TemplateMgmtSubmitNhsAppPage extends TemplateMgmtSubmitBasePage {
-  static readonly pageUrlSegments = ['submit-nhs-app-template'];
+  static readonly pathTemplate = '/submit-nhs-app-template/:templateId';
 }
diff --git a/tests/test-team/pages/nhs-app/template-mgmt-template-submitted-nhs-app-page.ts b/tests/test-team/pages/nhs-app/template-mgmt-template-submitted-nhs-app-page.ts
index 9c1429ae5..407149262 100644
--- a/tests/test-team/pages/nhs-app/template-mgmt-template-submitted-nhs-app-page.ts
+++ b/tests/test-team/pages/nhs-app/template-mgmt-template-submitted-nhs-app-page.ts
@@ -1,5 +1,5 @@
 import { TemplateMgmtTemplateSubmittedBasePage } from '../template-mgmt-template-submitted-base-page';
 
 export class TemplateMgmtTemplateSubmittedNhsAppPage extends TemplateMgmtTemplateSubmittedBasePage {
-  static readonly pageUrlSegments = ['nhs-app-template-submitted'];
+  static readonly pathTemplate = '/nhs-app-template-submitted/:templateId';
 }
diff --git a/tests/test-team/pages/routing/campaign-id-required-page.ts b/tests/test-team/pages/routing/campaign-id-required-page.ts
index 2e0a09aac..1b939abbc 100644
--- a/tests/test-team/pages/routing/campaign-id-required-page.ts
+++ b/tests/test-team/pages/routing/campaign-id-required-page.ts
@@ -1,8 +1,8 @@
 import { Locator, Page } from '@playwright/test';
-import { TemplateMgmtBasePageNonDynamic } from '../template-mgmt-base-page-non-dynamic';
+import { TemplateMgmtBasePage } from '../template-mgmt-base-page';
 
-export class RoutingMessagePlanCampaignIdRequiredPage extends TemplateMgmtBasePageNonDynamic {
-  static readonly pageUrlSegments = ['message-plans/campaign-id-required'];
+export class RoutingMessagePlanCampaignIdRequiredPage extends TemplateMgmtBasePage {
+  static readonly pathTemplate = '/message-plans/campaign-id-required';
 
   public readonly errorDetailsInsetText: Locator;
   public readonly goBackLink: Locator;
diff --git a/tests/test-team/pages/routing/choose-message-order-page.ts b/tests/test-team/pages/routing/choose-message-order-page.ts
index 5a6a4beee..fe20dcd87 100644
--- a/tests/test-team/pages/routing/choose-message-order-page.ts
+++ b/tests/test-team/pages/routing/choose-message-order-page.ts
@@ -1,8 +1,8 @@
 import { Locator, type Page } from '@playwright/test';
-import { TemplateMgmtBasePageNonDynamic } from '../template-mgmt-base-page-non-dynamic';
+import { TemplateMgmtBasePage } from '../template-mgmt-base-page';
 
-export class RoutingChooseMessageOrderPage extends TemplateMgmtBasePageNonDynamic {
-  static readonly pageUrlSegments = ['message-plans/choose-message-order'];
+export class RoutingChooseMessageOrderPage extends TemplateMgmtBasePage {
+  static readonly pathTemplate = '/message-plans/choose-message-order';
 
   readonly radioButtons: Locator;
 
diff --git a/tests/test-team/pages/routing/choose-templates-page.ts b/tests/test-team/pages/routing/choose-templates-page.ts
index 9c7903416..4d884f247 100644
--- a/tests/test-team/pages/routing/choose-templates-page.ts
+++ b/tests/test-team/pages/routing/choose-templates-page.ts
@@ -1,8 +1,9 @@
 import { Locator, type Page } from '@playwright/test';
-import { TemplateMgmtBasePageDynamic } from 'pages/template-mgmt-base-page-dynamic';
+import { TemplateMgmtBasePage } from 'pages/template-mgmt-base-page';
 
-export class RoutingChooseTemplatesPage extends TemplateMgmtBasePageDynamic {
-  static readonly pageUrlSegments = ['message-plans/choose-templates'];
+export class RoutingChooseTemplatesPage extends TemplateMgmtBasePage {
+  static readonly pathTemplate =
+    '/message-plans/choose-templates/:messagePlanId';
 
   public readonly errorSummary: Locator;
 
diff --git a/tests/test-team/pages/routing/create-message-plan-page.ts b/tests/test-team/pages/routing/create-message-plan-page.ts
index f5e5a4ad4..28f93adae 100644
--- a/tests/test-team/pages/routing/create-message-plan-page.ts
+++ b/tests/test-team/pages/routing/create-message-plan-page.ts
@@ -1,8 +1,8 @@
 import { Locator, type Page } from '@playwright/test';
-import { TemplateMgmtBasePageNonDynamic } from '../template-mgmt-base-page-non-dynamic';
+import { TemplateMgmtBasePage } from '../template-mgmt-base-page';
 
-export class RoutingCreateMessagePlanPage extends TemplateMgmtBasePageNonDynamic {
-  static readonly pageUrlSegments = ['message-plans/create-message-plan'];
+export class RoutingCreateMessagePlanPage extends TemplateMgmtBasePage {
+  static readonly pathTemplate = '/message-plans/create-message-plan';
 
   readonly submitButton: Locator;
 
@@ -18,7 +18,7 @@ export class RoutingCreateMessagePlanPage extends TemplateMgmtBasePageNonDynamic
 
   readonly singleCampaignIdElement: Locator;
 
-  constructor(page: Page, queryParameters?: { messageOrder: string }) {
+  constructor(page: Page) {
     super(page);
     this.submitButton = page.getByTestId('submit-button');
     this.goBackLink = page.getByTestId('go-back-link');
@@ -26,10 +26,6 @@ export class RoutingCreateMessagePlanPage extends TemplateMgmtBasePageNonDynamic
     this.campaignIdSelector = page.getByTestId('campaign-id-field');
     this.singleCampaignIdElement = page.getByTestId('single-campaign-id');
 
-    if (queryParameters) {
-      this.queryParameters = new URLSearchParams(queryParameters);
-    }
-
     this.nameFieldError = page.locator('#name--error-message');
 
     this.campaignIdFieldError = page.locator('#campaignId--error-message');
diff --git a/tests/test-team/pages/routing/edit-message-plan-settings-page.ts b/tests/test-team/pages/routing/edit-message-plan-settings-page.ts
index b10c54fc6..691283618 100644
--- a/tests/test-team/pages/routing/edit-message-plan-settings-page.ts
+++ b/tests/test-team/pages/routing/edit-message-plan-settings-page.ts
@@ -1,10 +1,9 @@
 import { Locator, type Page } from '@playwright/test';
-import { TemplateMgmtBasePageDynamic } from 'pages/template-mgmt-base-page-dynamic';
+import { TemplateMgmtBasePage } from 'pages/template-mgmt-base-page';
 
-export class RoutingEditMessagePlanSettingsPage extends TemplateMgmtBasePageDynamic {
-  static readonly pageUrlSegments = [
-    'message-plans/edit-message-plan-settings',
-  ];
+export class RoutingEditMessagePlanSettingsPage extends TemplateMgmtBasePage {
+  static readonly pathTemplate =
+    '/message-plans/edit-message-plan-settings/:messagePlanId';
 
   readonly submitButton: Locator;
 
diff --git a/tests/test-team/pages/routing/email/choose-email-template-page.ts b/tests/test-team/pages/routing/email/choose-email-template-page.ts
index bae8e0457..e0dc7bc0d 100644
--- a/tests/test-team/pages/routing/email/choose-email-template-page.ts
+++ b/tests/test-team/pages/routing/email/choose-email-template-page.ts
@@ -1,8 +1,9 @@
 import { type Page } from '@playwright/test';
-import { TemplateMgmtBasePageDynamic } from 'pages/template-mgmt-base-page-dynamic';
+import { TemplateMgmtBasePage } from 'pages/template-mgmt-base-page';
 
-export class RoutingChooseEmailTemplatePage extends TemplateMgmtBasePageDynamic {
-  static readonly pageUrlSegments = ['message-plans/choose-email-template'];
+export class RoutingChooseEmailTemplatePage extends TemplateMgmtBasePage {
+  static readonly pathTemplate =
+    '/message-plans/choose-email-template/:messagePlanId';
 
   constructor(page: Page) {
     super(page);
diff --git a/tests/test-team/pages/routing/email/preview-email-page.ts b/tests/test-team/pages/routing/email/preview-email-page.ts
index e6a17b162..12667525d 100644
--- a/tests/test-team/pages/routing/email/preview-email-page.ts
+++ b/tests/test-team/pages/routing/email/preview-email-page.ts
@@ -1,13 +1,6 @@
-import { type Page } from '@playwright/test';
-import { TemplateMgmtBasePageDynamic } from 'pages/template-mgmt-base-page-dynamic';
+import { TemplateMgmtBasePage } from 'pages/template-mgmt-base-page';
 
-export class RoutingPreviewEmailTemplatePage extends TemplateMgmtBasePageDynamic {
-  static readonly pageUrlSegments = [
-    'message-plans/choose-email-template',
-    'preview-template',
-  ];
-
-  constructor(page: Page) {
-    super(page);
-  }
+export class RoutingPreviewEmailTemplatePage extends TemplateMgmtBasePage {
+  static readonly pathTemplate =
+    '/message-plans/choose-email-template/:messagePlanId/preview-template/:templateId';
 }
diff --git a/tests/test-team/pages/routing/invalid-message-plan-page.ts b/tests/test-team/pages/routing/invalid-message-plan-page.ts
index 992a31aa9..87efd0a34 100644
--- a/tests/test-team/pages/routing/invalid-message-plan-page.ts
+++ b/tests/test-team/pages/routing/invalid-message-plan-page.ts
@@ -1,5 +1,5 @@
-import { TemplateMgmtBasePageNonDynamic } from '../template-mgmt-base-page-non-dynamic';
+import { TemplateMgmtBasePage } from '../template-mgmt-base-page';
 
-export class RoutingInvalidMessagePlanPage extends TemplateMgmtBasePageNonDynamic {
-  static readonly pageUrlSegments = ['message-plans/invalid'];
+export class RoutingInvalidMessagePlanPage extends TemplateMgmtBasePage {
+  static readonly pathTemplate = '/message-plans/invalid';
 }
diff --git a/tests/test-team/pages/routing/letter/choose-standard-letter-template-page.ts b/tests/test-team/pages/routing/letter/choose-standard-letter-template-page.ts
index fd532b337..d191e4137 100644
--- a/tests/test-team/pages/routing/letter/choose-standard-letter-template-page.ts
+++ b/tests/test-team/pages/routing/letter/choose-standard-letter-template-page.ts
@@ -1,12 +1,6 @@
-import { type Page } from '@playwright/test';
-import { TemplateMgmtBasePageDynamic } from 'pages/template-mgmt-base-page-dynamic';
+import { TemplateMgmtBasePage } from 'pages/template-mgmt-base-page';
 
-export class RoutingChooseStandardLetterTemplatePage extends TemplateMgmtBasePageDynamic {
-  static readonly pageUrlSegments = [
-    'message-plans/choose-standard-english-letter-template',
-  ];
-
-  constructor(page: Page) {
-    super(page);
-  }
+export class RoutingChooseStandardLetterTemplatePage extends TemplateMgmtBasePage {
+  static readonly pathTemplate =
+    '/message-plans/choose-standard-english-letter-template/:messagePlanId';
 }
diff --git a/tests/test-team/pages/routing/letter/preview-standard-letter-page.ts b/tests/test-team/pages/routing/letter/preview-standard-letter-page.ts
index 11c35db1d..232cb6310 100644
--- a/tests/test-team/pages/routing/letter/preview-standard-letter-page.ts
+++ b/tests/test-team/pages/routing/letter/preview-standard-letter-page.ts
@@ -1,13 +1,6 @@
-import { type Page } from '@playwright/test';
-import { TemplateMgmtBasePageDynamic } from 'pages/template-mgmt-base-page-dynamic';
+import { TemplateMgmtBasePage } from 'pages/template-mgmt-base-page';
 
-export class RoutingPreviewStandardLetterTemplatePage extends TemplateMgmtBasePageDynamic {
-  static readonly pageUrlSegments = [
-    'message-plans/choose-standard-english-letter-template',
-    'preview-template',
-  ];
-
-  constructor(page: Page) {
-    super(page);
-  }
+export class RoutingPreviewStandardLetterTemplatePage extends TemplateMgmtBasePage {
+  static readonly pathTemplate =
+    '/message-plans/choose-standard-english-letter-template/:messagePlanId/preview-template/:templateId';
 }
diff --git a/tests/test-team/pages/routing/message-plans-page.ts b/tests/test-team/pages/routing/message-plans-page.ts
index 3d53051e1..96fcb6ddf 100644
--- a/tests/test-team/pages/routing/message-plans-page.ts
+++ b/tests/test-team/pages/routing/message-plans-page.ts
@@ -1,8 +1,8 @@
 import { Locator, type Page } from '@playwright/test';
-import { TemplateMgmtBasePageNonDynamic } from '../template-mgmt-base-page-non-dynamic';
+import { TemplateMgmtBasePage } from '../template-mgmt-base-page';
 
-export class RoutingMessagePlansPage extends TemplateMgmtBasePageNonDynamic {
-  static readonly pageUrlSegments = ['message-plans'];
+export class RoutingMessagePlansPage extends TemplateMgmtBasePage {
+  static readonly pathTemplate = '/message-plans';
 
   readonly messagePlanStatusInfo: Locator;
 
diff --git a/tests/test-team/pages/routing/nhs-app/choose-nhs-app-template-page.ts b/tests/test-team/pages/routing/nhs-app/choose-nhs-app-template-page.ts
index 72b45d973..5eb4dfed6 100644
--- a/tests/test-team/pages/routing/nhs-app/choose-nhs-app-template-page.ts
+++ b/tests/test-team/pages/routing/nhs-app/choose-nhs-app-template-page.ts
@@ -1,8 +1,9 @@
 import { type Page } from '@playwright/test';
-import { TemplateMgmtBasePageDynamic } from 'pages/template-mgmt-base-page-dynamic';
+import { TemplateMgmtBasePage } from 'pages/template-mgmt-base-page';
 
-export class RoutingChooseNhsAppTemplatePage extends TemplateMgmtBasePageDynamic {
-  static readonly pageUrlSegments = ['message-plans/choose-nhs-app-template'];
+export class RoutingChooseNhsAppTemplatePage extends TemplateMgmtBasePage {
+  static readonly pathTemplate =
+    '/message-plans/choose-nhs-app-template/:messagePlanId';
 
   constructor(page: Page) {
     super(page);
diff --git a/tests/test-team/pages/routing/nhs-app/preview-nhs-app-page.ts b/tests/test-team/pages/routing/nhs-app/preview-nhs-app-page.ts
index e0aa97923..021006d7e 100644
--- a/tests/test-team/pages/routing/nhs-app/preview-nhs-app-page.ts
+++ b/tests/test-team/pages/routing/nhs-app/preview-nhs-app-page.ts
@@ -1,13 +1,6 @@
-import { type Page } from '@playwright/test';
-import { TemplateMgmtBasePageDynamic } from 'pages/template-mgmt-base-page-dynamic';
+import { TemplateMgmtBasePage } from 'pages/template-mgmt-base-page';
 
-export class RoutingPreviewNhsAppTemplatePage extends TemplateMgmtBasePageDynamic {
-  static readonly pageUrlSegments = [
-    'message-plans/choose-nhs-app-template',
-    'preview-template',
-  ];
-
-  constructor(page: Page) {
-    super(page);
-  }
+export class RoutingPreviewNhsAppTemplatePage extends TemplateMgmtBasePage {
+  static readonly pathTemplate =
+    '/message-plans/choose-nhs-app-template/:messagePlanId/preview-template/:templateId';
 }
diff --git a/tests/test-team/pages/routing/sms/choose-sms-template-page.ts b/tests/test-team/pages/routing/sms/choose-sms-template-page.ts
index b49fd9c92..ecca6b220 100644
--- a/tests/test-team/pages/routing/sms/choose-sms-template-page.ts
+++ b/tests/test-team/pages/routing/sms/choose-sms-template-page.ts
@@ -1,12 +1,6 @@
-import { type Page } from '@playwright/test';
-import { TemplateMgmtBasePageDynamic } from 'pages/template-mgmt-base-page-dynamic';
+import { TemplateMgmtBasePage } from 'pages/template-mgmt-base-page';
 
-export class RoutingChooseTextMessageTemplatePage extends TemplateMgmtBasePageDynamic {
-  static readonly pageUrlSegments = [
-    'message-plans/choose-text-message-template',
-  ];
-
-  constructor(page: Page) {
-    super(page);
-  }
+export class RoutingChooseTextMessageTemplatePage extends TemplateMgmtBasePage {
+  static readonly pathTemplate =
+    '/message-plans/choose-text-message-template/:messagePlanId';
 }
diff --git a/tests/test-team/pages/routing/sms/preview-sms-template-page.ts b/tests/test-team/pages/routing/sms/preview-sms-template-page.ts
index 3c44ce303..65ef1d191 100644
--- a/tests/test-team/pages/routing/sms/preview-sms-template-page.ts
+++ b/tests/test-team/pages/routing/sms/preview-sms-template-page.ts
@@ -1,13 +1,6 @@
-import { type Page } from '@playwright/test';
-import { TemplateMgmtBasePageDynamic } from 'pages/template-mgmt-base-page-dynamic';
+import { TemplateMgmtBasePage } from 'pages/template-mgmt-base-page';
 
-export class RoutingPreviewSmsTemplatePage extends TemplateMgmtBasePageDynamic {
-  static readonly pageUrlSegments = [
-    'message-plans/choose-text-message-template',
-    'preview-template',
-  ];
-
-  constructor(page: Page) {
-    super(page);
-  }
+export class RoutingPreviewSmsTemplatePage extends TemplateMgmtBasePage {
+  static readonly pathTemplate =
+    '/message-plans/choose-text-message-template/:messagePlanId/preview-template/:templateId';
 }
diff --git a/tests/test-team/pages/sms/template-mgmt-create-sms-page.ts b/tests/test-team/pages/sms/template-mgmt-create-sms-page.ts
index fc0698ca9..764cb7996 100644
--- a/tests/test-team/pages/sms/template-mgmt-create-sms-page.ts
+++ b/tests/test-team/pages/sms/template-mgmt-create-sms-page.ts
@@ -1,9 +1,9 @@
 import { expect, Locator, Page } from '@playwright/test';
 import { TemplateMgmtMessageFormatting } from '../template-mgmt-message-formatting';
-import { TemplateMgmtBasePageNonDynamic } from '../template-mgmt-base-page-non-dynamic';
+import { TemplateMgmtBasePage } from '../template-mgmt-base-page';
 
-export class TemplateMgmtCreateSmsPage extends TemplateMgmtBasePageNonDynamic {
-  static readonly pageUrlSegments = ['create-text-message-template'];
+export class TemplateMgmtCreateSmsPage extends TemplateMgmtBasePage {
+  static readonly pathTemplate = '/create-text-message-template';
 
   public readonly nameInput: Locator;
 
diff --git a/tests/test-team/pages/sms/template-mgmt-edit-sms-page.ts b/tests/test-team/pages/sms/template-mgmt-edit-sms-page.ts
index 537f7d25a..398cb7985 100644
--- a/tests/test-team/pages/sms/template-mgmt-edit-sms-page.ts
+++ b/tests/test-team/pages/sms/template-mgmt-edit-sms-page.ts
@@ -1,9 +1,9 @@
 import { expect, Locator, Page } from '@playwright/test';
 import { TemplateMgmtMessageFormatting } from '../template-mgmt-message-formatting';
-import { TemplateMgmtBasePageDynamic } from '../template-mgmt-base-page-dynamic';
+import { TemplateMgmtBasePage } from '../template-mgmt-base-page';
 
-export class TemplateMgmtEditSmsPage extends TemplateMgmtBasePageDynamic {
-  static readonly pageUrlSegments = ['edit-text-message-template'];
+export class TemplateMgmtEditSmsPage extends TemplateMgmtBasePage {
+  static readonly pathTemplate = '/edit-text-message-template/:templateId';
 
   public readonly nameInput: Locator;
 
@@ -48,8 +48,8 @@ export class TemplateMgmtEditSmsPage extends TemplateMgmtBasePageDynamic {
     );
   }
 
-  async loadPage(templateId: string) {
-    await super.loadPage(templateId);
+  async loadPage() {
+    await super.loadPage();
     await this.waitForPageToLoad();
   }
 
@@ -64,7 +64,7 @@ export class TemplateMgmtEditSmsPage extends TemplateMgmtBasePageDynamic {
     await this.saveAndPreviewButton.click();
   }
 
-  async attemptToLoadPageExpectFailure(templateId: string) {
-    await super.loadPage(templateId);
+  async attemptToLoadPageExpectFailure() {
+    await super.loadPage();
   }
 }
diff --git a/tests/test-team/pages/sms/template-mgmt-preview-sms-page.ts b/tests/test-team/pages/sms/template-mgmt-preview-sms-page.ts
index 9d1a092dc..ebafc7932 100644
--- a/tests/test-team/pages/sms/template-mgmt-preview-sms-page.ts
+++ b/tests/test-team/pages/sms/template-mgmt-preview-sms-page.ts
@@ -2,7 +2,7 @@ import { Locator, Page } from '@playwright/test';
 import { TemplateMgmtPreviewBasePage } from '../template-mgmt-preview-base-page';
 
 export class TemplateMgmtPreviewSmsPage extends TemplateMgmtPreviewBasePage {
-  static readonly pageUrlSegments = ['preview-text-message-template'];
+  static readonly pathTemplate = '/preview-text-message-template/:templateId';
 
   public readonly editRadioOption: Locator;
 
diff --git a/tests/test-team/pages/sms/template-mgmt-preview-submitted-sms-page.ts b/tests/test-team/pages/sms/template-mgmt-preview-submitted-sms-page.ts
index 8e7159e61..de89f205e 100644
--- a/tests/test-team/pages/sms/template-mgmt-preview-submitted-sms-page.ts
+++ b/tests/test-team/pages/sms/template-mgmt-preview-submitted-sms-page.ts
@@ -1,8 +1,9 @@
 import { Locator, Page } from '@playwright/test';
-import { TemplateMgmtPreviewSubmitedBasePage } from '../template-mgmt-preview-submitted-base-page';
+import { TemplateMgmtPreviewSubmittedBasePage } from '../template-mgmt-preview-submitted-base-page';
 
-export class TemplateMgmtPreviewSubmittedSmsPage extends TemplateMgmtPreviewSubmitedBasePage {
-  static readonly pageUrlSegments = ['preview-submitted-text-message-template'];
+export class TemplateMgmtPreviewSubmittedSmsPage extends TemplateMgmtPreviewSubmittedBasePage {
+  static readonly pathTemplate =
+    '/preview-submitted-text-message-template/:templateId';
 
   public readonly messageText: Locator;
 
diff --git a/tests/test-team/pages/sms/template-mgmt-submit-sms-page.ts b/tests/test-team/pages/sms/template-mgmt-submit-sms-page.ts
index 07a0674a0..ed83b76e5 100644
--- a/tests/test-team/pages/sms/template-mgmt-submit-sms-page.ts
+++ b/tests/test-team/pages/sms/template-mgmt-submit-sms-page.ts
@@ -1,5 +1,5 @@
 import { TemplateMgmtSubmitBasePage } from '../template-mgmt-submit-base-page';
 
 export class TemplateMgmtSubmitSmsPage extends TemplateMgmtSubmitBasePage {
-  static readonly pageUrlSegments = ['submit-text-message-template'];
+  static readonly pathTemplate = '/submit-text-message-template/:templateId';
 }
diff --git a/tests/test-team/pages/sms/template-mgmt-template-submitted-sms-page.ts b/tests/test-team/pages/sms/template-mgmt-template-submitted-sms-page.ts
index 8c76b28f3..da4607f4d 100644
--- a/tests/test-team/pages/sms/template-mgmt-template-submitted-sms-page.ts
+++ b/tests/test-team/pages/sms/template-mgmt-template-submitted-sms-page.ts
@@ -1,5 +1,5 @@
 import { TemplateMgmtTemplateSubmittedBasePage } from '../template-mgmt-template-submitted-base-page';
 
 export class TemplateMgmtTemplateSubmittedSmsPage extends TemplateMgmtTemplateSubmittedBasePage {
-  static readonly pageUrlSegments = ['text-message-template-submitted'];
+  static readonly pathTemplate = '/text-message-template-submitted/:templateId';
 }
diff --git a/tests/test-team/pages/template-mgmt-base-page-dynamic.ts b/tests/test-team/pages/template-mgmt-base-page-dynamic.ts
deleted file mode 100644
index 9226a1ba9..000000000
--- a/tests/test-team/pages/template-mgmt-base-page-dynamic.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { type Page } from '@playwright/test';
-import { TemplateMgmtBasePage } from './template-mgmt-base-page';
-
-export abstract class TemplateMgmtBasePageDynamic extends TemplateMgmtBasePage {
-  static readonly dynamicPage = true;
-
-  constructor(page: Page) {
-    super(page);
-  }
-
-  async loadPage(...idParameters: string[]) {
-    const { appUrlSegment, pageUrlSegments } = this
-      .constructor as typeof TemplateMgmtBasePageDynamic;
-
-    if (!pageUrlSegments || pageUrlSegments.length === 0) {
-      throw new Error('Invalid pageUrlSegments');
-    }
-
-    if (idParameters.length !== pageUrlSegments.length) {
-      throw new Error('ID parameters and URL segments mismatch');
-    }
-
-    await this.navigateTo(
-      `/${appUrlSegment}/${pageUrlSegments
-        .map((segment, index) => `${segment}/${idParameters[index]}`)
-        .join('/')}`
-    );
-  }
-
-  getIdFromUrl(segmentIndex: number = 0): string | undefined {
-    const { pageUrlSegments } = this
-      .constructor as typeof TemplateMgmtBasePageDynamic;
-
-    const match = this.page
-      .url()
-      // eslint-disable-next-line security/detect-non-literal-regexp
-      .match(new RegExp(`${pageUrlSegments[segmentIndex]}/([^#/?]+)`));
-    const id = match ? match[1] : undefined;
-    return id;
-  }
-}
diff --git a/tests/test-team/pages/template-mgmt-base-page-non-dynamic.ts b/tests/test-team/pages/template-mgmt-base-page-non-dynamic.ts
deleted file mode 100644
index 2e3786b95..000000000
--- a/tests/test-team/pages/template-mgmt-base-page-non-dynamic.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { type Page } from '@playwright/test';
-import { TemplateMgmtBasePage } from './template-mgmt-base-page';
-
-export abstract class TemplateMgmtBasePageNonDynamic extends TemplateMgmtBasePage {
-  static readonly dynamicPage = false;
-
-  constructor(page: Page) {
-    super(page);
-  }
-
-  async loadPage() {
-    const { appUrlSegment, pageUrlSegments } = this
-      .constructor as typeof TemplateMgmtBasePageNonDynamic;
-
-    if (!pageUrlSegments || pageUrlSegments.length !== 1) {
-      throw new Error('Invalid pageUrlSegments');
-    }
-
-    let url = `/${appUrlSegment}/${pageUrlSegments[0]}`;
-
-    if (this.queryParameters) {
-      url += `?${this.queryParameters.toString()}`;
-    }
-
-    await this.navigateTo(url);
-  }
-}
diff --git a/tests/test-team/pages/template-mgmt-base-page.ts b/tests/test-team/pages/template-mgmt-base-page.ts
index 5993a9eba..01e76c29d 100644
--- a/tests/test-team/pages/template-mgmt-base-page.ts
+++ b/tests/test-team/pages/template-mgmt-base-page.ts
@@ -1,13 +1,12 @@
+import path from 'node:path';
 import { Locator, type Page } from '@playwright/test';
 
 export abstract class TemplateMgmtBasePage {
   readonly page: Page;
 
-  static readonly appUrlSegment = 'templates';
-
-  static readonly pageUrlSegments: string[];
+  static readonly pathTemplate: string;
 
-  queryParameters?: URLSearchParams;
+  static readonly appUrlSegment = 'templates';
 
   readonly header: Locator;
 
@@ -35,6 +34,10 @@ export abstract class TemplateMgmtBasePage {
 
   readonly skipLink: Locator;
 
+  protected pathParams = new Map<string, string | number>();
+
+  protected searchParams = new URLSearchParams();
+
   constructor(page: Page) {
     this.page = page;
 
@@ -69,10 +72,31 @@ export abstract class TemplateMgmtBasePage {
       .and(page.getByText('Skip to main content'));
   }
 
-  abstract loadPage(...idParameters: string[]): Promise<void>;
+  get pathTemplate() {
+    return (this.constructor as typeof TemplateMgmtBasePage).pathTemplate;
+  }
 
-  async attemptToLoadPageExpectFailure(...idParameters: string[]) {
-    await this.loadPage(...idParameters);
+  /**
+   * Returns the non-parameter segments from the path template
+   * e.g. for a page with pathTemplate `/templates/preview-template/:id`
+   * this method will return ['templates', 'preview-template']
+   */
+  static get staticPathSegments() {
+    return this.pathTemplate
+      .split('/')
+      .filter((segment) => segment !== '' && !segment.startsWith(':'));
+  }
+
+  /**
+   * Returns the names of the path parameters from the path template
+   * e.g. for a page with pathTemplate `/templates/preview-template/:id`
+   * this method will return ['id']
+   */
+  static get pathParameterNames() {
+    return this.pathTemplate
+      .split('/')
+      .filter((segment) => segment.startsWith(':'))
+      .map((segment) => segment.replace(/^:/, ''));
   }
 
   async navigateTo(url: string) {
@@ -90,4 +114,121 @@ export abstract class TemplateMgmtBasePage {
   async clickBackLink() {
     await this.goBackLink.click();
   }
+
+  /**
+   * Sets the value of a path parameter which will be interpolated into the pathTemplate when calling `getUrl` or `loadPage`
+   * @param key The name of the path parameter to set
+   * @param value The value of the path parameter
+   * @returns this
+   */
+  setPathParam(key: string, value: string | number) {
+    this.pathParams.set(key, value);
+    return this;
+  }
+
+  /**
+   * Sets the value of a search parameter which will be appended to the url when calling `getUrl` or `loadPage`
+   * @param key The name of the search parameter to set
+   * @param value The value of the search parameter
+   * @returns this
+   */
+  setSearchParam(key: string, value: string) {
+    this.searchParams.set(key, value);
+    return this;
+  }
+
+  async loadPage() {
+    await this.navigateTo(this.getUrl());
+  }
+
+  /**
+   * Returns a formatted url for the page, based on the set path parameters and search parameters
+   * e.g. if appUrlSegment is `templates`,
+   * pathTemplate is `/request-proof-of-template/:templateId`,
+   * the templateId path param has been set to '1' (`page.setPathParam('templateId', '1')`),
+   * the lockNumber search param has been set to 1 (`page.setSearchParam('lockNumber, '1')`),
+   * then this will return `/templates/request-proof-of-template/1?lockNumber=1`
+   * @returns String
+   */
+  getUrl() {
+    let url = path.join(
+      '/',
+      TemplateMgmtBasePage.appUrlSegment,
+      this.formatPathTemplate()
+    );
+
+    if (this.searchParams.size > 0) {
+      url += `?${this.searchParams.toString()}`;
+    }
+
+    return url;
+  }
+
+  async attemptToLoadPageExpectFailure() {
+    await this.loadPage();
+  }
+
+  private formatPathTemplate() {
+    return this.pathTemplate.replaceAll(
+      /:([A-Za-z][\dA-Za-z]*)/g,
+      (_, paramName) => {
+        const value = this.pathParams.get(paramName);
+        if (value === undefined || value === null || value === '') {
+          throw new Error(
+            `Missing parameter "${paramName}" from pathTemplate "${this.pathTemplate}".
+            Make sure you have called TemplateMgmtBasePage.setPathParam to set the correct path parameters.`
+          );
+        }
+        return String(value);
+      }
+    );
+  }
+
+  /**
+   * Matches the current Playwright url against the `pathTemplate` and extracts the values of the path parameters.
+   * If pathTemplate is `/copy-template/:templateId` and Playwright is currently on `localhost:3000/templates/copy-template/abc`,
+   * This will return an object `{ templateId: 'abc' }`.
+   * Will throw an error is the current URL does not match the pathTemplate
+   * @returns Object
+   */
+  getPathParametersFromCurrentPageUrl() {
+    const currentUrl = this.page.url();
+    const urlPath = new URL(currentUrl).pathname;
+
+    const relativePath = urlPath.replace(
+      `/${TemplateMgmtBasePage.appUrlSegment}/`,
+      ''
+    );
+
+    const normalizedPathTemplate = this.pathTemplate.startsWith('/')
+      ? this.pathTemplate.slice(1)
+      : this.pathTemplate;
+
+    const regexPattern = normalizedPathTemplate.replaceAll(
+      /:([A-Za-z][\dA-Za-z]*)/g,
+      '([^/]+)'
+    );
+
+    // eslint-disable-next-line security/detect-non-literal-regexp
+    const regex = new RegExp(`^${regexPattern}$`);
+    const urlMatch = relativePath.match(regex);
+
+    if (!urlMatch) {
+      throw new Error(
+        `Current URL path "${relativePath}" does not match pathTemplate "${this.pathTemplate}".`
+      );
+    }
+
+    const paramNames = [
+      ...this.pathTemplate.matchAll(/:([A-Za-z][\dA-Za-z]*)/g),
+    ].map((paramMatch) => paramMatch[1]);
+
+    const params: Record<string, string> = {};
+
+    for (const [index, name] of paramNames.entries()) {
+      params[name] = urlMatch[index + 1];
+    }
+
+    return params;
+  }
 }
diff --git a/tests/test-team/pages/template-mgmt-choose-page.ts b/tests/test-team/pages/template-mgmt-choose-page.ts
index d36eb35a4..4d8af86ce 100644
--- a/tests/test-team/pages/template-mgmt-choose-page.ts
+++ b/tests/test-team/pages/template-mgmt-choose-page.ts
@@ -1,8 +1,8 @@
 import { Locator, type Page } from '@playwright/test';
-import { TemplateMgmtBasePageNonDynamic } from './template-mgmt-base-page-non-dynamic';
+import { TemplateMgmtBasePage } from './template-mgmt-base-page';
 
-export class TemplateMgmtChoosePage extends TemplateMgmtBasePageNonDynamic {
-  static readonly pageUrlSegments = ['choose-a-template-type'];
+export class TemplateMgmtChoosePage extends TemplateMgmtBasePage {
+  static readonly pathTemplate = '/choose-a-template-type';
 
   readonly radioButtons: Locator;
 
diff --git a/tests/test-team/pages/template-mgmt-copy-page.ts b/tests/test-team/pages/template-mgmt-copy-page.ts
index a47f8b740..737b56755 100644
--- a/tests/test-team/pages/template-mgmt-copy-page.ts
+++ b/tests/test-team/pages/template-mgmt-copy-page.ts
@@ -1,8 +1,8 @@
 import { Locator, type Page } from '@playwright/test';
-import { TemplateMgmtBasePageDynamic } from './template-mgmt-base-page-dynamic';
+import { TemplateMgmtBasePage } from './template-mgmt-base-page';
 
-export class TemplateMgmtCopyPage extends TemplateMgmtBasePageDynamic {
-  static readonly pageUrlSegments = ['copy-template'];
+export class TemplateMgmtCopyPage extends TemplateMgmtBasePage {
+  static readonly pathTemplate = '/copy-template/:templateId';
 
   readonly radioButtons: Locator;
 
diff --git a/tests/test-team/pages/template-mgmt-delete-page.ts b/tests/test-team/pages/template-mgmt-delete-page.ts
index d31a0e750..2ff482781 100644
--- a/tests/test-team/pages/template-mgmt-delete-page.ts
+++ b/tests/test-team/pages/template-mgmt-delete-page.ts
@@ -1,8 +1,8 @@
 import { Locator, type Page } from '@playwright/test';
-import { TemplateMgmtBasePageDynamic } from './template-mgmt-base-page-dynamic';
+import { TemplateMgmtBasePage } from './template-mgmt-base-page';
 
-export class TemplateMgmtDeletePage extends TemplateMgmtBasePageDynamic {
-  static readonly pageUrlSegments = ['delete-template'];
+export class TemplateMgmtDeletePage extends TemplateMgmtBasePage {
+  static readonly pathTemplate = '/delete-template/:templateId';
 
   readonly goBackButton: Locator;
 
diff --git a/tests/test-team/pages/template-mgmt-invalid-tempate-page.ts b/tests/test-team/pages/template-mgmt-invalid-tempate-page.ts
index e13b2fe4b..b75779482 100644
--- a/tests/test-team/pages/template-mgmt-invalid-tempate-page.ts
+++ b/tests/test-team/pages/template-mgmt-invalid-tempate-page.ts
@@ -1,5 +1,5 @@
-import { TemplateMgmtBasePageNonDynamic } from './template-mgmt-base-page-non-dynamic';
+import { TemplateMgmtBasePage } from './template-mgmt-base-page';
 
-export class TemplateMgmtInvalidTemplatePage extends TemplateMgmtBasePageNonDynamic {
-  static readonly pageUrlSegments = ['invalid-template'];
+export class TemplateMgmtInvalidTemplatePage extends TemplateMgmtBasePage {
+  static readonly pathTemplate = '/invalid-template';
 }
diff --git a/tests/test-team/pages/template-mgmt-message-templates-page.ts b/tests/test-team/pages/template-mgmt-message-templates-page.ts
index 922bd4594..e05950bb8 100644
--- a/tests/test-team/pages/template-mgmt-message-templates-page.ts
+++ b/tests/test-team/pages/template-mgmt-message-templates-page.ts
@@ -1,8 +1,8 @@
 import { Locator, Page } from '@playwright/test';
-import { TemplateMgmtBasePageNonDynamic } from './template-mgmt-base-page-non-dynamic';
+import { TemplateMgmtBasePage } from './template-mgmt-base-page';
 
-export class TemplateMgmtMessageTemplatesPage extends TemplateMgmtBasePageNonDynamic {
-  static readonly pageUrlSegments = ['message-templates'];
+export class TemplateMgmtMessageTemplatesPage extends TemplateMgmtBasePage {
+  static readonly pathTemplate = '/message-templates';
 
   readonly createTemplateButton: Locator;
 
diff --git a/tests/test-team/pages/template-mgmt-preview-base-page.ts b/tests/test-team/pages/template-mgmt-preview-base-page.ts
index 1d2fdce5a..5b662f6c3 100644
--- a/tests/test-team/pages/template-mgmt-preview-base-page.ts
+++ b/tests/test-team/pages/template-mgmt-preview-base-page.ts
@@ -1,7 +1,7 @@
 import { Locator, Page } from '@playwright/test';
-import { TemplateMgmtBasePageDynamic } from './template-mgmt-base-page-dynamic';
+import { TemplateMgmtBasePage } from './template-mgmt-base-page';
 
-export abstract class TemplateMgmtPreviewBasePage extends TemplateMgmtBasePageDynamic {
+export abstract class TemplateMgmtPreviewBasePage extends TemplateMgmtBasePage {
   readonly backToAllTemplatesLinks: Locator;
 
   constructor(page: Page) {
diff --git a/tests/test-team/pages/template-mgmt-preview-submitted-base-page.ts b/tests/test-team/pages/template-mgmt-preview-submitted-base-page.ts
index c7b4ab7f5..09e4a9c2f 100644
--- a/tests/test-team/pages/template-mgmt-preview-submitted-base-page.ts
+++ b/tests/test-team/pages/template-mgmt-preview-submitted-base-page.ts
@@ -1,7 +1,7 @@
 import { Locator, Page } from '@playwright/test';
-import { TemplateMgmtBasePageDynamic } from './template-mgmt-base-page-dynamic';
+import { TemplateMgmtBasePage } from './template-mgmt-base-page';
 
-export abstract class TemplateMgmtPreviewSubmitedBasePage extends TemplateMgmtBasePageDynamic {
+export abstract class TemplateMgmtPreviewSubmittedBasePage extends TemplateMgmtBasePage {
   readonly backToAllTemplatesLinks: Locator;
   readonly campaignId: Locator;
 
diff --git a/tests/test-team/pages/template-mgmt-request-proof-page.ts b/tests/test-team/pages/template-mgmt-request-proof-page.ts
index 7b23571a8..32cf73b53 100644
--- a/tests/test-team/pages/template-mgmt-request-proof-page.ts
+++ b/tests/test-team/pages/template-mgmt-request-proof-page.ts
@@ -1,11 +1,11 @@
 import { Locator, Page } from '@playwright/test';
-import { TemplateMgmtBasePageDynamic } from './template-mgmt-base-page-dynamic';
+import { TemplateMgmtBasePage } from './template-mgmt-base-page';
 
-export class TemplateMgmtRequestProofPage extends TemplateMgmtBasePageDynamic {
-  static readonly pageUrlSegments = ['request-proof-of-template'];
+export class TemplateMgmtRequestProofPage extends TemplateMgmtBasePage {
+  static readonly pathTemplate = '/request-proof-of-template/:templateId';
 
   public static readonly urlRegexp = new RegExp(
-    /\/templates\/request-proof-of-template\/([\dA-Fa-f-]+)$/
+    /\/templates\/request-proof-of-template\/([\dA-Fa-f-]+)\?lockNumber=\d+$/
   );
 
   readonly requestProofButton: Locator;
diff --git a/tests/test-team/pages/template-mgmt-start-page.ts b/tests/test-team/pages/template-mgmt-start-page.ts
index 2902ad623..43337e46b 100644
--- a/tests/test-team/pages/template-mgmt-start-page.ts
+++ b/tests/test-team/pages/template-mgmt-start-page.ts
@@ -1,8 +1,8 @@
 import { Locator, type Page } from '@playwright/test';
-import { TemplateMgmtBasePageNonDynamic } from './template-mgmt-base-page-non-dynamic';
+import { TemplateMgmtBasePage } from './template-mgmt-base-page';
 
-export class TemplateMgmtStartPage extends TemplateMgmtBasePageNonDynamic {
-  static readonly pageUrlSegments = ['create-and-submit-templates'];
+export class TemplateMgmtStartPage extends TemplateMgmtBasePage {
+  static readonly pathTemplate = '/create-and-submit-templates';
 
   readonly startButton: Locator;
 
diff --git a/tests/test-team/pages/template-mgmt-submit-base-page.ts b/tests/test-team/pages/template-mgmt-submit-base-page.ts
index 180e76551..7f5d3225f 100644
--- a/tests/test-team/pages/template-mgmt-submit-base-page.ts
+++ b/tests/test-team/pages/template-mgmt-submit-base-page.ts
@@ -1,7 +1,7 @@
 import { Locator, Page } from '@playwright/test';
-import { TemplateMgmtBasePageDynamic } from './template-mgmt-base-page-dynamic';
+import { TemplateMgmtBasePage } from './template-mgmt-base-page';
 
-export abstract class TemplateMgmtSubmitBasePage extends TemplateMgmtBasePageDynamic {
+export abstract class TemplateMgmtSubmitBasePage extends TemplateMgmtBasePage {
   public readonly submitButton: Locator;
 
   public readonly goBackButton: Locator;
diff --git a/tests/test-team/pages/template-mgmt-template-submitted-base-page.ts b/tests/test-team/pages/template-mgmt-template-submitted-base-page.ts
index cf80356a3..4ab83072d 100644
--- a/tests/test-team/pages/template-mgmt-template-submitted-base-page.ts
+++ b/tests/test-team/pages/template-mgmt-template-submitted-base-page.ts
@@ -1,7 +1,7 @@
 import { Locator, Page } from '@playwright/test';
-import { TemplateMgmtBasePageDynamic } from './template-mgmt-base-page-dynamic';
+import { TemplateMgmtBasePage } from './template-mgmt-base-page';
 
-export abstract class TemplateMgmtTemplateSubmittedBasePage extends TemplateMgmtBasePageDynamic {
+export abstract class TemplateMgmtTemplateSubmittedBasePage extends TemplateMgmtBasePage {
   public readonly templateIdText: Locator;
 
   public readonly templateNameText: Locator;
diff --git a/tests/test-team/pages/templates-mgmt-login-page.ts b/tests/test-team/pages/templates-mgmt-login-page.ts
index ef49a98af..fdedcc95e 100644
--- a/tests/test-team/pages/templates-mgmt-login-page.ts
+++ b/tests/test-team/pages/templates-mgmt-login-page.ts
@@ -3,10 +3,10 @@ import {
   CognitoAuthHelper,
   type TestUser,
 } from '../helpers/auth/cognito-auth-helper';
-import { TemplateMgmtBasePageNonDynamic } from './template-mgmt-base-page-non-dynamic';
+import { TemplateMgmtBasePage } from './template-mgmt-base-page';
 
-export class TemplateMgmtSignInPage extends TemplateMgmtBasePageNonDynamic {
-  static readonly pageUrlSegments = ['create-and-submit-templates'];
+export class TemplateMgmtSignInPage extends TemplateMgmtBasePage {
+  static readonly pathTemplate = '/create-and-submit-templates';
 
   public readonly emailInput: Locator;
 
diff --git a/tests/test-team/template-mgmt-accessibility/routing.accessibility.spec.ts b/tests/test-team/template-mgmt-accessibility/routing.accessibility.spec.ts
index ab1c9240c..528785f31 100644
--- a/tests/test-team/template-mgmt-accessibility/routing.accessibility.spec.ts
+++ b/tests/test-team/template-mgmt-accessibility/routing.accessibility.spec.ts
@@ -93,9 +93,12 @@ test.describe('Routing - Accessibility', () => {
     analyze(new RoutingChooseMessageOrderPage(page)));
 
   test('Choose template', async ({ page, analyze }) =>
-    analyze(new RoutingChooseTemplatesPage(page), {
-      ids: [validRoutingConfigId],
-    }));
+    analyze(
+      new RoutingChooseTemplatesPage(page).setPathParam(
+        'messagePlanId',
+        validRoutingConfigId
+      )
+    ));
 
   test('Choose message order - error', async ({ page, analyze }) =>
     analyze(new RoutingChooseMessageOrderPage(page), {
@@ -111,17 +114,21 @@ test.describe('Routing - Accessibility', () => {
 
     test('Create message plan', async ({ page, analyze }) =>
       analyze(
-        new RoutingCreateMessagePlanPage(page, {
-          messageOrder,
-        })
+        new RoutingCreateMessagePlanPage(page).setSearchParam(
+          'messageOrder',
+          messageOrder
+        )
       ));
 
     test('Create message plan - error', async ({ page, analyze }) =>
       analyze(
-        new RoutingCreateMessagePlanPage(page, {
-          messageOrder,
-        }),
-        { beforeAnalyze: (p) => p.clickSubmit() }
+        new RoutingCreateMessagePlanPage(page).setSearchParam(
+          'messageOrder',
+          messageOrder
+        ),
+        {
+          beforeAnalyze: (p) => p.clickSubmit(),
+        }
       ));
   });
 });
diff --git a/tests/test-team/template-mgmt-api-tests/create-routing-configuration.api.spec.ts b/tests/test-team/template-mgmt-api-tests/create-routing-configuration.api.spec.ts
index 7b9184823..5e130ab6d 100644
--- a/tests/test-team/template-mgmt-api-tests/create-routing-configuration.api.spec.ts
+++ b/tests/test-team/template-mgmt-api-tests/create-routing-configuration.api.spec.ts
@@ -65,6 +65,7 @@ test.describe('POST /v1/routing-configuration', () => {
         id: expect.stringMatching(uuidRegExp),
         status: 'DRAFT',
         updatedAt: expect.stringMatching(isoDateRegExp),
+        lockNumber: 0,
       },
     });
 
@@ -137,6 +138,7 @@ test.describe('POST /v1/routing-configuration', () => {
         id: expect.stringMatching(uuidRegExp),
         status: 'DRAFT',
         updatedAt: expect.stringMatching(isoDateRegExp),
+        lockNumber: 0,
       },
     });
 
diff --git a/tests/test-team/template-mgmt-api-tests/delete-routing-config.api.spec.ts b/tests/test-team/template-mgmt-api-tests/delete-routing-config.api.spec.ts
index 4942ccf6f..3e11060f1 100644
--- a/tests/test-team/template-mgmt-api-tests/delete-routing-config.api.spec.ts
+++ b/tests/test-team/template-mgmt-api-tests/delete-routing-config.api.spec.ts
@@ -5,7 +5,6 @@ import {
   testUsers,
 } from '../helpers/auth/cognito-auth-helper';
 import { RoutingConfigStorageHelper } from '../helpers/db/routing-config-storage-helper';
-import type { FactoryRoutingConfig } from '../helpers/types';
 import { RoutingConfigFactory } from '../helpers/factories/routing-config-factory';
 
 test.describe('DELETE /v1/routing-configuration/:routingConfigId', () => {
@@ -16,12 +15,6 @@ test.describe('DELETE /v1/routing-configuration/:routingConfigId', () => {
   let userSharedClient: TestUser;
   let userRoutingDisabled: TestUser;
 
-  let routingConfigNoUpdates: FactoryRoutingConfig;
-  let routingConfigSuccessfullyDelete: FactoryRoutingConfig;
-  let routingConfigSubmitted: FactoryRoutingConfig;
-  let routingConfigAlreadyDeleted: FactoryRoutingConfig;
-  let routingConfigDeleteBySharedClientUser: FactoryRoutingConfig;
-
   test.beforeAll(async () => {
     user1 = await authHelper.getTestUser(testUsers.User1.userId);
     userDifferentClient = await authHelper.getTestUser(
@@ -29,27 +22,6 @@ test.describe('DELETE /v1/routing-configuration/:routingConfigId', () => {
     );
     userSharedClient = await authHelper.getTestUser(testUsers.User7.userId);
     userRoutingDisabled = await authHelper.getTestUser(testUsers.User2.userId);
-
-    routingConfigNoUpdates = RoutingConfigFactory.create(user1);
-    routingConfigSuccessfullyDelete = RoutingConfigFactory.create(user1);
-
-    routingConfigSubmitted = RoutingConfigFactory.create(user1, {
-      status: 'COMPLETED',
-    });
-
-    routingConfigAlreadyDeleted = RoutingConfigFactory.create(user1, {
-      status: 'DELETED',
-    });
-
-    routingConfigDeleteBySharedClientUser = RoutingConfigFactory.create(user1);
-
-    await storageHelper.seed([
-      routingConfigNoUpdates.dbEntry,
-      routingConfigSuccessfullyDelete.dbEntry,
-      routingConfigSubmitted.dbEntry,
-      routingConfigAlreadyDeleted.dbEntry,
-      routingConfigDeleteBySharedClientUser.dbEntry,
-    ]);
   });
 
   test.afterAll(async () => {
@@ -57,8 +29,13 @@ test.describe('DELETE /v1/routing-configuration/:routingConfigId', () => {
   });
 
   test('returns 401 if no auth token', async ({ request }) => {
+    const { dbEntry } = RoutingConfigFactory.create(user1);
+
+    await storageHelper.seed([dbEntry]);
+
     const response = await request.delete(
-      `${process.env.API_BASE_URL}/v1/routing-configuration/some-routing-config`
+      `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}`,
+      { headers: { 'X-Lock-Number': String(dbEntry.lockNumber) } }
     );
     expect(response.status()).toBe(401);
     expect(await response.json()).toEqual({
@@ -68,10 +45,11 @@ test.describe('DELETE /v1/routing-configuration/:routingConfigId', () => {
 
   test('returns 404 if routing config does not exist', async ({ request }) => {
     const response = await request.delete(
-      `${process.env.API_BASE_URL}/v1/routing-configuration/noexist`,
+      `${process.env.API_BASE_URL}/v1/routing-configuration/no-exist`,
       {
         headers: {
           Authorization: await user1.getAccessToken(),
+          'X-Lock-Number': '0',
         },
       }
     );
@@ -85,11 +63,16 @@ test.describe('DELETE /v1/routing-configuration/:routingConfigId', () => {
   test('returns 404 if routing config exists but is owned by a different client', async ({
     request,
   }) => {
+    const { dbEntry } = RoutingConfigFactory.create(user1);
+
+    await storageHelper.seed([dbEntry]);
+
     const response = await request.delete(
-      `${process.env.API_BASE_URL}/v1/routing-configuration/${routingConfigNoUpdates.dbEntry.id}`,
+      `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}`,
       {
         headers: {
           Authorization: await userDifferentClient.getAccessToken(),
+          'X-Lock-Number': String(dbEntry.lockNumber),
         },
       }
     );
@@ -102,11 +85,16 @@ test.describe('DELETE /v1/routing-configuration/:routingConfigId', () => {
   });
 
   test('returns 204 no content on successful deletion', async ({ request }) => {
+    const { dbEntry } = RoutingConfigFactory.create(user1);
+
+    await storageHelper.seed([dbEntry]);
+
     const response = await request.delete(
-      `${process.env.API_BASE_URL}/v1/routing-configuration/${routingConfigSuccessfullyDelete.dbEntry.id}`,
+      `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}`,
       {
         headers: {
           Authorization: await user1.getAccessToken(),
+          'X-Lock-Number': String(dbEntry.lockNumber),
         },
       }
     );
@@ -117,11 +105,18 @@ test.describe('DELETE /v1/routing-configuration/:routingConfigId', () => {
   test('returns 400 - cannot delete a COMPLETED routing config', async ({
     request,
   }) => {
+    const { dbEntry } = RoutingConfigFactory.create(user1, {
+      status: 'COMPLETED',
+    });
+
+    await storageHelper.seed([dbEntry]);
+
     const response = await request.delete(
-      `${process.env.API_BASE_URL}/v1/routing-configuration/${routingConfigSubmitted.dbEntry.id}`,
+      `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}`,
       {
         headers: {
           Authorization: await user1.getAccessToken(),
+          'X-Lock-Number': String(dbEntry.lockNumber),
         },
       }
     );
@@ -140,11 +135,18 @@ test.describe('DELETE /v1/routing-configuration/:routingConfigId', () => {
   test('returns 404 - cannot delete an already DELETED routing config', async ({
     request,
   }) => {
+    const { dbEntry } = RoutingConfigFactory.create(user1, {
+      status: 'DELETED',
+    });
+
+    await storageHelper.seed([dbEntry]);
+
     const response = await request.delete(
-      `${process.env.API_BASE_URL}/v1/routing-configuration/${routingConfigAlreadyDeleted.dbEntry.id}`,
+      `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}`,
       {
         headers: {
           Authorization: await user1.getAccessToken(),
+          'X-Lock-Number': String(dbEntry.lockNumber),
         },
       }
     );
@@ -162,13 +164,18 @@ test.describe('DELETE /v1/routing-configuration/:routingConfigId', () => {
   test('user belonging to the same client as the creator can delete', async ({
     request,
   }) => {
+    const { dbEntry } = RoutingConfigFactory.create(user1);
+
+    await storageHelper.seed([dbEntry]);
+
     expect(user1.clientId).toBe(userSharedClient.clientId);
 
     const response = await request.delete(
-      `${process.env.API_BASE_URL}/v1/routing-configuration/${routingConfigDeleteBySharedClientUser.dbEntry.id}`,
+      `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}`,
       {
         headers: {
           Authorization: await userSharedClient.getAccessToken(),
+          'X-Lock-Number': String(dbEntry.lockNumber),
         },
       }
     );
@@ -179,11 +186,16 @@ test.describe('DELETE /v1/routing-configuration/:routingConfigId', () => {
   test('returns 400 if routing feature is disabled on the client', async ({
     request,
   }) => {
+    const { dbEntry } = RoutingConfigFactory.create(userRoutingDisabled);
+
+    await storageHelper.seed([dbEntry]);
+
     const response = await request.delete(
-      `${process.env.API_BASE_URL}/v1/routing-configuration/some-routing-config`,
+      `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}`,
       {
         headers: {
           Authorization: await userRoutingDisabled.getAccessToken(),
+          'X-Lock-Number': String(dbEntry.lockNumber),
         },
       }
     );
@@ -195,4 +207,54 @@ test.describe('DELETE /v1/routing-configuration/:routingConfigId', () => {
       technicalMessage: 'Routing feature is disabled',
     });
   });
+
+  test('returns 409 if the lock number header is not set', async ({
+    request,
+  }) => {
+    const { dbEntry } = RoutingConfigFactory.create(user1);
+
+    await storageHelper.seed([dbEntry]);
+
+    const response = await request.delete(
+      `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}`,
+      {
+        headers: {
+          Authorization: await user1.getAccessToken(),
+        },
+      }
+    );
+
+    expect(response.status()).toBe(409);
+
+    expect(await response.json()).toEqual({
+      statusCode: 409,
+      technicalMessage:
+        'Lock number mismatch - Message Plan has been modified since last read',
+    });
+  });
+  test('returns 409 if the lock number header does not match the current one', async ({
+    request,
+  }) => {
+    const { dbEntry } = RoutingConfigFactory.create(user1);
+
+    await storageHelper.seed([dbEntry]);
+
+    const response = await request.delete(
+      `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}`,
+      {
+        headers: {
+          Authorization: await user1.getAccessToken(),
+          'X-Lock-Number': String(dbEntry.lockNumber + 1),
+        },
+      }
+    );
+
+    expect(response.status()).toBe(409);
+
+    expect(await response.json()).toEqual({
+      statusCode: 409,
+      technicalMessage:
+        'Lock number mismatch - Message Plan has been modified since last read',
+    });
+  });
 });
diff --git a/tests/test-team/template-mgmt-api-tests/delete-template.api.spec.ts b/tests/test-team/template-mgmt-api-tests/delete-template.api.spec.ts
index db301025c..1a509711e 100644
--- a/tests/test-team/template-mgmt-api-tests/delete-template.api.spec.ts
+++ b/tests/test-team/template-mgmt-api-tests/delete-template.api.spec.ts
@@ -858,7 +858,8 @@ test.describe('DELETE /v1/template/:templateId', () => {
 
     expect(body).toEqual({
       statusCode: 409,
-      technicalMessage: 'Invalid lock number',
+      technicalMessage:
+        'Lock number mismatch - Template has been modified since last read',
     });
   });
 
@@ -900,7 +901,8 @@ test.describe('DELETE /v1/template/:templateId', () => {
 
     expect(body).toEqual({
       statusCode: 409,
-      technicalMessage: 'Invalid lock number',
+      technicalMessage:
+        'Lock number mismatch - Template has been modified since last read',
     });
   });
 });
diff --git a/tests/test-team/template-mgmt-api-tests/request-proof.api.spec.ts b/tests/test-team/template-mgmt-api-tests/request-proof.api.spec.ts
index f4ef97814..d19825c45 100644
--- a/tests/test-team/template-mgmt-api-tests/request-proof.api.spec.ts
+++ b/tests/test-team/template-mgmt-api-tests/request-proof.api.spec.ts
@@ -332,7 +332,8 @@ test.describe('POST /v1/template/:templateId/proof', () => {
 
     expect(result).toEqual({
       statusCode: 409,
-      technicalMessage: 'Invalid lock number',
+      technicalMessage:
+        'Lock number mismatch - Template has been modified since last read',
     });
   });
 
@@ -381,7 +382,8 @@ test.describe('POST /v1/template/:templateId/proof', () => {
 
     expect(result).toEqual({
       statusCode: 409,
-      technicalMessage: 'Invalid lock number',
+      technicalMessage:
+        'Lock number mismatch - Template has been modified since last read',
     });
   });
 });
diff --git a/tests/test-team/template-mgmt-api-tests/submit-routing-config.api.spec.ts b/tests/test-team/template-mgmt-api-tests/submit-routing-config.api.spec.ts
index c17cb18c9..38b71cfad 100644
--- a/tests/test-team/template-mgmt-api-tests/submit-routing-config.api.spec.ts
+++ b/tests/test-team/template-mgmt-api-tests/submit-routing-config.api.spec.ts
@@ -6,7 +6,6 @@ import {
 } from '../helpers/auth/cognito-auth-helper';
 import { isoDateRegExp } from 'nhs-notify-web-template-management-test-helper-utils';
 import { RoutingConfigStorageHelper } from '../helpers/db/routing-config-storage-helper';
-import type { FactoryRoutingConfig } from '../helpers/types';
 import { RoutingConfigFactory } from '../helpers/factories/routing-config-factory';
 import { RoutingConfigStatus } from 'nhs-notify-backend-client';
 
@@ -18,12 +17,6 @@ test.describe('PATCH /v1/routing-configuration/:routingConfigId/submit', () => {
   let userSharedClient: TestUser;
   let userRoutingDisabled: TestUser;
 
-  let routingConfigNoUpdates: FactoryRoutingConfig;
-  let routingConfigSuccessfullySubmit: FactoryRoutingConfig;
-  let routingConfigAlreadySubmitted: FactoryRoutingConfig;
-  let routingConfigDeleted: FactoryRoutingConfig;
-  let routingConfigSubmitBySharedClientUser: FactoryRoutingConfig;
-
   test.beforeAll(async () => {
     user1 = await authHelper.getTestUser(testUsers.User1.userId);
     userDifferentClient = await authHelper.getTestUser(
@@ -31,27 +24,6 @@ test.describe('PATCH /v1/routing-configuration/:routingConfigId/submit', () => {
     );
     userSharedClient = await authHelper.getTestUser(testUsers.User7.userId);
     userRoutingDisabled = await authHelper.getTestUser(testUsers.User2.userId);
-
-    routingConfigNoUpdates = RoutingConfigFactory.create(user1);
-    routingConfigSuccessfullySubmit = RoutingConfigFactory.create(user1);
-
-    routingConfigAlreadySubmitted = RoutingConfigFactory.create(user1, {
-      status: 'COMPLETED',
-    });
-
-    routingConfigDeleted = RoutingConfigFactory.create(user1, {
-      status: 'DELETED',
-    });
-
-    routingConfigSubmitBySharedClientUser = RoutingConfigFactory.create(user1);
-
-    await storageHelper.seed([
-      routingConfigNoUpdates.dbEntry,
-      routingConfigSuccessfullySubmit.dbEntry,
-      routingConfigAlreadySubmitted.dbEntry,
-      routingConfigDeleted.dbEntry,
-      routingConfigSubmitBySharedClientUser.dbEntry,
-    ]);
   });
 
   test.afterAll(async () => {
@@ -59,9 +31,19 @@ test.describe('PATCH /v1/routing-configuration/:routingConfigId/submit', () => {
   });
 
   test('returns 401 if no auth token', async ({ request }) => {
+    const { dbEntry } = RoutingConfigFactory.create(user1);
+
+    await storageHelper.seed([dbEntry]);
+
     const response = await request.patch(
-      `${process.env.API_BASE_URL}/v1/routing-configuration/some-routing-config/submit`
+      `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}/submit`,
+      {
+        headers: {
+          'X-Lock-Number': String(dbEntry.lockNumber),
+        },
+      }
     );
+
     expect(response.status()).toBe(401);
     expect(await response.json()).toEqual({
       message: 'Unauthorized',
@@ -70,10 +52,11 @@ test.describe('PATCH /v1/routing-configuration/:routingConfigId/submit', () => {
 
   test('returns 404 if routing config does not exist', async ({ request }) => {
     const response = await request.patch(
-      `${process.env.API_BASE_URL}/v1/routing-configuration/noexist/submit`,
+      `${process.env.API_BASE_URL}/v1/routing-configuration/no-exist/submit`,
       {
         headers: {
           Authorization: await user1.getAccessToken(),
+          'X-Lock-Number': '0',
         },
       }
     );
@@ -90,11 +73,16 @@ test.describe('PATCH /v1/routing-configuration/:routingConfigId/submit', () => {
   test('returns 404 if routing config exists but is owned by a different client', async ({
     request,
   }) => {
+    const { dbEntry } = RoutingConfigFactory.create(user1);
+
+    await storageHelper.seed([dbEntry]);
+
     const updateResponse = await request.patch(
-      `${process.env.API_BASE_URL}/v1/routing-configuration/${routingConfigNoUpdates.dbEntry.id}/submit`,
+      `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}/submit`,
       {
         headers: {
           Authorization: await userDifferentClient.getAccessToken(),
+          'X-Lock-Number': String(dbEntry.lockNumber),
         },
       }
     );
@@ -109,13 +97,18 @@ test.describe('PATCH /v1/routing-configuration/:routingConfigId/submit', () => {
   test('returns 200 and the updated routing config data', async ({
     request,
   }) => {
+    const { dbEntry, apiResponse } = RoutingConfigFactory.create(user1);
+
+    await storageHelper.seed([dbEntry]);
+
     const start = new Date();
 
     const updateResponse = await request.patch(
-      `${process.env.API_BASE_URL}/v1/routing-configuration/${routingConfigSuccessfullySubmit.dbEntry.id}/submit`,
+      `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}/submit`,
       {
         headers: {
           Authorization: await user1.getAccessToken(),
+          'X-Lock-Number': String(dbEntry.lockNumber),
         },
       }
     );
@@ -127,26 +120,32 @@ test.describe('PATCH /v1/routing-configuration/:routingConfigId/submit', () => {
     expect(updated).toEqual({
       statusCode: 200,
       data: {
-        ...routingConfigSuccessfullySubmit.apiResponse,
+        ...apiResponse,
         status: 'COMPLETED' satisfies RoutingConfigStatus,
         updatedAt: expect.stringMatching(isoDateRegExp),
+        lockNumber: dbEntry.lockNumber + 1,
       },
     });
 
     expect(updated.data.updatedAt).toBeDateRoughlyBetween([start, new Date()]);
-    expect(updated.data.createdAt).toEqual(
-      routingConfigSuccessfullySubmit.dbEntry.createdAt
-    );
+    expect(updated.data.createdAt).toEqual(dbEntry.createdAt);
   });
 
   test('returns 400 - cannot submit a COMPLETED routing config', async ({
     request,
   }) => {
+    const { dbEntry } = RoutingConfigFactory.create(user1, {
+      status: 'COMPLETED',
+    });
+
+    await storageHelper.seed([dbEntry]);
+
     const failedSubmitResponse = await request.patch(
-      `${process.env.API_BASE_URL}/v1/routing-configuration/${routingConfigAlreadySubmitted.dbEntry.id}/submit`,
+      `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}/submit`,
       {
         headers: {
           Authorization: await user1.getAccessToken(),
+          'X-Lock-Number': String(dbEntry.lockNumber),
         },
       }
     );
@@ -165,11 +164,18 @@ test.describe('PATCH /v1/routing-configuration/:routingConfigId/submit', () => {
   test('returns 404 - cannot submit a DELETED routing config', async ({
     request,
   }) => {
+    const { dbEntry } = RoutingConfigFactory.create(user1, {
+      status: 'DELETED',
+    });
+
+    await storageHelper.seed([dbEntry]);
+
     const failedSubmitResponse = await request.patch(
-      `${process.env.API_BASE_URL}/v1/routing-configuration/${routingConfigDeleted.dbEntry.id}/submit`,
+      `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}/submit`,
       {
         headers: {
           Authorization: await user1.getAccessToken(),
+          'X-Lock-Number': String(dbEntry.lockNumber),
         },
       }
     );
@@ -187,11 +193,16 @@ test.describe('PATCH /v1/routing-configuration/:routingConfigId/submit', () => {
   test('user belonging to the same client as the creator can submit', async ({
     request,
   }) => {
+    const { dbEntry, apiResponse } = RoutingConfigFactory.create(user1);
+
+    await storageHelper.seed([dbEntry]);
+
     const updateResponse = await request.patch(
-      `${process.env.API_BASE_URL}/v1/routing-configuration/${routingConfigSubmitBySharedClientUser.dbEntry.id}/submit`,
+      `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}/submit`,
       {
         headers: {
           Authorization: await userSharedClient.getAccessToken(),
+          'X-Lock-Number': String(dbEntry.lockNumber),
         },
       }
     );
@@ -205,9 +216,10 @@ test.describe('PATCH /v1/routing-configuration/:routingConfigId/submit', () => {
     expect(updated).toEqual({
       statusCode: 200,
       data: {
-        ...routingConfigSubmitBySharedClientUser.apiResponse,
+        ...apiResponse,
         status: 'COMPLETED' satisfies RoutingConfigStatus,
         updatedAt: expect.stringMatching(isoDateRegExp),
+        lockNumber: dbEntry.lockNumber + 1,
       },
     });
   });
@@ -215,11 +227,16 @@ test.describe('PATCH /v1/routing-configuration/:routingConfigId/submit', () => {
   test('returns 400 if routing feature is disabled on the client', async ({
     request,
   }) => {
+    const { dbEntry } = RoutingConfigFactory.create(user1);
+
+    await storageHelper.seed([dbEntry]);
+
     const response = await request.patch(
-      `${process.env.API_BASE_URL}/v1/routing-configuration/some-routing-config/submit`,
+      `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}/submit`,
       {
         headers: {
           Authorization: await userRoutingDisabled.getAccessToken(),
+          'X-Lock-Number': String(dbEntry.lockNumber),
         },
       }
     );
@@ -231,4 +248,55 @@ test.describe('PATCH /v1/routing-configuration/:routingConfigId/submit', () => {
       technicalMessage: 'Routing feature is disabled',
     });
   });
+
+  test('returns 409 if the lock number header is not set', async ({
+    request,
+  }) => {
+    const { dbEntry } = RoutingConfigFactory.create(user1);
+
+    await storageHelper.seed([dbEntry]);
+
+    const response = await request.patch(
+      `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}/submit`,
+      {
+        headers: {
+          Authorization: await user1.getAccessToken(),
+        },
+      }
+    );
+
+    expect(response.status()).toBe(409);
+
+    expect(await response.json()).toEqual({
+      statusCode: 409,
+      technicalMessage:
+        'Lock number mismatch - Message Plan has been modified since last read',
+    });
+  });
+
+  test('returns 409 if the lock number header does not match the current one', async ({
+    request,
+  }) => {
+    const { dbEntry } = RoutingConfigFactory.create(user1);
+
+    await storageHelper.seed([dbEntry]);
+
+    const response = await request.patch(
+      `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}/submit`,
+      {
+        headers: {
+          Authorization: await user1.getAccessToken(),
+          'X-Lock-Number': String(dbEntry.lockNumber + 1),
+        },
+      }
+    );
+
+    expect(response.status()).toBe(409);
+
+    expect(await response.json()).toEqual({
+      statusCode: 409,
+      technicalMessage:
+        'Lock number mismatch - Message Plan has been modified since last read',
+    });
+  });
 });
diff --git a/tests/test-team/template-mgmt-api-tests/submit-template.api.spec.ts b/tests/test-team/template-mgmt-api-tests/submit-template.api.spec.ts
index fd92293ea..e21efd1fd 100644
--- a/tests/test-team/template-mgmt-api-tests/submit-template.api.spec.ts
+++ b/tests/test-team/template-mgmt-api-tests/submit-template.api.spec.ts
@@ -1106,7 +1106,8 @@ test.describe('POST /v1/template/:templateId/submit', () => {
 
     expect(body).toEqual({
       statusCode: 409,
-      technicalMessage: 'Invalid lock number',
+      technicalMessage:
+        'Lock number mismatch - Template has been modified since last read',
     });
   });
 
@@ -1148,7 +1149,8 @@ test.describe('POST /v1/template/:templateId/submit', () => {
 
     expect(body).toEqual({
       statusCode: 409,
-      technicalMessage: 'Invalid lock number',
+      technicalMessage:
+        'Lock number mismatch - Template has been modified since last read',
     });
   });
 });
diff --git a/tests/test-team/template-mgmt-api-tests/update-routing-config.api.spec.ts b/tests/test-team/template-mgmt-api-tests/update-routing-config.api.spec.ts
index 7b0e53d5e..c51dc589e 100644
--- a/tests/test-team/template-mgmt-api-tests/update-routing-config.api.spec.ts
+++ b/tests/test-team/template-mgmt-api-tests/update-routing-config.api.spec.ts
@@ -6,10 +6,9 @@ import {
 } from '../helpers/auth/cognito-auth-helper';
 import { isoDateRegExp } from 'nhs-notify-web-template-management-test-helper-utils';
 import { RoutingConfigStorageHelper } from '../helpers/db/routing-config-storage-helper';
-import type { FactoryRoutingConfig } from '../helpers/types';
 import { RoutingConfigFactory } from '../helpers/factories/routing-config-factory';
 
-test.describe('PUT /v1/routing-configuration/:routingConfigId', () => {
+test.describe('PATCH /v1/routing-configuration/:routingConfigId', () => {
   const authHelper = createAuthHelper();
   const storageHelper = new RoutingConfigStorageHelper();
   let user1: TestUser;
@@ -18,12 +17,6 @@ test.describe('PUT /v1/routing-configuration/:routingConfigId', () => {
   let userRoutingDisabled: TestUser;
   let userMultiCampaign: TestUser;
 
-  let routingConfigNoUpdates: FactoryRoutingConfig;
-  let routingConfigSuccessfullyUpdate: FactoryRoutingConfig;
-  let routingConfigCompleted: FactoryRoutingConfig;
-  let routingConfigDeleted: FactoryRoutingConfig;
-  let routingConfigSubmitBySharedClientUser: FactoryRoutingConfig;
-
   test.beforeAll(async () => {
     user1 = await authHelper.getTestUser(testUsers.User1.userId);
     userDifferentClient = await authHelper.getTestUser(
@@ -34,27 +27,6 @@ test.describe('PUT /v1/routing-configuration/:routingConfigId', () => {
     userMultiCampaign = await authHelper.getTestUser(
       testUsers.UserWithMultipleCampaigns.userId
     );
-
-    routingConfigNoUpdates = RoutingConfigFactory.create(user1);
-    routingConfigSuccessfullyUpdate = RoutingConfigFactory.create(user1);
-
-    routingConfigCompleted = RoutingConfigFactory.create(user1, {
-      status: 'COMPLETED',
-    });
-
-    routingConfigDeleted = RoutingConfigFactory.create(user1, {
-      status: 'DELETED',
-    });
-
-    routingConfigSubmitBySharedClientUser = RoutingConfigFactory.create(user1);
-
-    await storageHelper.seed([
-      routingConfigNoUpdates.dbEntry,
-      routingConfigSuccessfullyUpdate.dbEntry,
-      routingConfigCompleted.dbEntry,
-      routingConfigDeleted.dbEntry,
-      routingConfigSubmitBySharedClientUser.dbEntry,
-    ]);
   });
 
   test.afterAll(async () => {
@@ -63,8 +35,9 @@ test.describe('PUT /v1/routing-configuration/:routingConfigId', () => {
   });
 
   test('returns 401 if no auth token', async ({ request }) => {
-    const response = await request.put(
-      `${process.env.API_BASE_URL}/v1/routing-configuration/some-routing-config`
+    const response = await request.patch(
+      `${process.env.API_BASE_URL}/v1/routing-configuration/some-routing-config`,
+      { headers: { 'X-Lock-Number': '0' } }
     );
     expect(response.status()).toBe(401);
     expect(await response.json()).toEqual({
@@ -73,13 +46,16 @@ test.describe('PUT /v1/routing-configuration/:routingConfigId', () => {
   });
 
   test('returns 404 if routing config does not exist', async ({ request }) => {
-    const response = await request.put(
-      `${process.env.API_BASE_URL}/v1/routing-configuration/noexist`,
+    const response = await request.patch(
+      `${process.env.API_BASE_URL}/v1/routing-configuration/no-exist`,
       {
         headers: {
           Authorization: await user1.getAccessToken(),
+          'X-Lock-Number': '0',
+        },
+        data: {
+          name: 'foo',
         },
-        data: routingConfigNoUpdates.apiPayload,
       }
     );
     expect(response.status()).toBe(404);
@@ -92,16 +68,20 @@ test.describe('PUT /v1/routing-configuration/:routingConfigId', () => {
   test('returns 404 if routing config exists but is owned by a different client', async ({
     request,
   }) => {
-    const { apiPayload, dbEntry } =
-      RoutingConfigFactory.create(userDifferentClient);
+    const { dbEntry } = RoutingConfigFactory.create(user1);
+
+    await storageHelper.seed([dbEntry]);
 
-    const updateResponse = await request.put(
+    const updateResponse = await request.patch(
       `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}`,
       {
         headers: {
           Authorization: await userDifferentClient.getAccessToken(),
+          'X-Lock-Number': String(dbEntry.lockNumber),
+        },
+        data: {
+          name: 'new-name',
         },
-        data: apiPayload,
       }
     );
 
@@ -115,18 +95,22 @@ test.describe('PUT /v1/routing-configuration/:routingConfigId', () => {
   test('returns 200 and the updated routing config data', async ({
     request,
   }) => {
+    const { dbEntry, apiResponse } = RoutingConfigFactory.create(user1);
+
+    await storageHelper.seed([dbEntry]);
+
     const start = new Date();
 
     const update = {
-      ...routingConfigSuccessfullyUpdate.apiPayload,
       name: 'new name',
     };
 
-    const updateResponse = await request.put(
-      `${process.env.API_BASE_URL}/v1/routing-configuration/${routingConfigSuccessfullyUpdate.dbEntry.id}`,
+    const updateResponse = await request.patch(
+      `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}`,
       {
         headers: {
           Authorization: await user1.getAccessToken(),
+          'X-Lock-Number': String(dbEntry.lockNumber),
         },
         data: update,
       }
@@ -139,29 +123,34 @@ test.describe('PUT /v1/routing-configuration/:routingConfigId', () => {
     expect(updated).toEqual({
       statusCode: 200,
       data: {
-        ...routingConfigSuccessfullyUpdate.apiResponse,
+        ...apiResponse,
         ...update,
         updatedAt: expect.stringMatching(isoDateRegExp),
+        lockNumber: dbEntry.lockNumber + 1,
       },
     });
 
     expect(updated.data.updatedAt).toBeDateRoughlyBetween([start, new Date()]);
-    expect(updated.data.createdAt).toEqual(
-      routingConfigSuccessfullyUpdate.dbEntry.createdAt
-    );
+    expect(updated.data.createdAt).toEqual(dbEntry.createdAt);
   });
 
   test('returns 400 - cannot update a COMPLETED routing config', async ({
     request,
   }) => {
-    const response = await request.put(
-      `${process.env.API_BASE_URL}/v1/routing-configuration/${routingConfigCompleted.dbEntry.id}`,
+    const { dbEntry } = RoutingConfigFactory.create(user1, {
+      status: 'COMPLETED',
+    });
+
+    await storageHelper.seed([dbEntry]);
+
+    const response = await request.patch(
+      `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}`,
       {
         headers: {
           Authorization: await user1.getAccessToken(),
+          'X-Lock-Number': String(dbEntry.lockNumber),
         },
         data: {
-          ...routingConfigCompleted.apiPayload,
           name: 'new name',
         },
       }
@@ -179,17 +168,22 @@ test.describe('PUT /v1/routing-configuration/:routingConfigId', () => {
   test('returns 400 if campaignId is not available for the client', async ({
     request,
   }) => {
+    const { dbEntry } = RoutingConfigFactory.create(user1);
+
+    await storageHelper.seed([dbEntry]);
+
     const campaignId = 'not_a_client_campaign';
 
-    const response = await request.put(
-      `${process.env.API_BASE_URL}/v1/routing-configuration/${routingConfigNoUpdates.dbEntry.id}`,
+    const response = await request.patch(
+      `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}`,
       {
         headers: {
           Authorization: await user1.getAccessToken(),
+          'X-Lock-Number': String(dbEntry.lockNumber),
         },
-        data: RoutingConfigFactory.create(user1, {
+        data: {
           campaignId,
-        }).apiPayload,
+        },
       }
     );
 
@@ -209,14 +203,20 @@ test.describe('PUT /v1/routing-configuration/:routingConfigId', () => {
   test('returns 404 - cannot update a DELETED routing config', async ({
     request,
   }) => {
-    const failedSubmitResponse = await request.put(
-      `${process.env.API_BASE_URL}/v1/routing-configuration/${routingConfigDeleted.dbEntry.id}`,
+    const { dbEntry } = RoutingConfigFactory.create(user1, {
+      status: 'DELETED',
+    });
+
+    await storageHelper.seed([dbEntry]);
+
+    const failedSubmitResponse = await request.patch(
+      `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}`,
       {
         headers: {
           Authorization: await user1.getAccessToken(),
+          'X-Lock-Number': String(dbEntry.lockNumber),
         },
         data: {
-          ...routingConfigDeleted.apiPayload,
           name: 'new name',
         },
       }
@@ -235,16 +235,20 @@ test.describe('PUT /v1/routing-configuration/:routingConfigId', () => {
   test('user belonging to the same client as the creator can update', async ({
     request,
   }) => {
+    const { dbEntry, apiResponse } = RoutingConfigFactory.create(user1);
+
+    await storageHelper.seed([dbEntry]);
+
     const update = {
-      ...routingConfigSuccessfullyUpdate.apiPayload,
       name: 'new name',
     };
 
-    const updateResponse = await request.put(
-      `${process.env.API_BASE_URL}/v1/routing-configuration/${routingConfigSubmitBySharedClientUser.dbEntry.id}`,
+    const updateResponse = await request.patch(
+      `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}`,
       {
         headers: {
           Authorization: await userSharedClient.getAccessToken(),
+          'X-Lock-Number': String(dbEntry.lockNumber),
         },
         data: update,
       }
@@ -259,9 +263,10 @@ test.describe('PUT /v1/routing-configuration/:routingConfigId', () => {
     expect(updated).toEqual({
       statusCode: 200,
       data: {
-        ...routingConfigSubmitBySharedClientUser.apiResponse,
+        ...apiResponse,
         ...update,
         updatedAt: expect.stringMatching(isoDateRegExp),
+        lockNumber: dbEntry.lockNumber + 1,
       },
     });
   });
@@ -269,13 +274,19 @@ test.describe('PUT /v1/routing-configuration/:routingConfigId', () => {
   test('returns 400 if routing feature is disabled on the client', async ({
     request,
   }) => {
-    const response = await request.put(
-      `${process.env.API_BASE_URL}/v1/routing-configuration/some-routing-config`,
+    const { dbEntry, apiPayload } =
+      RoutingConfigFactory.create(userRoutingDisabled);
+
+    await storageHelper.seed([dbEntry]);
+
+    const response = await request.patch(
+      `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}`,
       {
         headers: {
           Authorization: await userRoutingDisabled.getAccessToken(),
+          'X-Lock-Number': String(dbEntry.lockNumber),
         },
-        data: RoutingConfigFactory.create(userRoutingDisabled).apiPayload,
+        data: apiPayload,
       }
     );
 
@@ -291,9 +302,9 @@ test.describe('PUT /v1/routing-configuration/:routingConfigId', () => {
     test('name only - returns 200 and the updated routing config data', async ({
       request,
     }) => {
-      const routingConfig = RoutingConfigFactory.create(user1);
+      const { dbEntry, apiResponse } = RoutingConfigFactory.create(user1);
 
-      await storageHelper.seed([routingConfig.dbEntry]);
+      await storageHelper.seed([dbEntry]);
 
       const update = {
         name: 'new name',
@@ -301,11 +312,12 @@ test.describe('PUT /v1/routing-configuration/:routingConfigId', () => {
 
       const start = new Date();
 
-      const updateResponse = await request.put(
-        `${process.env.API_BASE_URL}/v1/routing-configuration/${routingConfig.dbEntry.id}`,
+      const updateResponse = await request.patch(
+        `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}`,
         {
           headers: {
             Authorization: await user1.getAccessToken(),
+            'X-Lock-Number': String(dbEntry.lockNumber),
           },
           data: update,
         }
@@ -318,9 +330,10 @@ test.describe('PUT /v1/routing-configuration/:routingConfigId', () => {
       expect(updated).toEqual({
         statusCode: 200,
         data: {
-          ...routingConfig.apiResponse,
+          ...apiResponse,
           ...update,
           updatedAt: expect.stringMatching(isoDateRegExp),
+          lockNumber: dbEntry.lockNumber + 1,
         },
       });
 
@@ -328,26 +341,28 @@ test.describe('PUT /v1/routing-configuration/:routingConfigId', () => {
         start,
         new Date(),
       ]);
-      expect(updated.data.createdAt).toEqual(routingConfig.dbEntry.createdAt);
+      expect(updated.data.createdAt).toEqual(dbEntry.createdAt);
     });
 
     test('campaignId only - returns 200 and the updated routing config data', async ({
       request,
     }) => {
-      const routingConfig = RoutingConfigFactory.create(userMultiCampaign);
+      const { dbEntry, apiResponse } =
+        RoutingConfigFactory.create(userMultiCampaign);
 
-      await storageHelper.seed([routingConfig.dbEntry]);
+      await storageHelper.seed([dbEntry]);
 
       const update = {
         campaignId: userMultiCampaign.campaignIds?.[1],
       };
       const start = new Date();
 
-      const updateResponse = await request.put(
-        `${process.env.API_BASE_URL}/v1/routing-configuration/${routingConfig.dbEntry.id}`,
+      const updateResponse = await request.patch(
+        `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}`,
         {
           headers: {
             Authorization: await userMultiCampaign.getAccessToken(),
+            'X-Lock-Number': String(dbEntry.lockNumber),
           },
           data: update,
         }
@@ -360,9 +375,10 @@ test.describe('PUT /v1/routing-configuration/:routingConfigId', () => {
       expect(updated).toEqual({
         statusCode: 200,
         data: {
-          ...routingConfig.apiResponse,
+          ...apiResponse,
           ...update,
           updatedAt: expect.stringMatching(isoDateRegExp),
+          lockNumber: dbEntry.lockNumber + 1,
         },
       });
 
@@ -370,15 +386,15 @@ test.describe('PUT /v1/routing-configuration/:routingConfigId', () => {
         start,
         new Date(),
       ]);
-      expect(updated.data.createdAt).toEqual(routingConfig.dbEntry.createdAt);
+      expect(updated.data.createdAt).toEqual(dbEntry.createdAt);
     });
 
     test('cascade and cascadeGroupOverrides - returns 200 and the updated routing config data', async ({
       request,
     }) => {
-      const routingConfig = RoutingConfigFactory.create(user1);
+      const { dbEntry, apiResponse } = RoutingConfigFactory.create(user1);
 
-      await storageHelper.seed([routingConfig.dbEntry]);
+      await storageHelper.seed([dbEntry]);
 
       const update = {
         cascade: [
@@ -394,11 +410,12 @@ test.describe('PUT /v1/routing-configuration/:routingConfigId', () => {
 
       const start = new Date();
 
-      const updateResponse = await request.put(
-        `${process.env.API_BASE_URL}/v1/routing-configuration/${routingConfig.dbEntry.id}`,
+      const updateResponse = await request.patch(
+        `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}`,
         {
           headers: {
             Authorization: await user1.getAccessToken(),
+            'X-Lock-Number': String(dbEntry.lockNumber),
           },
           data: update,
         }
@@ -411,9 +428,10 @@ test.describe('PUT /v1/routing-configuration/:routingConfigId', () => {
       expect(updated).toEqual({
         statusCode: 200,
         data: {
-          ...routingConfig.apiResponse,
+          ...apiResponse,
           ...update,
           updatedAt: expect.stringMatching(isoDateRegExp),
+          lockNumber: dbEntry.lockNumber + 1,
         },
       });
 
@@ -421,13 +439,13 @@ test.describe('PUT /v1/routing-configuration/:routingConfigId', () => {
         start,
         new Date(),
       ]);
-      expect(updated.data.createdAt).toEqual(routingConfig.dbEntry.createdAt);
+      expect(updated.data.createdAt).toEqual(dbEntry.createdAt);
     });
 
     test('cascade and cascadeGroupOverrides with supplierReferences - returns 200 and the updated routing config data', async ({
       request,
     }) => {
-      const routingConfig = RoutingConfigFactory.create(user1, {
+      const { dbEntry, apiResponse } = RoutingConfigFactory.create(user1, {
         cascade: [
           {
             cascadeGroups: ['standard'],
@@ -441,7 +459,7 @@ test.describe('PUT /v1/routing-configuration/:routingConfigId', () => {
         ],
       });
 
-      await storageHelper.seed([routingConfig.dbEntry]);
+      await storageHelper.seed([dbEntry]);
 
       const update = {
         cascade: [
@@ -457,11 +475,12 @@ test.describe('PUT /v1/routing-configuration/:routingConfigId', () => {
 
       const start = new Date();
 
-      const updateResponse = await request.put(
-        `${process.env.API_BASE_URL}/v1/routing-configuration/${routingConfig.dbEntry.id}`,
+      const updateResponse = await request.patch(
+        `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}`,
         {
           headers: {
             Authorization: await user1.getAccessToken(),
+            'X-Lock-Number': String(dbEntry.lockNumber),
           },
           data: update,
         }
@@ -474,9 +493,10 @@ test.describe('PUT /v1/routing-configuration/:routingConfigId', () => {
       expect(updated).toEqual({
         statusCode: 200,
         data: {
-          ...routingConfig.apiResponse,
+          ...apiResponse,
           ...update,
           updatedAt: expect.stringMatching(isoDateRegExp),
+          lockNumber: dbEntry.lockNumber + 1,
         },
       });
 
@@ -484,15 +504,15 @@ test.describe('PUT /v1/routing-configuration/:routingConfigId', () => {
         start,
         new Date(),
       ]);
-      expect(updated.data.createdAt).toEqual(routingConfig.dbEntry.createdAt);
+      expect(updated.data.createdAt).toEqual(dbEntry.createdAt);
     });
 
     test('cascade without cascadeGroupOverrides - returns 400', async ({
       request,
     }) => {
-      const routingConfig = RoutingConfigFactory.create(user1);
+      const { dbEntry } = RoutingConfigFactory.create(user1);
 
-      await storageHelper.seed([routingConfig.dbEntry]);
+      await storageHelper.seed([dbEntry]);
 
       const update = {
         cascade: [
@@ -505,11 +525,12 @@ test.describe('PUT /v1/routing-configuration/:routingConfigId', () => {
         ],
       };
 
-      const updateResponse = await request.put(
-        `${process.env.API_BASE_URL}/v1/routing-configuration/${routingConfig.dbEntry.id}`,
+      const updateResponse = await request.patch(
+        `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}`,
         {
           headers: {
             Authorization: await user1.getAccessToken(),
+            'X-Lock-Number': String(dbEntry.lockNumber),
           },
           data: update,
         }
@@ -532,19 +553,20 @@ test.describe('PUT /v1/routing-configuration/:routingConfigId', () => {
     test('cascadeGroupOverrides without cascade - returns 400', async ({
       request,
     }) => {
-      const routingConfig = RoutingConfigFactory.create(user1);
+      const { dbEntry } = RoutingConfigFactory.create(user1);
 
-      await storageHelper.seed([routingConfig.dbEntry]);
+      await storageHelper.seed([dbEntry]);
 
       const update = {
         cascadeGroupOverrides: [],
       };
 
-      const response = await request.put(
-        `${process.env.API_BASE_URL}/v1/routing-configuration/${routingConfig.dbEntry.id}`,
+      const response = await request.patch(
+        `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}`,
         {
           headers: {
             Authorization: await user1.getAccessToken(),
+            'X-Lock-Number': String(dbEntry.lockNumber),
           },
           data: update,
         }
@@ -563,17 +585,18 @@ test.describe('PUT /v1/routing-configuration/:routingConfigId', () => {
     });
 
     test('empty payload - returns 400', async ({ request }) => {
-      const routingConfig = RoutingConfigFactory.create(user1);
+      const { dbEntry } = RoutingConfigFactory.create(user1);
 
-      await storageHelper.seed([routingConfig.dbEntry]);
+      await storageHelper.seed([dbEntry]);
 
       const update = {};
 
-      const response = await request.put(
-        `${process.env.API_BASE_URL}/v1/routing-configuration/${routingConfig.dbEntry.id}`,
+      const response = await request.patch(
+        `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}`,
         {
           headers: {
             Authorization: await user1.getAccessToken(),
+            'X-Lock-Number': String(dbEntry.lockNumber),
           },
           data: update,
         }
@@ -590,4 +613,61 @@ test.describe('PUT /v1/routing-configuration/:routingConfigId', () => {
       });
     });
   });
+
+  test('returns 409 if the lock number header is not set', async ({
+    request,
+  }) => {
+    const { dbEntry } = RoutingConfigFactory.create(user1);
+
+    await storageHelper.seed([dbEntry]);
+
+    const response = await request.patch(
+      `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}`,
+      {
+        headers: {
+          Authorization: await user1.getAccessToken(),
+        },
+        data: {
+          name: 'new name',
+        },
+      }
+    );
+
+    expect(response.status()).toBe(409);
+
+    expect(await response.json()).toEqual({
+      statusCode: 409,
+      technicalMessage:
+        'Lock number mismatch - Message Plan has been modified since last read',
+    });
+  });
+
+  test('returns 409 if the lock number header does not match the current one', async ({
+    request,
+  }) => {
+    const { dbEntry } = RoutingConfigFactory.create(user1);
+
+    await storageHelper.seed([dbEntry]);
+
+    const response = await request.patch(
+      `${process.env.API_BASE_URL}/v1/routing-configuration/${dbEntry.id}`,
+      {
+        headers: {
+          Authorization: await user1.getAccessToken(),
+          'X-Lock-Number': String(dbEntry.lockNumber + 1),
+        },
+        data: {
+          name: 'new name',
+        },
+      }
+    );
+
+    expect(response.status()).toBe(409);
+
+    expect(await response.json()).toEqual({
+      statusCode: 409,
+      technicalMessage:
+        'Lock number mismatch - Message Plan has been modified since last read',
+    });
+  });
 });
diff --git a/tests/test-team/template-mgmt-api-tests/update-template.api.spec.ts b/tests/test-team/template-mgmt-api-tests/update-template.api.spec.ts
index 8bf693395..f7792c274 100644
--- a/tests/test-team/template-mgmt-api-tests/update-template.api.spec.ts
+++ b/tests/test-team/template-mgmt-api-tests/update-template.api.spec.ts
@@ -2108,7 +2108,8 @@ test.describe('PUT /v1/template/:templateId', () => {
 
     expect(body).toEqual({
       statusCode: 409,
-      technicalMessage: 'Invalid lock number',
+      technicalMessage:
+        'Lock number mismatch - Template has been modified since last read',
     });
   });
 
@@ -2153,7 +2154,8 @@ test.describe('PUT /v1/template/:templateId', () => {
 
     expect(body).toEqual({
       statusCode: 409,
-      technicalMessage: 'Invalid lock number',
+      technicalMessage:
+        'Lock number mismatch - Template has been modified since last read',
     });
   });
 });
diff --git a/tests/test-team/template-mgmt-component-tests/email/template-mgmt-edit-email-page.component.spec.ts b/tests/test-team/template-mgmt-component-tests/email/template-mgmt-edit-email-page.component.spec.ts
index b8eb46e1d..09957b8ad 100644
--- a/tests/test-team/template-mgmt-component-tests/email/template-mgmt-edit-email-page.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/email/template-mgmt-edit-email-page.component.spec.ts
@@ -75,9 +75,11 @@ test.describe('Edit Email message template Page', () => {
     page,
     baseURL,
   }) => {
-    const editEmailTemplatePage = new TemplateMgmtEditEmailPage(page);
+    const editEmailTemplatePage = new TemplateMgmtEditEmailPage(
+      page
+    ).setPathParam('templateId', templates.valid.id);
 
-    await editEmailTemplatePage.loadPage(templates.valid.id);
+    await editEmailTemplatePage.loadPage();
 
     await expect(page).toHaveURL(
       `${baseURL}/templates/edit-email-template/${templates.valid.id}`
@@ -91,8 +93,10 @@ test.describe('Edit Email message template Page', () => {
   test.describe('Page functionality', () => {
     test('common page tests', async ({ page, baseURL }) => {
       const props = {
-        page: new TemplateMgmtEditEmailPage(page),
-        id: templates.valid.id,
+        page: new TemplateMgmtEditEmailPage(page).setPathParam(
+          'templateId',
+          templates.valid.id
+        ),
         baseURL,
       };
 
@@ -106,9 +110,11 @@ test.describe('Edit Email message template Page', () => {
     test('when user visits page with previous data, then form fields retain previous data', async ({
       page,
     }) => {
-      const editEmailTemplatePage = new TemplateMgmtEditEmailPage(page);
+      const editEmailTemplatePage = new TemplateMgmtEditEmailPage(
+        page
+      ).setPathParam('templateId', templates.previousData.id);
 
-      await editEmailTemplatePage.loadPage(templates.previousData.id);
+      await editEmailTemplatePage.loadPage();
 
       await expect(editEmailTemplatePage.nameInput).toHaveValue(
         templates.previousData.name
@@ -124,9 +130,11 @@ test.describe('Edit Email message template Page', () => {
     test('when user clicks "Personalisation" tool tips, then tool tips are displayed', async ({
       page,
     }) => {
-      const editEmailTemplatePage = new TemplateMgmtEditEmailPage(page);
+      const editEmailTemplatePage = new TemplateMgmtEditEmailPage(
+        page
+      ).setPathParam('templateId', templates.goBackAndReturn.id);
 
-      await editEmailTemplatePage.loadPage(templates.goBackAndReturn.id);
+      await editEmailTemplatePage.loadPage();
 
       await editEmailTemplatePage.customPersonalisationFields.click();
       await expect(
@@ -142,9 +150,11 @@ test.describe('Edit Email message template Page', () => {
     test('when user clicks "Message formatting" tool tips, then tool tips are displayed', async ({
       page,
     }) => {
-      const editEmailTemplatePage = new TemplateMgmtEditEmailPage(page);
+      const editEmailTemplatePage = new TemplateMgmtEditEmailPage(
+        page
+      ).setPathParam('templateId', templates.valid.id);
 
-      await editEmailTemplatePage.loadPage(templates.valid.id);
+      await editEmailTemplatePage.loadPage();
 
       await editEmailTemplatePage.messageFormatting.assertDetailsOpen([
         editEmailTemplatePage.messageFormatting.lineBreaksAndParagraphs,
@@ -173,8 +183,11 @@ test.describe('Edit Email message template Page', () => {
         page,
         baseURL,
       }) => {
-        const editTemplatePage = new TemplateMgmtEditEmailPage(page);
-        await editTemplatePage.loadPage(templates.valid.id);
+        const editTemplatePage = new TemplateMgmtEditEmailPage(
+          page
+        ).setPathParam('templateId', templates.valid.id);
+
+        await editTemplatePage.loadPage();
         const newTabPromise = page.waitForEvent('popup');
         await page.getByRole('link', { name }).click();
         const newTab = await newTabPromise;
@@ -202,9 +215,11 @@ test.describe('Edit Email message template Page', () => {
         page,
         baseURL,
       }) => {
-        const editEmailTemplatePage = new TemplateMgmtEditEmailPage(page);
+        const editEmailTemplatePage = new TemplateMgmtEditEmailPage(
+          page
+        ).setPathParam('templateId', templates.goBackAndReturn.id);
 
-        await editEmailTemplatePage.loadPage(templates.goBackAndReturn.id);
+        await editEmailTemplatePage.loadPage();
 
         const newTabPromise = page.waitForEvent('popup');
 
@@ -228,9 +243,11 @@ test.describe('Edit Email message template Page', () => {
     test('when user clicks "Naming your templates" tool tips, then tool tips are displayed', async ({
       page,
     }) => {
-      const editEmailTemplatePage = new TemplateMgmtEditEmailPage(page);
+      const editEmailTemplatePage = new TemplateMgmtEditEmailPage(
+        page
+      ).setPathParam('templateId', templates.valid.id);
 
-      await editEmailTemplatePage.loadPage(templates.valid.id);
+      await editEmailTemplatePage.loadPage();
 
       await editEmailTemplatePage.namingYourTemplate.click({
         position: { x: 0, y: 0 },
@@ -244,9 +261,11 @@ test.describe('Edit Email message template Page', () => {
       baseURL,
       page,
     }) => {
-      const editEmailTemplatePage = new TemplateMgmtEditEmailPage(page);
+      const editEmailTemplatePage = new TemplateMgmtEditEmailPage(
+        page
+      ).setPathParam('templateId', templates.submit.id);
 
-      await editEmailTemplatePage.loadPage(templates.submit.id);
+      await editEmailTemplatePage.loadPage();
 
       await editEmailTemplatePage.nameInput.fill(
         'This is an email template name'
@@ -273,9 +292,11 @@ test.describe('Edit Email message template Page', () => {
       baseURL,
       page,
     }) => {
-      const editEmailTemplatePage = new TemplateMgmtEditEmailPage(page);
+      const editEmailTemplatePage = new TemplateMgmtEditEmailPage(
+        page
+      ).setPathParam('templateId', templates.noEmailTemplateType.id);
 
-      await editEmailTemplatePage.loadPage(templates.noEmailTemplateType.id);
+      await editEmailTemplatePage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
@@ -284,9 +305,11 @@ test.describe('Edit Email message template Page', () => {
       baseURL,
       page,
     }) => {
-      const editEmailTemplatePage = new TemplateMgmtEditEmailPage(page);
+      const editEmailTemplatePage = new TemplateMgmtEditEmailPage(
+        page
+      ).setPathParam('templateId', 'fake-template-id');
 
-      await editEmailTemplatePage.loadPage('/fake-template-id');
+      await editEmailTemplatePage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
@@ -294,9 +317,11 @@ test.describe('Edit Email message template Page', () => {
     test('when user submits form with no data, then errors are displayed', async ({
       page,
     }) => {
-      const editEmailTemplatePage = new TemplateMgmtEditEmailPage(page);
+      const editEmailTemplatePage = new TemplateMgmtEditEmailPage(
+        page
+      ).setPathParam('templateId', templates.valid.id);
 
-      await editEmailTemplatePage.loadPage(templates.valid.id);
+      await editEmailTemplatePage.loadPage();
 
       await editEmailTemplatePage.nameInput.fill('');
 
@@ -336,9 +361,11 @@ test.describe('Edit Email message template Page', () => {
     }) => {
       const errorMessage = 'Enter a template name';
 
-      const editEmailTemplatePage = new TemplateMgmtEditEmailPage(page);
+      const editEmailTemplatePage = new TemplateMgmtEditEmailPage(
+        page
+      ).setPathParam('templateId', templates.valid.id);
 
-      await editEmailTemplatePage.loadPage(templates.valid.id);
+      await editEmailTemplatePage.loadPage();
 
       await editEmailTemplatePage.nameInput.fill('');
 
@@ -366,9 +393,11 @@ test.describe('Edit Email message template Page', () => {
     }) => {
       const errorMessage = 'Enter a template subject line';
 
-      const editEmailTemplatePage = new TemplateMgmtEditEmailPage(page);
+      const editEmailTemplatePage = new TemplateMgmtEditEmailPage(
+        page
+      ).setPathParam('templateId', templates.valid.id);
 
-      await editEmailTemplatePage.loadPage(templates.valid.id);
+      await editEmailTemplatePage.loadPage();
 
       await editEmailTemplatePage.nameInput.fill('template-name');
 
@@ -395,9 +424,11 @@ test.describe('Edit Email message template Page', () => {
     }) => {
       const errorMessage = 'Enter a template message';
 
-      const editEmailTemplatePage = new TemplateMgmtEditEmailPage(page);
+      const editEmailTemplatePage = new TemplateMgmtEditEmailPage(
+        page
+      ).setPathParam('templateId', templates.valid.id);
 
-      await editEmailTemplatePage.loadPage(templates.valid.id);
+      await editEmailTemplatePage.loadPage();
 
       await editEmailTemplatePage.nameInput.fill('template-name');
 
@@ -425,9 +456,11 @@ test.describe('Edit Email message template Page', () => {
     }) => {
       const errorMessage = 'URLs must start with https://';
 
-      const createEmailTemplatePage = new TemplateMgmtEditEmailPage(page);
+      const createEmailTemplatePage = new TemplateMgmtEditEmailPage(
+        page
+      ).setPathParam('templateId', templates.valid.id);
 
-      await createEmailTemplatePage.loadPage(templates.valid.id);
+      await createEmailTemplatePage.loadPage();
 
       await createEmailTemplatePage.nameInput.fill('template-name');
 
diff --git a/tests/test-team/template-mgmt-component-tests/email/template-mgmt-preview-email-page.component.spec.ts b/tests/test-team/template-mgmt-component-tests/email/template-mgmt-preview-email-page.component.spec.ts
index a810cae11..243b11d93 100644
--- a/tests/test-team/template-mgmt-component-tests/email/template-mgmt-preview-email-page.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/email/template-mgmt-preview-email-page.component.spec.ts
@@ -78,9 +78,12 @@ test.describe('Preview Email message template Page', () => {
     page,
     baseURL,
   }) => {
-    const previewPage = new TemplateMgmtPreviewEmailPage(page);
+    const previewPage = new TemplateMgmtPreviewEmailPage(page).setPathParam(
+      'templateId',
+      templates.valid.id
+    );
 
-    await previewPage.loadPage(templates.valid.id);
+    await previewPage.loadPage();
 
     await expect(page).toHaveURL(
       `${baseURL}/templates/preview-email-template/${templates.valid.id}`
@@ -98,8 +101,10 @@ test.describe('Preview Email message template Page', () => {
   test.describe('Page functionality', () => {
     test('common page tests', async ({ page, baseURL }) => {
       const props = {
-        page: new TemplateMgmtPreviewEmailPage(page),
-        id: templates.valid.id,
+        page: new TemplateMgmtPreviewEmailPage(page).setPathParam(
+          'templateId',
+          templates.valid.id
+        ),
         baseURL,
       };
 
@@ -115,9 +120,12 @@ test.describe('Preview Email message template Page', () => {
       baseURL,
       page,
     }) => {
-      const previewPage = new TemplateMgmtPreviewEmailPage(page);
+      const previewPage = new TemplateMgmtPreviewEmailPage(page).setPathParam(
+        'templateId',
+        templates.valid.id
+      );
 
-      await previewPage.loadPage(templates.valid.id);
+      await previewPage.loadPage();
 
       await previewPage.editButton.click();
 
@@ -132,9 +140,11 @@ test.describe('Preview Email message template Page', () => {
       baseURL,
       page,
     }) => {
-      const previewEmailTemplatePage = new TemplateMgmtPreviewEmailPage(page);
+      const previewEmailTemplatePage = new TemplateMgmtPreviewEmailPage(
+        page
+      ).setPathParam('templateId', templates.empty.id);
 
-      await previewEmailTemplatePage.loadPage(templates.empty.id);
+      await previewEmailTemplatePage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
@@ -143,9 +153,11 @@ test.describe('Preview Email message template Page', () => {
       baseURL,
       page,
     }) => {
-      const previewEmailTemplatePage = new TemplateMgmtPreviewEmailPage(page);
+      const previewEmailTemplatePage = new TemplateMgmtPreviewEmailPage(
+        page
+      ).setPathParam('templateId', 'fake-template-id');
 
-      await previewEmailTemplatePage.loadPage('/fake-template-id');
+      await previewEmailTemplatePage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
@@ -161,9 +173,12 @@ test.describe('Preview Email message template Page', () => {
     }) => {
       await loginAsUser(routingDisabledUser, page);
 
-      const previewPage = new TemplateMgmtPreviewEmailPage(page);
+      const previewPage = new TemplateMgmtPreviewEmailPage(page).setPathParam(
+        'templateId',
+        templates.routingDisabled.id
+      );
 
-      await previewPage.loadPage(templates.routingDisabled.id);
+      await previewPage.loadPage();
 
       await expect(page).toHaveURL(
         `${baseURL}/templates/preview-email-template/${templates.routingDisabled.id}`
@@ -187,9 +202,12 @@ test.describe('Preview Email message template Page', () => {
       }) => {
         await loginAsUser(routingDisabledUser, page);
 
-        const previewPage = new TemplateMgmtPreviewEmailPage(page);
+        const previewPage = new TemplateMgmtPreviewEmailPage(page).setPathParam(
+          'templateId',
+          templates.routingDisabled.id
+        );
 
-        await previewPage.loadPage(templates.routingDisabled.id);
+        await previewPage.loadPage();
 
         await previewPage.editRadioOption.click();
 
@@ -206,16 +224,19 @@ test.describe('Preview Email message template Page', () => {
       }) => {
         await loginAsUser(routingDisabledUser, page);
 
-        const previewPage = new TemplateMgmtPreviewEmailPage(page);
+        const previewPage = new TemplateMgmtPreviewEmailPage(page).setPathParam(
+          'templateId',
+          templates.routingDisabled.id
+        );
 
-        await previewPage.loadPage(templates.routingDisabled.id);
+        await previewPage.loadPage();
 
         await previewPage.submitRadioOption.click();
 
         await previewPage.clickContinueButton();
 
         await expect(page).toHaveURL(
-          `${baseURL}/templates/submit-email-template/${templates.routingDisabled.id}`
+          `${baseURL}/templates/submit-email-template/${templates.routingDisabled.id}?lockNumber=${templates.routingDisabled.lockNumber}`
         );
       });
     });
@@ -228,9 +249,12 @@ test.describe('Preview Email message template Page', () => {
 
         const errorMessage = 'Select an option';
 
-        const previewPage = new TemplateMgmtPreviewEmailPage(page);
+        const previewPage = new TemplateMgmtPreviewEmailPage(page).setPathParam(
+          'templateId',
+          templates.routingDisabled.id
+        );
 
-        await previewPage.loadPage(templates.routingDisabled.id);
+        await previewPage.loadPage();
 
         await previewPage.clickContinueButton();
 
diff --git a/tests/test-team/template-mgmt-component-tests/email/template-mgmt-preview-submitted-email-page.component.spec.ts b/tests/test-team/template-mgmt-component-tests/email/template-mgmt-preview-submitted-email-page.component.spec.ts
index 0496bc07f..7a56d5aa4 100644
--- a/tests/test-team/template-mgmt-component-tests/email/template-mgmt-preview-submitted-email-page.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/email/template-mgmt-preview-submitted-email-page.component.spec.ts
@@ -63,9 +63,12 @@ test.describe('Preview submitted Email message template Page', () => {
     baseURL,
   }) => {
     const previewSubmittedEmailTemplatePage =
-      new TemplateMgmtPreviewSubmittedEmailPage(page);
+      new TemplateMgmtPreviewSubmittedEmailPage(page).setPathParam(
+        'templateId',
+        templates.valid.id
+      );
 
-    await previewSubmittedEmailTemplatePage.loadPage(templates.valid.id);
+    await previewSubmittedEmailTemplatePage.loadPage();
 
     await expect(page).toHaveURL(
       `${baseURL}/templates/preview-submitted-email-template/${templates.valid.id}`
@@ -87,8 +90,10 @@ test.describe('Preview submitted Email message template Page', () => {
   test.describe('Page functionality', () => {
     test('common page tests', async ({ page, baseURL }) => {
       const props = {
-        page: new TemplateMgmtPreviewSubmittedEmailPage(page),
-        id: templates.valid.id,
+        page: new TemplateMgmtPreviewSubmittedEmailPage(page).setPathParam(
+          'templateId',
+          templates.valid.id
+        ),
         baseURL,
       };
 
@@ -107,9 +112,12 @@ test.describe('Preview submitted Email message template Page', () => {
       page,
     }) => {
       const previewSubmittedEmailTemplatePage =
-        new TemplateMgmtPreviewSubmittedEmailPage(page);
+        new TemplateMgmtPreviewSubmittedEmailPage(page).setPathParam(
+          'templateId',
+          templates.invalid.id
+        );
 
-      await previewSubmittedEmailTemplatePage.loadPage(templates.invalid.id);
+      await previewSubmittedEmailTemplatePage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
@@ -119,9 +127,12 @@ test.describe('Preview submitted Email message template Page', () => {
       page,
     }) => {
       const previewSubmittedEmailTemplatePage =
-        new TemplateMgmtPreviewSubmittedEmailPage(page);
+        new TemplateMgmtPreviewSubmittedEmailPage(page).setPathParam(
+          'templateId',
+          'fake-template-id'
+        );
 
-      await previewSubmittedEmailTemplatePage.loadPage('/fake-template-id');
+      await previewSubmittedEmailTemplatePage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
diff --git a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-create-letter-template-page.component.spec.ts b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-create-letter-template-page.component.spec.ts
index ef099d0e6..920e56c86 100644
--- a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-create-letter-template-page.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-create-letter-template-page.component.spec.ts
@@ -245,7 +245,6 @@ test.describe('Upload letter Template Page', () => {
 
     test('redirects to error page when campaign ID is missing', async ({
       page,
-      baseURL,
     }) => {
       await loginAsUser(userWithoutCampaignId, page);
 
@@ -255,9 +254,7 @@ test.describe('Upload letter Template Page', () => {
 
       await createTemplatePage.loadPage();
 
-      await expect(page).toHaveURL(
-        `${baseURL}/templates/${TemplateMgmtUploadLetterMissingCampaignClientIdPage.pageUrlSegments[0]}`
-      );
+      await expect(page).toHaveURL(missingClientOrCampaignIdErrorPage.getUrl());
 
       await assertMissingClientOrCampaignIdErrorPage(
         missingClientOrCampaignIdErrorPage
diff --git a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-letter-page.component.spec.ts b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-letter-page.component.spec.ts
index cfba5d431..b1c6a1de7 100644
--- a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-letter-page.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-letter-page.component.spec.ts
@@ -118,15 +118,14 @@ test.describe('Preview Letter template Page', () => {
 
   test('when user visits page, then page is loaded, can click to go to submit page', async ({
     page,
-    baseURL,
   }) => {
-    const previewLetterTemplatePage = new TemplateMgmtPreviewLetterPage(page);
+    const previewLetterTemplatePage = new TemplateMgmtPreviewLetterPage(
+      page
+    ).setPathParam('templateId', templates.notYetSubmitted.id);
 
-    await previewLetterTemplatePage.loadPage(templates.notYetSubmitted.id);
+    await previewLetterTemplatePage.loadPage();
 
-    await expect(page).toHaveURL(
-      `${baseURL}/templates/${TemplateMgmtPreviewLetterPage.pageUrlSegments[0]}/${templates.notYetSubmitted.id}`
-    );
+    await expect(page).toHaveURL(previewLetterTemplatePage.getUrl());
 
     await expect(previewLetterTemplatePage.pageHeading).toContainText(
       templates.notYetSubmitted.name
@@ -142,20 +141,26 @@ test.describe('Preview Letter template Page', () => {
 
     await previewLetterTemplatePage.clickContinueButton();
 
-    await expect(page).toHaveURL(TemplateMgmtSubmitLetterPage.urlRegexp);
+    const submitPage = new TemplateMgmtSubmitLetterPage(page)
+      .setPathParam('templateId', templates.notYetSubmitted.id)
+      .setSearchParam(
+        'lockNumber',
+        String(templates.notYetSubmitted.lockNumber)
+      );
+
+    await expect(page).toHaveURL(submitPage.getUrl());
   });
 
   test('when proofingEnabled is false, user can click to go submit page', async ({
     page,
-    baseURL,
   }) => {
-    const previewLetterTemplatePage = new TemplateMgmtPreviewLetterPage(page);
+    const previewLetterTemplatePage = new TemplateMgmtPreviewLetterPage(
+      page
+    ).setPathParam('templateId', templates.proofingDisabled.id);
 
-    await previewLetterTemplatePage.loadPage(templates.proofingDisabled.id);
+    await previewLetterTemplatePage.loadPage();
 
-    await expect(page).toHaveURL(
-      `${baseURL}/templates/${TemplateMgmtPreviewLetterPage.pageUrlSegments[0]}/${templates.proofingDisabled.id}`
-    );
+    await expect(page).toHaveURL(previewLetterTemplatePage.getUrl());
 
     await expect(previewLetterTemplatePage.pageHeading).toContainText(
       templates.proofingDisabled.name
@@ -163,20 +168,26 @@ test.describe('Preview Letter template Page', () => {
 
     await previewLetterTemplatePage.clickContinueButton();
 
-    await expect(page).toHaveURL(TemplateMgmtSubmitLetterPage.urlRegexp);
+    const submitPage = new TemplateMgmtSubmitLetterPage(page)
+      .setPathParam('templateId', templates.proofingDisabled.id)
+      .setSearchParam(
+        'lockNumber',
+        String(templates.proofingDisabled.lockNumber)
+      );
+
+    await expect(page).toHaveURL(submitPage.getUrl());
   });
 
   test('when template is pending a proof request, user can click to go to request page', async ({
     page,
-    baseURL,
   }) => {
-    const previewLetterTemplatePage = new TemplateMgmtPreviewLetterPage(page);
+    const previewLetterTemplatePage = new TemplateMgmtPreviewLetterPage(
+      page
+    ).setPathParam('templateId', templates.pendingProofRequest.id);
 
-    await previewLetterTemplatePage.loadPage(templates.pendingProofRequest.id);
+    await previewLetterTemplatePage.loadPage();
 
-    await expect(page).toHaveURL(
-      `${baseURL}/templates/${TemplateMgmtPreviewLetterPage.pageUrlSegments[0]}/${templates.pendingProofRequest.id}`
-    );
+    await expect(page).toHaveURL(previewLetterTemplatePage.getUrl());
 
     await expect(previewLetterTemplatePage.pageHeading).toContainText(
       templates.pendingProofRequest.name
@@ -184,20 +195,26 @@ test.describe('Preview Letter template Page', () => {
 
     await previewLetterTemplatePage.clickContinueButton();
 
-    await expect(page).toHaveURL(TemplateMgmtRequestProofPage.urlRegexp);
+    const requestProofPage = new TemplateMgmtRequestProofPage(page)
+      .setPathParam('templateId', templates.pendingProofRequest.id)
+      .setSearchParam(
+        'lockNumber',
+        String(templates.pendingProofRequest.lockNumber)
+      );
+
+    await expect(page).toHaveURL(requestProofPage.getUrl());
   });
 
   test('when status is not actionable, no continue button is displayed', async ({
     page,
-    baseURL,
   }) => {
-    const previewLetterTemplatePage = new TemplateMgmtPreviewLetterPage(page);
+    const previewLetterTemplatePage = new TemplateMgmtPreviewLetterPage(
+      page
+    ).setPathParam('templateId', templates.pendingUpload.id);
 
-    await previewLetterTemplatePage.loadPage(templates.pendingUpload.id);
+    await previewLetterTemplatePage.loadPage();
 
-    await expect(page).toHaveURL(
-      `${baseURL}/templates/${TemplateMgmtPreviewLetterPage.pageUrlSegments[0]}/${templates.pendingUpload.id}`
-    );
+    await expect(page).toHaveURL(previewLetterTemplatePage.getUrl());
 
     await expect(previewLetterTemplatePage.pageHeading).toContainText(
       templates.pendingUpload.name
@@ -212,9 +229,11 @@ test.describe('Preview Letter template Page', () => {
       baseURL,
       page,
     }) => {
-      const previewLetterTemplatePage = new TemplateMgmtPreviewLetterPage(page);
+      const previewLetterTemplatePage = new TemplateMgmtPreviewLetterPage(
+        page
+      ).setPathParam('templateId', templates.empty.id);
 
-      await previewLetterTemplatePage.loadPage(templates.empty.id);
+      await previewLetterTemplatePage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
@@ -223,24 +242,25 @@ test.describe('Preview Letter template Page', () => {
       baseURL,
       page,
     }) => {
-      const previewLetterTemplatePage = new TemplateMgmtPreviewLetterPage(page);
+      const previewLetterTemplatePage = new TemplateMgmtPreviewLetterPage(
+        page
+      ).setPathParam('templateId', 'fake-template-id');
 
-      await previewLetterTemplatePage.loadPage('/fake-template-id');
+      await previewLetterTemplatePage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
 
     test('when user visits page with pending files, submit is unavailable', async ({
       page,
-      baseURL,
     }) => {
-      const previewLetterTemplatePage = new TemplateMgmtPreviewLetterPage(page);
+      const previewLetterTemplatePage = new TemplateMgmtPreviewLetterPage(
+        page
+      ).setPathParam('templateId', templates.pending.id);
 
-      await previewLetterTemplatePage.loadPage(templates.pending.id);
+      await previewLetterTemplatePage.loadPage();
 
-      await expect(page).toHaveURL(
-        `${baseURL}/templates/${TemplateMgmtPreviewLetterPage.pageUrlSegments[0]}/${templates.pending.id}`
-      );
+      await expect(page).toHaveURL(previewLetterTemplatePage.getUrl());
 
       await expect(previewLetterTemplatePage.pageHeading).toContainText(
         'test-pending-template-letter'
@@ -252,17 +272,16 @@ test.describe('Preview Letter template Page', () => {
 
     test('when user visits page with failed virus scan, submit is unavailable and an error is displayed', async ({
       page,
-      baseURL,
     }) => {
       const errorMessage = 'The file(s) you uploaded may contain a virus.';
 
-      const previewLetterTemplatePage = new TemplateMgmtPreviewLetterPage(page);
+      const previewLetterTemplatePage = new TemplateMgmtPreviewLetterPage(
+        page
+      ).setPathParam('templateId', templates.virus.id);
 
-      await previewLetterTemplatePage.loadPage(templates.virus.id);
+      await previewLetterTemplatePage.loadPage();
 
-      await expect(page).toHaveURL(
-        `${baseURL}/templates/${TemplateMgmtPreviewLetterPage.pageUrlSegments[0]}/${templates.virus.id}`
-      );
+      await expect(page).toHaveURL(previewLetterTemplatePage.getUrl());
 
       await expect(previewLetterTemplatePage.pageHeading).toContainText(
         'test-virus-template-letter'
@@ -277,18 +296,17 @@ test.describe('Preview Letter template Page', () => {
 
     test('when user visits page with failed validation, submit is unavailable and an error is displayed', async ({
       page,
-      baseURL,
     }) => {
       const errorMessage =
         'The personalisation fields in your files are missing or do not match.';
 
-      const previewLetterTemplatePage = new TemplateMgmtPreviewLetterPage(page);
+      const previewLetterTemplatePage = new TemplateMgmtPreviewLetterPage(
+        page
+      ).setPathParam('templateId', templates.invalid.id);
 
-      await previewLetterTemplatePage.loadPage(templates.invalid.id);
+      await previewLetterTemplatePage.loadPage();
 
-      await expect(page).toHaveURL(
-        `${baseURL}/templates/${TemplateMgmtPreviewLetterPage.pageUrlSegments[0]}/${templates.invalid.id}`
-      );
+      await expect(page).toHaveURL(previewLetterTemplatePage.getUrl());
 
       await expect(previewLetterTemplatePage.pageHeading).toContainText(
         'test-invalid-template-letter'
@@ -303,15 +321,14 @@ test.describe('Preview Letter template Page', () => {
 
     test('when the template has proofs, only those passing the virus scan are displayed', async ({
       page,
-      baseURL,
     }) => {
-      const previewLetterTemplatePage = new TemplateMgmtPreviewLetterPage(page);
+      const previewLetterTemplatePage = new TemplateMgmtPreviewLetterPage(
+        page
+      ).setPathParam('templateId', templates.withProofs.id);
 
-      await previewLetterTemplatePage.loadPage(templates.withProofs.id);
+      await previewLetterTemplatePage.loadPage();
 
-      await expect(page).toHaveURL(
-        `${baseURL}/templates/${TemplateMgmtPreviewLetterPage.pageUrlSegments[0]}/${templates.withProofs.id}`
-      );
+      await expect(page).toHaveURL(previewLetterTemplatePage.getUrl());
 
       await expect(previewLetterTemplatePage.pageHeading).toContainText(
         templates.withProofs.name
diff --git a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-submitted-letter-page.component.spec.ts b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-submitted-letter-page.component.spec.ts
index 66153a54e..a0e18131b 100644
--- a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-submitted-letter-page.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-preview-submitted-letter-page.component.spec.ts
@@ -73,9 +73,12 @@ test.describe('Preview submitted Letter message template Page', () => {
     baseURL,
   }) => {
     const previewSubmittedLetterTemplatePage =
-      new TemplateMgmtPreviewSubmittedLetterPage(page);
+      new TemplateMgmtPreviewSubmittedLetterPage(page).setPathParam(
+        'templateId',
+        templates.valid.id
+      );
 
-    await previewSubmittedLetterTemplatePage.loadPage(templates.valid.id);
+    await previewSubmittedLetterTemplatePage.loadPage();
 
     await expect(page).toHaveURL(
       `${baseURL}/templates/preview-submitted-letter-template/${templates.valid.id}`
@@ -97,8 +100,10 @@ test.describe('Preview submitted Letter message template Page', () => {
   test.describe('Page functionality', () => {
     test('common page tests', async ({ page, baseURL }) => {
       const props = {
-        page: new TemplateMgmtPreviewSubmittedLetterPage(page),
-        id: templates.valid.id,
+        page: new TemplateMgmtPreviewSubmittedLetterPage(page).setPathParam(
+          'templateId',
+          templates.valid.id
+        ),
         baseURL,
       };
 
@@ -117,9 +122,12 @@ test.describe('Preview submitted Letter message template Page', () => {
       page,
     }) => {
       const previewSubmittedLetterTemplatePage =
-        new TemplateMgmtPreviewSubmittedLetterPage(page);
+        new TemplateMgmtPreviewSubmittedLetterPage(page).setPathParam(
+          'templateId',
+          templates.invalid.id
+        );
 
-      await previewSubmittedLetterTemplatePage.loadPage(templates.invalid.id);
+      await previewSubmittedLetterTemplatePage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
@@ -129,9 +137,12 @@ test.describe('Preview submitted Letter message template Page', () => {
       page,
     }) => {
       const previewSubmittedLetterTemplatePage =
-        new TemplateMgmtPreviewSubmittedLetterPage(page);
+        new TemplateMgmtPreviewSubmittedLetterPage(page).setPathParam(
+          'templateId',
+          'fake-template-id'
+        );
 
-      await previewSubmittedLetterTemplatePage.loadPage('/fake-template-id');
+      await previewSubmittedLetterTemplatePage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
diff --git a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-request-proof-page.component.spec.ts b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-request-proof-page.component.spec.ts
index 688ce89a4..e3a19307a 100644
--- a/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-request-proof-page.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/letter/template-mgmt-request-proof-page.component.spec.ts
@@ -6,6 +6,7 @@ import {
   testUsers,
 } from '../../helpers/auth/cognito-auth-helper';
 import { TemplateMgmtRequestProofPage } from '../../pages/template-mgmt-request-proof-page';
+import { TemplateMgmtPreviewLetterPage } from 'pages/letter/template-mgmt-preview-letter-page';
 
 async function createTemplates() {
   const user = await createAuthHelper().getTestUser(testUsers.User1.userId);
@@ -34,15 +35,14 @@ test.describe('Request Proof Page', () => {
 
   test('when user visits page, then page is loaded, request proof button is visible', async ({
     page,
-    baseURL,
   }) => {
-    const requestProofPage = new TemplateMgmtRequestProofPage(page);
+    const requestProofPage = new TemplateMgmtRequestProofPage(page)
+      .setPathParam('templateId', templates.valid.id)
+      .setSearchParam('lockNumber', String(templates.valid.lockNumber));
 
-    await requestProofPage.loadPage(templates.valid.id);
+    await requestProofPage.loadPage();
 
-    await expect(page).toHaveURL(
-      `${baseURL}/templates/${TemplateMgmtRequestProofPage.pageUrlSegments[0]}/${templates.valid.id}`
-    );
+    await expect(page).toHaveURL(requestProofPage.getUrl());
 
     await expect(requestProofPage.pageHeading).toContainText(
       templates.valid.name
@@ -50,4 +50,21 @@ test.describe('Request Proof Page', () => {
 
     await expect(requestProofPage.requestProofButton).toBeVisible();
   });
+
+  test('redirects to the letter template preview page if the lockNumber query parameter is not set', async ({
+    page,
+  }) => {
+    const requestProofPage = new TemplateMgmtRequestProofPage(
+      page
+    ).setPathParam('templateId', templates.valid.id);
+
+    const previewPage = new TemplateMgmtPreviewLetterPage(page).setPathParam(
+      'templateId',
+      templates.valid.id
+    );
+
+    await requestProofPage.loadPage();
+
+    await expect(page).toHaveURL(previewPage.getUrl());
+  });
 });
diff --git a/tests/test-team/template-mgmt-component-tests/nhs-app/template-mgmt-edit-nhs-app-template-page.component.spec.ts b/tests/test-team/template-mgmt-component-tests/nhs-app/template-mgmt-edit-nhs-app-template-page.component.spec.ts
index af7edfb6d..5f6c2359a 100644
--- a/tests/test-team/template-mgmt-component-tests/nhs-app/template-mgmt-edit-nhs-app-template-page.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/nhs-app/template-mgmt-edit-nhs-app-template-page.component.spec.ts
@@ -54,9 +54,12 @@ test.describe('Edit NHS App Template Page', () => {
     page,
     baseURL,
   }) => {
-    const editTemplatePage = new TemplateMgmtEditNhsAppPage(page);
+    const editTemplatePage = new TemplateMgmtEditNhsAppPage(page).setPathParam(
+      'templateId',
+      templates.valid.id
+    );
 
-    await editTemplatePage.loadPage(templates.valid.id);
+    await editTemplatePage.loadPage();
 
     await expect(page).toHaveURL(
       `${baseURL}/templates/edit-nhs-app-template/${templates.valid.id}`
@@ -68,8 +71,10 @@ test.describe('Edit NHS App Template Page', () => {
 
   test('common page tests', async ({ page, baseURL }) => {
     const props = {
-      page: new TemplateMgmtEditNhsAppPage(page),
-      id: templates.valid.id,
+      page: new TemplateMgmtEditNhsAppPage(page).setPathParam(
+        'templateId',
+        templates.valid.id
+      ),
       baseURL,
     };
 
@@ -84,9 +89,12 @@ test.describe('Edit NHS App Template Page', () => {
     page,
     baseURL,
   }) => {
-    const editTemplatePage = new TemplateMgmtEditNhsAppPage(page);
+    const editTemplatePage = new TemplateMgmtEditNhsAppPage(page).setPathParam(
+      'templateId',
+      templates.valid.id
+    );
 
-    await editTemplatePage.loadPage(templates.valid.id);
+    await editTemplatePage.loadPage();
 
     await expect(page).toHaveURL(
       `${baseURL}/templates/edit-nhs-app-template/${templates.valid.id}`
@@ -107,9 +115,12 @@ test.describe('Edit NHS App Template Page', () => {
     page,
     baseURL,
   }) => {
-    const editTemplatePage = new TemplateMgmtEditNhsAppPage(page);
+    const editTemplatePage = new TemplateMgmtEditNhsAppPage(page).setPathParam(
+      'templateId',
+      templates.submit.id
+    );
 
-    await editTemplatePage.loadPage(templates.submit.id);
+    await editTemplatePage.loadPage();
     await expect(page).toHaveURL(
       `${baseURL}/templates/edit-nhs-app-template/${templates.submit.id}`
     );
@@ -129,9 +140,12 @@ test.describe('Edit NHS App Template Page', () => {
     page,
     baseURL,
   }) => {
-    const editTemplatePage = new TemplateMgmtEditNhsAppPage(page);
+    const editTemplatePage = new TemplateMgmtEditNhsAppPage(page).setPathParam(
+      'templateId',
+      templates.valid.id
+    );
 
-    await editTemplatePage.loadPage(templates.valid.id);
+    await editTemplatePage.loadPage();
 
     await expect(page).toHaveURL(
       `${baseURL}/templates/edit-nhs-app-template/${templates.valid.id}`
@@ -153,9 +167,12 @@ test.describe('Edit NHS App Template Page', () => {
     page,
     baseURL,
   }) => {
-    const editTemplatePage = new TemplateMgmtEditNhsAppPage(page);
+    const editTemplatePage = new TemplateMgmtEditNhsAppPage(page).setPathParam(
+      'templateId',
+      templates.valid.id
+    );
 
-    await editTemplatePage.loadPage(templates.valid.id);
+    await editTemplatePage.loadPage();
 
     await expect(page).toHaveURL(
       `${baseURL}/templates/edit-nhs-app-template/${templates.valid.id}`
@@ -178,9 +195,12 @@ test.describe('Edit NHS App Template Page', () => {
     page,
     baseURL,
   }) => {
-    const editTemplatePage = new TemplateMgmtEditNhsAppPage(page);
+    const editTemplatePage = new TemplateMgmtEditNhsAppPage(page).setPathParam(
+      'templateId',
+      templates.valid.id
+    );
 
-    await editTemplatePage.loadPage(templates.valid.id);
+    await editTemplatePage.loadPage();
 
     await expect(page).toHaveURL(
       `${baseURL}/templates/edit-nhs-app-template/${templates.valid.id}`
@@ -196,9 +216,12 @@ test.describe('Edit NHS App Template Page', () => {
     page,
     baseURL,
   }) => {
-    const editTemplatePage = new TemplateMgmtEditNhsAppPage(page);
+    const editTemplatePage = new TemplateMgmtEditNhsAppPage(page).setPathParam(
+      'templateId',
+      templates.valid.id
+    );
 
-    await editTemplatePage.loadPage(templates.valid.id);
+    await editTemplatePage.loadPage();
 
     await expect(page).toHaveURL(
       `${baseURL}/templates/edit-nhs-app-template/${templates.valid.id}`
@@ -220,9 +243,11 @@ test.describe('Edit NHS App Template Page', () => {
   test('Validate error messages on the edit NHS App message template page with http url in message', async ({
     page,
   }) => {
-    const createTemplatePage = new TemplateMgmtEditNhsAppPage(page);
+    const createTemplatePage = new TemplateMgmtEditNhsAppPage(
+      page
+    ).setPathParam('templateId', templates.valid.id);
 
-    await createTemplatePage.loadPage(templates.valid.id);
+    await createTemplatePage.loadPage();
     await expect(createTemplatePage.pageHeading).toHaveText(
       'Edit NHS App message template'
     );
@@ -241,9 +266,11 @@ test.describe('Edit NHS App Template Page', () => {
   test('Validate error messages on the edit NHS App message template page with angle brackets in linked url', async ({
     page,
   }) => {
-    const createTemplatePage = new TemplateMgmtEditNhsAppPage(page);
+    const createTemplatePage = new TemplateMgmtEditNhsAppPage(
+      page
+    ).setPathParam('templateId', templates.valid.id);
 
-    await createTemplatePage.loadPage(templates.valid.id);
+    await createTemplatePage.loadPage();
     await expect(createTemplatePage.pageHeading).toHaveText(
       'Edit NHS App message template'
     );
@@ -277,8 +304,10 @@ test.describe('Edit NHS App Template Page', () => {
       page,
       baseURL,
     }) => {
-      const editTemplatePage = new TemplateMgmtEditNhsAppPage(page);
-      await editTemplatePage.loadPage(templates.valid.id);
+      const editTemplatePage = new TemplateMgmtEditNhsAppPage(
+        page
+      ).setPathParam('templateId', templates.valid.id);
+      await editTemplatePage.loadPage();
 
       await expect(page).toHaveURL(
         `${baseURL}/templates/edit-nhs-app-template/${templates.valid.id}`
@@ -319,8 +348,10 @@ test.describe('Edit NHS App Template Page', () => {
       page,
       baseURL,
     }) => {
-      const editTemplatePage = new TemplateMgmtEditNhsAppPage(page);
-      await editTemplatePage.loadPage(templates.valid.id);
+      const editTemplatePage = new TemplateMgmtEditNhsAppPage(
+        page
+      ).setPathParam('templateId', templates.valid.id);
+      await editTemplatePage.loadPage();
       const newTabPromise = page.waitForEvent('popup');
       await page.getByRole('link', { name }).click();
       const newTab = await newTabPromise;
@@ -348,8 +379,11 @@ test.describe('Edit NHS App Template Page', () => {
       page,
       baseURL,
     }) => {
-      const editTemplatePage = new TemplateMgmtEditNhsAppPage(page);
-      await editTemplatePage.loadPage(templates.valid.id);
+      const editTemplatePage = new TemplateMgmtEditNhsAppPage(
+        page
+      ).setPathParam('templateId', templates.valid.id);
+
+      await editTemplatePage.loadPage();
 
       const newTabPromise = page.waitForEvent('popup');
 
@@ -369,9 +403,12 @@ test.describe('Edit NHS App Template Page', () => {
   }
 
   test('Invalid template ID test', async ({ page, baseURL }) => {
-    const editTemplatePage = new TemplateMgmtEditNhsAppPage(page);
-    const invalidTemplateId = 'invalid-template-id';
-    await editTemplatePage.attemptToLoadPageExpectFailure(invalidTemplateId);
+    const editTemplatePage = new TemplateMgmtEditNhsAppPage(page).setPathParam(
+      'templateId',
+      'invalid-template-id'
+    );
+
+    await editTemplatePage.attemptToLoadPageExpectFailure();
     const errorMessage = page.locator('.nhsuk-heading-xl');
     await Promise.all([
       expect(errorMessage).toBeVisible(),
diff --git a/tests/test-team/template-mgmt-component-tests/nhs-app/template-mgmt-preview-nhs-app-page.component.spec.ts b/tests/test-team/template-mgmt-component-tests/nhs-app/template-mgmt-preview-nhs-app-page.component.spec.ts
index 154aba4e4..e4d2c26d3 100644
--- a/tests/test-team/template-mgmt-component-tests/nhs-app/template-mgmt-preview-nhs-app-page.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/nhs-app/template-mgmt-preview-nhs-app-page.component.spec.ts
@@ -79,9 +79,12 @@ test.describe('Preview NHS App template Page', () => {
     baseURL,
     page,
   }) => {
-    const previewPage = new TemplateMgmtPreviewNhsAppPage(page);
+    const previewPage = new TemplateMgmtPreviewNhsAppPage(page).setPathParam(
+      'templateId',
+      templates.valid.id
+    );
 
-    await previewPage.loadPage(templates.valid.id);
+    await previewPage.loadPage();
 
     await expect(page).toHaveURL(
       `${baseURL}/templates/preview-nhs-app-template/${templates.valid.id}`
@@ -99,8 +102,10 @@ test.describe('Preview NHS App template Page', () => {
   test.describe('Page functionality', () => {
     test('common page tests', async ({ page, baseURL }) => {
       const props = {
-        page: new TemplateMgmtPreviewNhsAppPage(page),
-        id: templates.valid.id,
+        page: new TemplateMgmtPreviewNhsAppPage(page).setPathParam(
+          'templateId',
+          templates.valid.id
+        ),
         baseURL,
       };
 
@@ -116,9 +121,12 @@ test.describe('Preview NHS App template Page', () => {
       baseURL,
       page,
     }) => {
-      const previewPage = new TemplateMgmtPreviewNhsAppPage(page);
+      const previewPage = new TemplateMgmtPreviewNhsAppPage(page).setPathParam(
+        'templateId',
+        templates.valid.id
+      );
 
-      await previewPage.loadPage(templates.valid.id);
+      await previewPage.loadPage();
 
       await previewPage.editButton.click();
 
@@ -133,9 +141,12 @@ test.describe('Preview NHS App template Page', () => {
       baseURL,
       page,
     }) => {
-      const previewPage = new TemplateMgmtPreviewNhsAppPage(page);
+      const previewPage = new TemplateMgmtPreviewNhsAppPage(page).setPathParam(
+        'templateId',
+        templates.empty.id
+      );
 
-      await previewPage.loadPage(templates.empty.id);
+      await previewPage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
@@ -144,9 +155,12 @@ test.describe('Preview NHS App template Page', () => {
       baseURL,
       page,
     }) => {
-      const previewPage = new TemplateMgmtPreviewNhsAppPage(page);
+      const previewPage = new TemplateMgmtPreviewNhsAppPage(page).setPathParam(
+        'templateId',
+        'fake-template-id'
+      );
 
-      await previewPage.loadPage('/fake-template-id');
+      await previewPage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
@@ -162,9 +176,12 @@ test.describe('Preview NHS App template Page', () => {
     }) => {
       await loginAsUser(routingDisabledUser, page);
 
-      const previewPage = new TemplateMgmtPreviewNhsAppPage(page);
+      const previewPage = new TemplateMgmtPreviewNhsAppPage(page).setPathParam(
+        'templateId',
+        templates.routingDisabled.id
+      );
 
-      await previewPage.loadPage(templates.routingDisabled.id);
+      await previewPage.loadPage();
 
       await expect(page).toHaveURL(
         `${baseURL}/templates/preview-nhs-app-template/${templates.routingDisabled.id}`
@@ -188,9 +205,11 @@ test.describe('Preview NHS App template Page', () => {
       }) => {
         await loginAsUser(routingDisabledUser, page);
 
-        const previewPage = new TemplateMgmtPreviewNhsAppPage(page);
+        const previewPage = new TemplateMgmtPreviewNhsAppPage(
+          page
+        ).setPathParam('templateId', templates.routingDisabled.id);
 
-        await previewPage.loadPage(templates.routingDisabled.id);
+        await previewPage.loadPage();
 
         await previewPage.editRadioOption.click();
 
@@ -207,16 +226,18 @@ test.describe('Preview NHS App template Page', () => {
       }) => {
         await loginAsUser(routingDisabledUser, page);
 
-        const previewPage = new TemplateMgmtPreviewNhsAppPage(page);
+        const previewPage = new TemplateMgmtPreviewNhsAppPage(
+          page
+        ).setPathParam('templateId', templates.routingDisabled.id);
 
-        await previewPage.loadPage(templates.routingDisabled.id);
+        await previewPage.loadPage();
 
         await previewPage.submitRadioOption.click();
 
         await previewPage.clickContinueButton();
 
         await expect(page).toHaveURL(
-          `${baseURL}/templates/submit-nhs-app-template/${templates.routingDisabled.id}`
+          `${baseURL}/templates/submit-nhs-app-template/${templates.routingDisabled.id}?lockNumber=${templates.routingDisabled.lockNumber}`
         );
       });
     });
@@ -229,9 +250,11 @@ test.describe('Preview NHS App template Page', () => {
 
         const errorMessage = 'Select an option';
 
-        const previewPage = new TemplateMgmtPreviewNhsAppPage(page);
+        const previewPage = new TemplateMgmtPreviewNhsAppPage(
+          page
+        ).setPathParam('templateId', templates.routingDisabled.id);
 
-        await previewPage.loadPage(templates.routingDisabled.id);
+        await previewPage.loadPage();
 
         await previewPage.clickContinueButton();
 
diff --git a/tests/test-team/template-mgmt-component-tests/nhs-app/template-mgmt-preview-submitted-nhs-app-page.component.spec.ts b/tests/test-team/template-mgmt-component-tests/nhs-app/template-mgmt-preview-submitted-nhs-app-page.component.spec.ts
index 6694adf54..4fc6d8888 100644
--- a/tests/test-team/template-mgmt-component-tests/nhs-app/template-mgmt-preview-submitted-nhs-app-page.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/nhs-app/template-mgmt-preview-submitted-nhs-app-page.component.spec.ts
@@ -62,9 +62,12 @@ test.describe('Preview submitted NHS App message template Page', () => {
     baseURL,
   }) => {
     const previewSubmittedNHSAppTemplatePage =
-      new TemplateMgmtPreviewSubmittedNhsAppPage(page);
+      new TemplateMgmtPreviewSubmittedNhsAppPage(page).setPathParam(
+        'templateId',
+        templates.valid.id
+      );
 
-    await previewSubmittedNHSAppTemplatePage.loadPage(templates.valid.id);
+    await previewSubmittedNHSAppTemplatePage.loadPage();
 
     await expect(page).toHaveURL(
       `${baseURL}/templates/preview-submitted-nhs-app-template/${templates.valid.id}`
@@ -82,8 +85,10 @@ test.describe('Preview submitted NHS App message template Page', () => {
   test.describe('Page functionality', () => {
     test('common page tests', async ({ page, baseURL }) => {
       const props = {
-        page: new TemplateMgmtPreviewSubmittedNhsAppPage(page),
-        id: templates.valid.id,
+        page: new TemplateMgmtPreviewSubmittedNhsAppPage(page).setPathParam(
+          'templateId',
+          templates.valid.id
+        ),
         baseURL,
       };
 
@@ -102,9 +107,12 @@ test.describe('Preview submitted NHS App message template Page', () => {
       page,
     }) => {
       const previewSubmittedNHSAppTemplatePage =
-        new TemplateMgmtPreviewSubmittedNhsAppPage(page);
+        new TemplateMgmtPreviewSubmittedNhsAppPage(page).setPathParam(
+          'templateId',
+          templates.invalid.id
+        );
 
-      await previewSubmittedNHSAppTemplatePage.loadPage(templates.invalid.id);
+      await previewSubmittedNHSAppTemplatePage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
@@ -114,9 +122,12 @@ test.describe('Preview submitted NHS App message template Page', () => {
       page,
     }) => {
       const previewSubmittedNHSAppTemplatePage =
-        new TemplateMgmtPreviewSubmittedNhsAppPage(page);
+        new TemplateMgmtPreviewSubmittedNhsAppPage(page).setPathParam(
+          'templateId',
+          'fake-template-id'
+        );
 
-      await previewSubmittedNHSAppTemplatePage.loadPage('/fake-template-id');
+      await previewSubmittedNHSAppTemplatePage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
diff --git a/tests/test-team/template-mgmt-component-tests/sms/template-mgmt-edit-sms-page.component.spec.ts b/tests/test-team/template-mgmt-component-tests/sms/template-mgmt-edit-sms-page.component.spec.ts
index 518245615..06878af28 100644
--- a/tests/test-team/template-mgmt-component-tests/sms/template-mgmt-edit-sms-page.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/sms/template-mgmt-edit-sms-page.component.spec.ts
@@ -75,9 +75,12 @@ test.describe('Edit SMS message template Page', () => {
     page,
     baseURL,
   }) => {
-    const editSmsTemplatePage = new TemplateMgmtEditSmsPage(page);
+    const editSmsTemplatePage = new TemplateMgmtEditSmsPage(page).setPathParam(
+      'templateId',
+      templates.valid.id
+    );
 
-    await editSmsTemplatePage.loadPage(templates.valid.id);
+    await editSmsTemplatePage.loadPage();
 
     await expect(page).toHaveURL(
       `${baseURL}/templates/edit-text-message-template/${templates.valid.id}`
@@ -96,8 +99,10 @@ test.describe('Edit SMS message template Page', () => {
   test.describe('Page functionality', () => {
     test('common page tests', async ({ page, baseURL }) => {
       const props = {
-        page: new TemplateMgmtEditSmsPage(page),
-        id: templates.valid.id,
+        page: new TemplateMgmtEditSmsPage(page).setPathParam(
+          'templateId',
+          templates.valid.id
+        ),
         baseURL,
       };
 
@@ -111,9 +116,11 @@ test.describe('Edit SMS message template Page', () => {
     test('when user visits page with previous data, then form fields retain previous data', async ({
       page,
     }) => {
-      const editSmsTemplatePage = new TemplateMgmtEditSmsPage(page);
+      const editSmsTemplatePage = new TemplateMgmtEditSmsPage(
+        page
+      ).setPathParam('templateId', templates.previousData.id);
 
-      await editSmsTemplatePage.loadPage(templates.previousData.id);
+      await editSmsTemplatePage.loadPage();
 
       await expect(editSmsTemplatePage.nameInput).toHaveValue(
         templates.previousData.name
@@ -124,9 +131,11 @@ test.describe('Edit SMS message template Page', () => {
     });
 
     test('character count', async ({ page }) => {
-      const editSmsTemplatePage = new TemplateMgmtEditSmsPage(page);
+      const editSmsTemplatePage = new TemplateMgmtEditSmsPage(
+        page
+      ).setPathParam('templateId', templates.submit.id);
 
-      await editSmsTemplatePage.loadPage(templates.submit.id);
+      await editSmsTemplatePage.loadPage();
 
       await editSmsTemplatePage.nameInput.fill('template-name');
 
@@ -146,9 +155,11 @@ test.describe('Edit SMS message template Page', () => {
     test('when user clicks "Personalisation" tool tips, then tool tips are displayed', async ({
       page,
     }) => {
-      const editSmsTemplatePage = new TemplateMgmtEditSmsPage(page);
+      const editSmsTemplatePage = new TemplateMgmtEditSmsPage(
+        page
+      ).setPathParam('templateId', templates.goBackAndReturn.id);
 
-      await editSmsTemplatePage.loadPage(templates.goBackAndReturn.id);
+      await editSmsTemplatePage.loadPage();
 
       await editSmsTemplatePage.customPersonalisationFields.click();
       await expect(
@@ -164,9 +175,11 @@ test.describe('Edit SMS message template Page', () => {
     test('when user clicks "Message formatting" tool tips, then tool tips are displayed', async ({
       page,
     }) => {
-      const editSmsTemplatePage = new TemplateMgmtEditSmsPage(page);
+      const editSmsTemplatePage = new TemplateMgmtEditSmsPage(
+        page
+      ).setPathParam('templateId', templates.valid.id);
 
-      await editSmsTemplatePage.loadPage(templates.valid.id);
+      await editSmsTemplatePage.loadPage();
 
       await editSmsTemplatePage.messageFormatting.assertDetailsOpen([
         editSmsTemplatePage.messageFormatting.linksAndUrls,
@@ -176,9 +189,11 @@ test.describe('Edit SMS message template Page', () => {
     test('when user clicks "Naming your templates" tool tips, then tool tips are displayed', async ({
       page,
     }) => {
-      const editSmsTemplatePage = new TemplateMgmtEditSmsPage(page);
+      const editSmsTemplatePage = new TemplateMgmtEditSmsPage(
+        page
+      ).setPathParam('templateId', templates.valid.id);
 
-      await editSmsTemplatePage.loadPage(templates.valid.id);
+      await editSmsTemplatePage.loadPage();
 
       await editSmsTemplatePage.namingYourTemplate.click({
         position: { x: 0, y: 0 },
@@ -209,8 +224,11 @@ test.describe('Edit SMS message template Page', () => {
         page,
         baseURL,
       }) => {
-        const editTemplatePage = new TemplateMgmtEditSmsPage(page);
-        await editTemplatePage.loadPage(templates.valid.id);
+        const editTemplatePage = new TemplateMgmtEditSmsPage(page).setPathParam(
+          'templateId',
+          templates.valid.id
+        );
+        await editTemplatePage.loadPage();
         const newTabPromise = page.waitForEvent('popup');
         await page.getByRole('link', { name }).click();
         const newTab = await newTabPromise;
@@ -238,9 +256,11 @@ test.describe('Edit SMS message template Page', () => {
         page,
         baseURL,
       }) => {
-        const editSmsTemplatePage = new TemplateMgmtEditSmsPage(page);
+        const editSmsTemplatePage = new TemplateMgmtEditSmsPage(
+          page
+        ).setPathParam('templateId', templates.goBackAndReturn.id);
 
-        await editSmsTemplatePage.loadPage(templates.goBackAndReturn.id);
+        await editSmsTemplatePage.loadPage();
 
         const newTabPromise = page.waitForEvent('popup');
 
@@ -265,9 +285,11 @@ test.describe('Edit SMS message template Page', () => {
       baseURL,
       page,
     }) => {
-      const editSmsTemplatePage = new TemplateMgmtEditSmsPage(page);
+      const editSmsTemplatePage = new TemplateMgmtEditSmsPage(
+        page
+      ).setPathParam('templateId', templates.submit.id);
 
-      await editSmsTemplatePage.loadPage(templates.submit.id);
+      await editSmsTemplatePage.loadPage();
 
       await editSmsTemplatePage.nameInput.fill('This is an SMS template name');
 
@@ -286,11 +308,11 @@ test.describe('Edit SMS message template Page', () => {
       baseURL,
       page,
     }) => {
-      const editSmsTemplatePage = new TemplateMgmtEditSmsPage(page);
+      const editSmsTemplatePage = new TemplateMgmtEditSmsPage(
+        page
+      ).setPathParam('templateId', templates.noSmsTemplateType.id);
 
-      await editSmsTemplatePage.attemptToLoadPageExpectFailure(
-        templates.noSmsTemplateType.id
-      );
+      await editSmsTemplatePage.attemptToLoadPageExpectFailure();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
@@ -299,11 +321,11 @@ test.describe('Edit SMS message template Page', () => {
       baseURL,
       page,
     }) => {
-      const editSmsTemplatePage = new TemplateMgmtEditSmsPage(page);
+      const editSmsTemplatePage = new TemplateMgmtEditSmsPage(
+        page
+      ).setPathParam('templateId', 'fake-template-id');
 
-      await editSmsTemplatePage.attemptToLoadPageExpectFailure(
-        '/fake-template-id'
-      );
+      await editSmsTemplatePage.attemptToLoadPageExpectFailure();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
@@ -311,9 +333,11 @@ test.describe('Edit SMS message template Page', () => {
     test('when user submits form with no data, then errors are displayed', async ({
       page,
     }) => {
-      const editSmsTemplatePage = new TemplateMgmtEditSmsPage(page);
+      const editSmsTemplatePage = new TemplateMgmtEditSmsPage(
+        page
+      ).setPathParam('templateId', templates.valid.id);
 
-      await editSmsTemplatePage.loadPage(templates.valid.id);
+      await editSmsTemplatePage.loadPage();
 
       await editSmsTemplatePage.nameInput.fill('');
 
@@ -341,9 +365,11 @@ test.describe('Edit SMS message template Page', () => {
     }) => {
       const errorMessage = 'Enter a template name';
 
-      const editSmsTemplatePage = new TemplateMgmtEditSmsPage(page);
+      const editSmsTemplatePage = new TemplateMgmtEditSmsPage(
+        page
+      ).setPathParam('templateId', templates.valid.id);
 
-      await editSmsTemplatePage.loadPage(templates.valid.id);
+      await editSmsTemplatePage.loadPage();
 
       await editSmsTemplatePage.nameInput.fill('');
 
@@ -367,9 +393,11 @@ test.describe('Edit SMS message template Page', () => {
     }) => {
       const errorMessage = 'Enter a template message';
 
-      const editSmsTemplatePage = new TemplateMgmtEditSmsPage(page);
+      const editSmsTemplatePage = new TemplateMgmtEditSmsPage(
+        page
+      ).setPathParam('templateId', templates.valid.id);
 
-      await editSmsTemplatePage.loadPage(templates.valid.id);
+      await editSmsTemplatePage.loadPage();
 
       await editSmsTemplatePage.nameInput.fill('template-name');
 
@@ -393,9 +421,11 @@ test.describe('Edit SMS message template Page', () => {
     }) => {
       const errorMessage = 'URLs must start with https://';
 
-      const createSmsTemplatePage = new TemplateMgmtEditSmsPage(page);
+      const createSmsTemplatePage = new TemplateMgmtEditSmsPage(
+        page
+      ).setPathParam('templateId', templates.valid.id);
 
-      await createSmsTemplatePage.loadPage(templates.valid.id);
+      await createSmsTemplatePage.loadPage();
 
       await createSmsTemplatePage.nameInput.fill('template-name');
       await createSmsTemplatePage.messageTextArea.fill(
diff --git a/tests/test-team/template-mgmt-component-tests/sms/template-mgmt-preview-sms-page.component.spec.ts b/tests/test-team/template-mgmt-component-tests/sms/template-mgmt-preview-sms-page.component.spec.ts
index 4243f3a31..cf359ce5a 100644
--- a/tests/test-team/template-mgmt-component-tests/sms/template-mgmt-preview-sms-page.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/sms/template-mgmt-preview-sms-page.component.spec.ts
@@ -75,9 +75,12 @@ test.describe('Preview SMS message template Page', () => {
     page,
     baseURL,
   }) => {
-    const previewPage = new TemplateMgmtPreviewSmsPage(page);
+    const previewPage = new TemplateMgmtPreviewSmsPage(page).setPathParam(
+      'templateId',
+      templates.valid.id
+    );
 
-    await previewPage.loadPage(templates.valid.id);
+    await previewPage.loadPage();
 
     await expect(page).toHaveURL(
       `${baseURL}/templates/preview-text-message-template/${templates.valid.id}`
@@ -95,8 +98,10 @@ test.describe('Preview SMS message template Page', () => {
   test.describe('Page functionality', () => {
     test('common page tests', async ({ page, baseURL }) => {
       const props = {
-        page: new TemplateMgmtPreviewSmsPage(page),
-        id: templates.valid.id,
+        page: new TemplateMgmtPreviewSmsPage(page).setPathParam(
+          'templateId',
+          templates.valid.id
+        ),
         baseURL,
       };
 
@@ -112,9 +117,12 @@ test.describe('Preview SMS message template Page', () => {
       baseURL,
       page,
     }) => {
-      const previewPage = new TemplateMgmtPreviewSmsPage(page);
+      const previewPage = new TemplateMgmtPreviewSmsPage(page).setPathParam(
+        'templateId',
+        templates.valid.id
+      );
 
-      await previewPage.loadPage(templates.valid.id);
+      await previewPage.loadPage();
 
       await previewPage.editButton.click();
 
@@ -129,9 +137,12 @@ test.describe('Preview SMS message template Page', () => {
       baseURL,
       page,
     }) => {
-      const previewPage = new TemplateMgmtPreviewSmsPage(page);
+      const previewPage = new TemplateMgmtPreviewSmsPage(page).setPathParam(
+        'templateId',
+        templates.empty.id
+      );
 
-      await previewPage.loadPage(templates.empty.id);
+      await previewPage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
@@ -140,9 +151,12 @@ test.describe('Preview SMS message template Page', () => {
       baseURL,
       page,
     }) => {
-      const previewPage = new TemplateMgmtPreviewSmsPage(page);
+      const previewPage = new TemplateMgmtPreviewSmsPage(page).setPathParam(
+        'templateId',
+        'fake-template-id'
+      );
 
-      await previewPage.loadPage('/fake-template-id');
+      await previewPage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
@@ -158,9 +172,12 @@ test.describe('Preview SMS message template Page', () => {
     }) => {
       await loginAsUser(routingDisabledUser, page);
 
-      const previewPage = new TemplateMgmtPreviewSmsPage(page);
+      const previewPage = new TemplateMgmtPreviewSmsPage(page).setPathParam(
+        'templateId',
+        templates.routingDisabled.id
+      );
 
-      await previewPage.loadPage(templates.routingDisabled.id);
+      await previewPage.loadPage();
 
       await expect(page).toHaveURL(
         `${baseURL}/templates/preview-text-message-template/${templates.routingDisabled.id}`
@@ -184,9 +201,12 @@ test.describe('Preview SMS message template Page', () => {
       }) => {
         await loginAsUser(routingDisabledUser, page);
 
-        const previewPage = new TemplateMgmtPreviewSmsPage(page);
+        const previewPage = new TemplateMgmtPreviewSmsPage(page).setPathParam(
+          'templateId',
+          templates.routingDisabled.id
+        );
 
-        await previewPage.loadPage(templates.routingDisabled.id);
+        await previewPage.loadPage();
 
         await previewPage.editRadioOption.click();
 
@@ -203,16 +223,19 @@ test.describe('Preview SMS message template Page', () => {
       }) => {
         await loginAsUser(routingDisabledUser, page);
 
-        const previewPage = new TemplateMgmtPreviewSmsPage(page);
+        const previewPage = new TemplateMgmtPreviewSmsPage(page).setPathParam(
+          'templateId',
+          templates.routingDisabled.id
+        );
 
-        await previewPage.loadPage(templates.routingDisabled.id);
+        await previewPage.loadPage();
 
         await previewPage.submitRadioOption.click();
 
         await previewPage.clickContinueButton();
 
         await expect(page).toHaveURL(
-          `${baseURL}/templates/submit-text-message-template/${templates.routingDisabled.id}`
+          `${baseURL}/templates/submit-text-message-template/${templates.routingDisabled.id}?lockNumber=${templates.routingDisabled.lockNumber}`
         );
       });
     });
@@ -225,9 +248,12 @@ test.describe('Preview SMS message template Page', () => {
 
         const errorMessage = 'Select an option';
 
-        const previewPage = new TemplateMgmtPreviewSmsPage(page);
+        const previewPage = new TemplateMgmtPreviewSmsPage(page).setPathParam(
+          'templateId',
+          templates.routingDisabled.id
+        );
 
-        await previewPage.loadPage(templates.routingDisabled.id);
+        await previewPage.loadPage();
 
         await previewPage.clickContinueButton();
 
diff --git a/tests/test-team/template-mgmt-component-tests/sms/template-mgmt-preview-submitted-sms-page.component.spec.ts b/tests/test-team/template-mgmt-component-tests/sms/template-mgmt-preview-submitted-sms-page.component.spec.ts
index d2d8b0c0b..e3ce71342 100644
--- a/tests/test-team/template-mgmt-component-tests/sms/template-mgmt-preview-submitted-sms-page.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/sms/template-mgmt-preview-submitted-sms-page.component.spec.ts
@@ -61,9 +61,12 @@ test.describe('Preview submitted sms message template Page', () => {
     baseURL,
   }) => {
     const previewSubmittedSMSTemplatePage =
-      new TemplateMgmtPreviewSubmittedSmsPage(page);
+      new TemplateMgmtPreviewSubmittedSmsPage(page).setPathParam(
+        'templateId',
+        templates.valid.id
+      );
 
-    await previewSubmittedSMSTemplatePage.loadPage(templates.valid.id);
+    await previewSubmittedSMSTemplatePage.loadPage();
 
     await expect(page).toHaveURL(
       `${baseURL}/templates/preview-submitted-text-message-template/${templates.valid.id}`
@@ -81,8 +84,10 @@ test.describe('Preview submitted sms message template Page', () => {
   test.describe('Page functionality', () => {
     test('common page tests', async ({ page, baseURL }) => {
       const props = {
-        page: new TemplateMgmtPreviewSubmittedSmsPage(page),
-        id: templates.valid.id,
+        page: new TemplateMgmtPreviewSubmittedSmsPage(page).setPathParam(
+          'templateId',
+          templates.valid.id
+        ),
         baseURL,
       };
 
@@ -101,9 +106,12 @@ test.describe('Preview submitted sms message template Page', () => {
       page,
     }) => {
       const previewSubmittedSMSTemplatePage =
-        new TemplateMgmtPreviewSubmittedSmsPage(page);
+        new TemplateMgmtPreviewSubmittedSmsPage(page).setPathParam(
+          'templateId',
+          templates.invalid.id
+        );
 
-      await previewSubmittedSMSTemplatePage.loadPage(templates.invalid.id);
+      await previewSubmittedSMSTemplatePage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
@@ -113,9 +121,12 @@ test.describe('Preview submitted sms message template Page', () => {
       page,
     }) => {
       const previewSubmittedSMSTemplatePage =
-        new TemplateMgmtPreviewSubmittedSmsPage(page);
+        new TemplateMgmtPreviewSubmittedSmsPage(page).setPathParam(
+          'templateId',
+          'fake-template-id'
+        );
 
-      await previewSubmittedSMSTemplatePage.loadPage('/fake-template-id');
+      await previewSubmittedSMSTemplatePage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
diff --git a/tests/test-team/template-mgmt-component-tests/template-mgmt-copy-page.component.spec.ts b/tests/test-team/template-mgmt-component-tests/template-mgmt-copy-page.component.spec.ts
index 71c9c806c..ad8b17045 100644
--- a/tests/test-team/template-mgmt-component-tests/template-mgmt-copy-page.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/template-mgmt-copy-page.component.spec.ts
@@ -75,9 +75,12 @@ test.describe('Copy Template Page', () => {
     page,
     baseURL,
   }) => {
-    const copyTemplatePage = new TemplateMgmtCopyPage(page);
+    const copyTemplatePage = new TemplateMgmtCopyPage(page).setPathParam(
+      'templateId',
+      templates.email.id
+    );
 
-    await copyTemplatePage.loadPage(templates.email.id);
+    await copyTemplatePage.loadPage();
 
     await expect(page).toHaveURL(
       `${baseURL}/templates/copy-template/${templates.email.id}`
@@ -89,8 +92,10 @@ test.describe('Copy Template Page', () => {
 
   test('common page tests', async ({ page, baseURL }) => {
     const props = {
-      page: new TemplateMgmtCopyPage(page),
-      id: templates.email.id,
+      page: new TemplateMgmtCopyPage(page).setPathParam(
+        'templateId',
+        templates.email.id
+      ),
       baseURL,
       expectedUrl: 'templates/message-templates',
     };
@@ -105,9 +110,12 @@ test.describe('Copy Template Page', () => {
   test('should display correct number of radio button options', async ({
     page,
   }) => {
-    const copyTemplatePage = new TemplateMgmtCopyPage(page);
+    const copyTemplatePage = new TemplateMgmtCopyPage(page).setPathParam(
+      'templateId',
+      templates.email.id
+    );
 
-    await copyTemplatePage.loadPage(templates.email.id);
+    await copyTemplatePage.loadPage();
 
     await expect(copyTemplatePage.radioButtons).toHaveCount(3);
   });
@@ -116,9 +124,12 @@ test.describe('Copy Template Page', () => {
     page,
     baseURL,
   }) => {
-    const copyTemplatePage = new TemplateMgmtCopyPage(page);
+    const copyTemplatePage = new TemplateMgmtCopyPage(page).setPathParam(
+      'templateId',
+      templates.email.id
+    );
 
-    await copyTemplatePage.loadPage(templates.email.id);
+    await copyTemplatePage.loadPage();
     await copyTemplatePage.clickContinueButton();
 
     await expect(page).toHaveURL(
@@ -138,10 +149,14 @@ test.describe('Copy Template Page', () => {
         page,
         baseURL,
       }) => {
-        const copyTemplatePage = new TemplateMgmtCopyPage(page);
-
         const template = templates[sourceTemplateType];
-        await copyTemplatePage.loadPage(template.id);
+
+        const copyTemplatePage = new TemplateMgmtCopyPage(page).setPathParam(
+          'templateId',
+          template.id
+        );
+
+        await copyTemplatePage.loadPage();
         await copyTemplatePage.checkRadioButton(
           templateTypeDisplayMappings[targetTemplateType]
         );
@@ -202,9 +217,12 @@ test.describe('Copy Template Page', () => {
     baseURL,
     page,
   }) => {
-    const copyTemplatePage = new TemplateMgmtCopyPage(page);
+    const copyTemplatePage = new TemplateMgmtCopyPage(page).setPathParam(
+      'templateId',
+      templates.letter.id
+    );
 
-    await copyTemplatePage.loadPage(templates.letter.id);
+    await copyTemplatePage.loadPage();
 
     await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
   });
diff --git a/tests/test-team/template-mgmt-component-tests/template-mgmt-delete-page.component.spec.ts b/tests/test-team/template-mgmt-component-tests/template-mgmt-delete-page.component.spec.ts
index 445b27ab7..7e6e1146a 100644
--- a/tests/test-team/template-mgmt-component-tests/template-mgmt-delete-page.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/template-mgmt-delete-page.component.spec.ts
@@ -62,9 +62,12 @@ test.describe('Delete Template Page', () => {
     page,
     baseURL,
   }) => {
-    const deleteTemplatePage = new TemplateMgmtDeletePage(page);
+    const deleteTemplatePage = new TemplateMgmtDeletePage(page).setPathParam(
+      'templateId',
+      templates.goBack.id
+    );
 
-    await deleteTemplatePage.loadPage(templates.goBack.id);
+    await deleteTemplatePage.loadPage();
 
     await expect(page).toHaveURL(
       `${baseURL}/templates/delete-template/${templates.goBack.id}`
@@ -76,8 +79,10 @@ test.describe('Delete Template Page', () => {
 
   test('common page tests', async ({ page, baseURL }) => {
     const props = {
-      page: new TemplateMgmtDeletePage(page),
-      id: templates.goBack.id,
+      page: new TemplateMgmtDeletePage(page).setPathParam(
+        'templateId',
+        templates.goBack.id
+      ),
       baseURL,
     };
 
@@ -91,9 +96,12 @@ test.describe('Delete Template Page', () => {
   test('should go back to message-templates page with template still visible when "no" button selected', async ({
     page,
   }) => {
-    const deleteTemplatePage = new TemplateMgmtDeletePage(page);
+    const deleteTemplatePage = new TemplateMgmtDeletePage(page).setPathParam(
+      'templateId',
+      templates.goBack.id
+    );
 
-    await deleteTemplatePage.loadPage(templates.goBack.id);
+    await deleteTemplatePage.loadPage();
 
     await deleteTemplatePage.goBackButton.click();
 
@@ -106,9 +114,12 @@ test.describe('Delete Template Page', () => {
     test(`should go back to message-templates page with template "${templateKey}" no longer visible when "yes" button selected`, async ({
       page,
     }) => {
-      const deleteTemplatePage = new TemplateMgmtDeletePage(page);
+      const deleteTemplatePage = new TemplateMgmtDeletePage(page).setPathParam(
+        'templateId',
+        templates[templateKey].id
+      );
 
-      await deleteTemplatePage.loadPage(templates[templateKey].id);
+      await deleteTemplatePage.loadPage();
 
       await deleteTemplatePage.confirmButton.click();
 
diff --git a/tests/test-team/template-mgmt-component-tests/template-mgmt-preview-common.steps.ts b/tests/test-team/template-mgmt-component-tests/template-mgmt-preview-common.steps.ts
index 9e073d36c..d208a626c 100644
--- a/tests/test-team/template-mgmt-component-tests/template-mgmt-preview-common.steps.ts
+++ b/tests/test-team/template-mgmt-component-tests/template-mgmt-preview-common.steps.ts
@@ -3,17 +3,16 @@ import { TemplateMgmtPreviewBasePage } from '../pages/template-mgmt-preview-base
 
 type PreviewStepsProps = {
   page: TemplateMgmtPreviewBasePage;
-  id: string;
   baseURL?: string;
 };
 
 export function assertBackToAllTemplatesTopLink({
   page,
-  id,
+
   baseURL,
 }: PreviewStepsProps) {
   return test.step('when user clicks the top "Back to all templates" link, then user is redirected to manage templates page', async () => {
-    await page.loadPage(id);
+    await page.loadPage();
 
     await page.clickBackToAllTemplatesTopLink();
 
@@ -23,11 +22,11 @@ export function assertBackToAllTemplatesTopLink({
 
 export function assertBackToAllTemplatesBottomLink({
   page,
-  id,
+
   baseURL,
 }: PreviewStepsProps) {
   return test.step('when user clicks the bottom "Back to all templates" link, then user is redirected to manage templates page', async () => {
-    await page.loadPage(id);
+    await page.loadPage();
 
     await page.clickBackToAllTemplatesTopLink();
 
diff --git a/tests/test-team/template-mgmt-component-tests/template-mgmt-preview-submitted-common.steps.ts b/tests/test-team/template-mgmt-component-tests/template-mgmt-preview-submitted-common.steps.ts
index 999b7286a..1d5fd5f87 100644
--- a/tests/test-team/template-mgmt-component-tests/template-mgmt-preview-submitted-common.steps.ts
+++ b/tests/test-team/template-mgmt-component-tests/template-mgmt-preview-submitted-common.steps.ts
@@ -1,19 +1,18 @@
 import { test, expect } from '@playwright/test';
-import { TemplateMgmtPreviewSubmitedBasePage } from '../pages/template-mgmt-preview-submitted-base-page';
+import { TemplateMgmtPreviewSubmittedBasePage } from '../pages/template-mgmt-preview-submitted-base-page';
 
 type PreviewStepsProps = {
-  page: TemplateMgmtPreviewSubmitedBasePage;
-  id: string;
+  page: TemplateMgmtPreviewSubmittedBasePage;
   baseURL?: string;
 };
 
 export function assertBackToAllTemplatesTopLink({
   page,
-  id,
+
   baseURL,
 }: PreviewStepsProps) {
   return test.step('when user clicks the top "Back to all templates" link, then user is redirected to manage templates page', async () => {
-    await page.loadPage(id);
+    await page.loadPage();
 
     await page.clickBackToAllTemplatesTopLink();
 
@@ -23,11 +22,10 @@ export function assertBackToAllTemplatesTopLink({
 
 export function assertBackToAllTemplatesBottomLink({
   page,
-  id,
   baseURL,
 }: PreviewStepsProps) {
   return test.step('when user clicks the bottom "Back to all templates" link, then user is redirected to manage templates page', async () => {
-    await page.loadPage(id);
+    await page.loadPage();
 
     await page.clickBackToAllTemplatesTopLink();
 
diff --git a/tests/test-team/template-mgmt-component-tests/template-mgmt-start-page.component.spec.ts b/tests/test-team/template-mgmt-component-tests/template-mgmt-start-page.component.spec.ts
index 2b4f07c4d..f2e6eec36 100644
--- a/tests/test-team/template-mgmt-component-tests/template-mgmt-start-page.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/template-mgmt-start-page.component.spec.ts
@@ -70,7 +70,6 @@ test.describe('Start Page', () => {
 
     await assertSignOutLink({
       page: startPage,
-      id: '/templates/create-and-submit-templates',
     });
   });
 
diff --git a/tests/test-team/template-mgmt-component-tests/template-mgmt-submit-common.steps.ts b/tests/test-team/template-mgmt-component-tests/template-mgmt-submit-common.steps.ts
index 894dedbd4..be3e80be1 100644
--- a/tests/test-team/template-mgmt-component-tests/template-mgmt-submit-common.steps.ts
+++ b/tests/test-team/template-mgmt-component-tests/template-mgmt-submit-common.steps.ts
@@ -3,18 +3,16 @@ import { TemplateMgmtSubmitBasePage } from '../pages/template-mgmt-submit-base-p
 
 type CommonStepsProps = {
   page: TemplateMgmtSubmitBasePage;
-  id: string;
   baseURL?: string;
 };
 
 export function assertGoBackButton({
   page,
-  id,
   baseURL,
   expectedUrl,
 }: CommonStepsProps & { expectedUrl: string }) {
   return test.step('when user clicks "Go back" button, then user is redirected to previous page', async () => {
-    await page.loadPage(id);
+    await page.loadPage();
 
     await page.clickGoBackButton();
 
diff --git a/tests/test-team/template-mgmt-component-tests/template-mgmt-submit-page.component.spec.ts b/tests/test-team/template-mgmt-component-tests/template-mgmt-submit-page.component.spec.ts
index 583a43250..98c52fef8 100644
--- a/tests/test-team/template-mgmt-component-tests/template-mgmt-submit-page.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/template-mgmt-submit-page.component.spec.ts
@@ -210,12 +210,16 @@ test.describe('Submit template Page', () => {
       page,
       baseURL,
     }) => {
-      const submitTemplatePage = new PageModel(page);
+      const template = templates[channelIdentifier].valid;
 
-      await submitTemplatePage.loadPage(templates[channelIdentifier].valid.id);
+      const submitTemplatePage = new PageModel(page)
+        .setPathParam('templateId', template.id)
+        .setSearchParam('lockNumber', String(template.lockNumber));
+
+      await submitTemplatePage.loadPage();
 
       await expect(page).toHaveURL(
-        `${baseURL}/templates/submit-${channelIdentifier}-template/${templates[channelIdentifier].valid.id}`
+        `${baseURL}/templates/submit-${channelIdentifier}-template/${template.id}?lockNumber=${template.lockNumber}`
       );
 
       await expect(submitTemplatePage.pageHeading).toHaveText(expectedHeading);
@@ -224,9 +228,11 @@ test.describe('Submit template Page', () => {
     // eslint-disable-next-line no-loop-func
     test.describe('Page functionality', () => {
       test(`common ${channelName} page tests`, async ({ page, baseURL }) => {
+        const template = templates[channelIdentifier].valid;
         const props = {
-          page: new PageModel(page),
-          id: templates[channelIdentifier].valid.id,
+          page: new PageModel(page)
+            .setPathParam('templateId', template.id)
+            .setSearchParam('lockNumber', String(template.lockNumber)),
           baseURL,
         };
 
@@ -236,18 +242,19 @@ test.describe('Submit template Page', () => {
         await assertFooterLinks(props);
         await assertGoBackButton({
           ...props,
-          expectedUrl: `templates/preview-${channelIdentifier}-template/${templates[channelIdentifier].valid.id}`,
+          expectedUrl: `templates/preview-${channelIdentifier}-template/${template.id}`,
         });
       });
 
       test(`when user submits form, then the ${channelName} "Template submitted" page is displayed`, async ({
         page,
       }) => {
-        const submitTemplatePage = new PageModel(page);
+        const template = templates[channelIdentifier].submit;
+        const submitTemplatePage = new PageModel(page)
+          .setPathParam('templateId', template.id)
+          .setSearchParam('lockNumber', String(template.lockNumber));
 
-        await submitTemplatePage.loadPage(
-          templates[channelIdentifier].submit.id
-        );
+        await submitTemplatePage.loadPage();
 
         await submitTemplatePage.clickSubmitTemplateButton();
 
@@ -263,11 +270,12 @@ test.describe('Submit template Page', () => {
         baseURL,
         page,
       }) => {
-        const submitTemplatePage = new PageModel(page);
+        const template = templates[channelIdentifier].empty;
+        const submitTemplatePage = new PageModel(page)
+          .setPathParam('templateId', template.id)
+          .setSearchParam('lockNumber', String(template.lockNumber));
 
-        await submitTemplatePage.loadPage(
-          templates[channelIdentifier].empty.id
-        );
+        await submitTemplatePage.loadPage();
 
         await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
       });
@@ -276,12 +284,32 @@ test.describe('Submit template Page', () => {
         baseURL,
         page,
       }) => {
-        const submitTemplatePage = new PageModel(page);
+        const submitTemplatePage = new PageModel(page)
+          .setPathParam('templateId', 'fake-template-id')
+          .setSearchParam('lockNumber', '1');
 
-        await submitTemplatePage.loadPage('/fake-template-id');
+        await submitTemplatePage.loadPage();
 
         await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
       });
+
+      test(`when user visits ${channelName} page without a lock number, redirect to the preview page`, async ({
+        baseURL,
+        page,
+      }) => {
+        const template = templates[channelIdentifier].valid;
+
+        const submitTemplatePage = new PageModel(page).setPathParam(
+          'templateId',
+          template.id
+        );
+
+        await submitTemplatePage.loadPage();
+
+        await expect(page).toHaveURL(
+          `${baseURL}/templates/preview-${channelIdentifier}-template/${template.id}`
+        );
+      });
     });
   }
 });
diff --git a/tests/test-team/template-mgmt-component-tests/template-mgmt-submitted-page.component.spec.ts b/tests/test-team/template-mgmt-component-tests/template-mgmt-submitted-page.component.spec.ts
index ce50f107f..5053a66c4 100644
--- a/tests/test-team/template-mgmt-component-tests/template-mgmt-submitted-page.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/template-mgmt-submitted-page.component.spec.ts
@@ -101,9 +101,12 @@ test.describe('Template Submitted Page', () => {
       page,
       baseURL,
     }) => {
-      const templateSubmittedPage = new PageModel(page);
+      const templateSubmittedPage = new PageModel(page).setPathParam(
+        'templateId',
+        templates[channelIdentifier].id
+      );
 
-      await templateSubmittedPage.loadPage(templates[channelIdentifier].id);
+      await templateSubmittedPage.loadPage();
 
       await expect(page).toHaveURL(
         `${baseURL}/templates/${channelIdentifier}-template-submitted/${templates[channelIdentifier].id}`
@@ -126,8 +129,10 @@ test.describe('Template Submitted Page', () => {
     test.describe('Page functionality', () => {
       test(`common ${channelName} page tests`, async ({ page, baseURL }) => {
         const props = {
-          page: new PageModel(page),
-          id: templates[channelIdentifier].id,
+          page: new PageModel(page).setPathParam(
+            'templateId',
+            templates[channelIdentifier].id
+          ),
           baseURL,
         };
 
@@ -147,9 +152,12 @@ test.describe('Template Submitted Page', () => {
         baseURL,
         page,
       }) => {
-        const templateSubmittedPage = new PageModel(page);
+        const templateSubmittedPage = new PageModel(page).setPathParam(
+          'templateId',
+          'fake-template-id'
+        );
 
-        await templateSubmittedPage.loadPage('/fake-template-id');
+        await templateSubmittedPage.loadPage();
 
         await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
       });
diff --git a/tests/test-team/template-mgmt-component-tests/template-protected-routes.component.spec.ts b/tests/test-team/template-mgmt-component-tests/template-protected-routes.component.spec.ts
index cde560b86..716f3f86d 100644
--- a/tests/test-team/template-mgmt-component-tests/template-protected-routes.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/template-protected-routes.component.spec.ts
@@ -2,7 +2,6 @@ import { test, expect } from '@playwright/test';
 import { glob } from 'glob';
 import { execSync } from 'node:child_process';
 import { TemplateMgmtMessageTemplatesPage } from '../pages/template-mgmt-message-templates-page';
-import { TemplateMgmtBasePageDynamic } from '../pages/template-mgmt-base-page-dynamic';
 import { TemplateMgmtChoosePage } from '../pages/template-mgmt-choose-page';
 import { TemplateMgmtCopyPage } from '../pages/template-mgmt-copy-page';
 import { TemplateMgmtCreateEmailPage } from '../pages/email/template-mgmt-create-email-page';
@@ -129,7 +128,7 @@ test.describe('Protected Routes Tests', () => {
     const nonPublic = routes.filter(
       (r) =>
         !publicPages.some(
-          ({ pageUrlSegments }) => `${pageUrlSegments.join('/')}` === r
+          ({ staticPathSegments }) => `${staticPathSegments.join('/')}` === r
         )
     );
 
@@ -138,7 +137,7 @@ test.describe('Protected Routes Tests', () => {
     const uncovered = nonPublic.filter(
       (r) =>
         !protectedPages.some(
-          ({ pageUrlSegments }) => `${pageUrlSegments.join('/')}` === r
+          ({ staticPathSegments }) => `${staticPathSegments.join('/')}` === r
         )
     );
 
@@ -148,32 +147,20 @@ test.describe('Protected Routes Tests', () => {
   });
 
   for (const PageModel of protectedPages)
-    test(`should not be able to access ${PageModel.pageUrlSegments.join('/')} page without auth`, async ({
+    test(`should not be able to access ${PageModel.staticPathSegments.join('/')} page without auth`, async ({
       page,
       baseURL,
     }) => {
       const appPage = new PageModel(page);
-      const isDynamic = appPage instanceof TemplateMgmtBasePageDynamic;
-
-      const ids: string[] = isDynamic
-        ? Array.from(
-            { length: PageModel.pageUrlSegments.length },
-            (_, index) => `id${index}`
-          )
-        : [];
-
-      await appPage.attemptToLoadPageExpectFailure(...ids);
-
-      let redirectPath = `/${PageModel.appUrlSegment}`;
-      for (let i = 0; i < PageModel.pageUrlSegments.length; i++) {
-        redirectPath += `/${PageModel.pageUrlSegments[i]}`;
-        if (isDynamic) {
-          redirectPath += `/${ids[i]}`;
-        }
+
+      for (const [index, name] of PageModel.pathParameterNames.entries()) {
+        appPage.setPathParam(name, `id${index}`);
       }
 
+      await appPage.attemptToLoadPageExpectFailure();
+
       await expect(page).toHaveURL(
-        `${baseURL}/auth?redirect=${encodeURIComponent(redirectPath)}`
+        `${baseURL}/auth?redirect=${encodeURIComponent(appPage.getUrl())}`
       );
     });
 });
diff --git a/tests/test-team/template-mgmt-component-tests/template-unauthorised-data.component.spec.ts b/tests/test-team/template-mgmt-component-tests/template-unauthorised-data.component.spec.ts
index 58ea3bbf4..aaa80e7bc 100644
--- a/tests/test-team/template-mgmt-component-tests/template-unauthorised-data.component.spec.ts
+++ b/tests/test-team/template-mgmt-component-tests/template-unauthorised-data.component.spec.ts
@@ -81,9 +81,11 @@ test.describe('Unauthorised data access Tests', () => {
     page,
     baseURL,
   }) => {
-    const previewEmailTemplatePage = new TemplateMgmtPreviewEmailPage(page);
+    const previewEmailTemplatePage = new TemplateMgmtPreviewEmailPage(
+      page
+    ).setPathParam('templateId', templates.submit.id);
 
-    await previewEmailTemplatePage.loadPage(templates.submit.id);
+    await previewEmailTemplatePage.loadPage();
 
     await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
   });
@@ -93,9 +95,9 @@ test.describe('Unauthorised data access Tests', () => {
   }) => {
     const previewEmailTemplatePage = new TemplateMgmtPreviewSubmittedEmailPage(
       page
-    );
+    ).setPathParam('templateId', templates.submit.id);
 
-    await previewEmailTemplatePage.loadPage(templates.submit.id);
+    await previewEmailTemplatePage.loadPage();
 
     await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
   });
diff --git a/tests/test-team/template-mgmt-e2e-tests/template-mgmt-letter-full.e2e.spec.ts b/tests/test-team/template-mgmt-e2e-tests/template-mgmt-letter-full.e2e.spec.ts
index d8334ded7..e300228e1 100644
--- a/tests/test-team/template-mgmt-e2e-tests/template-mgmt-letter-full.e2e.spec.ts
+++ b/tests/test-team/template-mgmt-e2e-tests/template-mgmt-letter-full.e2e.spec.ts
@@ -237,6 +237,8 @@ function requestProof(
         expect(entry, JSON.stringify(pdfHrefs[i])).not.toBeNull();
       }
 
+      await page.reload();
+
       await previewTemplatePage.clickContinueButton();
     }).toPass({ timeout: 60_000 });
 
diff --git a/tests/test-team/template-mgmt-event-tests/routing-config.event.spec.ts b/tests/test-team/template-mgmt-event-tests/routing-config.event.spec.ts
index 5486875db..7c4bf0186 100644
--- a/tests/test-team/template-mgmt-event-tests/routing-config.event.spec.ts
+++ b/tests/test-team/template-mgmt-event-tests/routing-config.event.spec.ts
@@ -28,17 +28,18 @@ test.describe('Event publishing - Routing Config', () => {
   test('Expect no events', async ({ request }) => {
     const id = randomUUID();
 
+    const messagePlan = RoutingConfigFactory.create(user, { id }).dbEntry;
+
     const start = new Date();
 
-    await storageHelper.seed([
-      RoutingConfigFactory.create(user, { id }).dbEntry,
-    ]);
+    await storageHelper.seed([messagePlan]);
 
     const submittedResponse = await request.patch(
       `${process.env.API_BASE_URL}/v1/routing-configuration/${id}/submit`,
       {
         headers: {
           Authorization: await user.getAccessToken(),
+          'X-Lock-Number': String(messagePlan.lockNumber),
         },
       }
     );
diff --git a/tests/test-team/template-mgmt-routing-component-tests/choose-templates.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/choose-templates.routing-component.spec.ts
index 3cb590664..b97359cbe 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/choose-templates.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/choose-templates.routing-component.spec.ts
@@ -121,10 +121,12 @@ test.describe('Routing - Choose Templates page', () => {
       test(`shows correct channels for message order: ${label}`, async ({
         page,
       }) => {
-        const createMessagePlanPage = new RoutingCreateMessagePlanPage(page, {
-          messageOrder,
-        });
+        const createMessagePlanPage = new RoutingCreateMessagePlanPage(
+          page
+        ).setSearchParam('messageOrder', messageOrder);
+
         await createMessagePlanPage.loadPage();
+
         await createMessagePlanPage.nameField.fill(`Plan for ${label}`);
         await createMessagePlanPage.clickSubmit();
 
@@ -185,8 +187,10 @@ test.describe('Routing - Choose Templates page', () => {
 
   test('common page tests', async ({ page, baseURL }) => {
     const props = {
-      page: new RoutingChooseTemplatesPage(page),
-      id: validRoutingConfigId,
+      page: new RoutingChooseTemplatesPage(page).setPathParam(
+        'messagePlanId',
+        validRoutingConfigId
+      ),
       baseURL,
     };
     await assertSkipToMainContent(props);
@@ -200,8 +204,11 @@ test.describe('Routing - Choose Templates page', () => {
     page,
     baseURL,
   }) => {
-    const chooseTemplatesPage = new RoutingChooseTemplatesPage(page);
-    await chooseTemplatesPage.loadPage(validRoutingConfigId);
+    const chooseTemplatesPage = new RoutingChooseTemplatesPage(
+      page
+    ).setPathParam('messagePlanId', validRoutingConfigId);
+
+    await chooseTemplatesPage.loadPage();
 
     await expect(page).toHaveURL(
       `${baseURL}/templates/message-plans/choose-templates/${validRoutingConfigId}`
@@ -251,9 +258,9 @@ test.describe('Routing - Choose Templates page', () => {
   }) => {
     const messageOrder: MessageOrder = 'NHSAPP,SMS';
 
-    const createMessagePlanPage = new RoutingCreateMessagePlanPage(page, {
-      messageOrder,
-    });
+    const createMessagePlanPage = new RoutingCreateMessagePlanPage(
+      page
+    ).setSearchParam('messageOrder', messageOrder);
 
     await createMessagePlanPage.loadPage();
     await createMessagePlanPage.nameField.fill('Test message plan');
@@ -265,7 +272,10 @@ test.describe('Routing - Choose Templates page', () => {
       /\/templates\/message-plans\/choose-templates\//
     );
 
-    const routingConfigId = chooseTemplatesPage.getIdFromUrl();
+    const { messagePlanId } =
+      chooseTemplatesPage.getPathParametersFromCurrentPageUrl();
+
+    expect(messagePlanId).not.toBeUndefined();
 
     await test.step('app channel with no template has only choose link', async () => {
       await expect(chooseTemplatesPage.nhsApp.templateName).toBeHidden();
@@ -274,7 +284,7 @@ test.describe('Routing - Choose Templates page', () => {
         chooseTemplatesPage.nhsApp.chooseTemplateLink
       ).toHaveAttribute(
         'href',
-        `/templates/message-plans/choose-nhs-app-template/${routingConfigId}`
+        `/templates/message-plans/choose-nhs-app-template/${messagePlanId}?lockNumber=0`
       );
       await expect(chooseTemplatesPage.nhsApp.changeTemplateLink).toBeHidden();
       await expect(chooseTemplatesPage.nhsApp.removeTemplateLink).toBeHidden();
@@ -285,7 +295,7 @@ test.describe('Routing - Choose Templates page', () => {
       await expect(chooseTemplatesPage.sms.chooseTemplateLink).toBeVisible();
       await expect(chooseTemplatesPage.sms.chooseTemplateLink).toHaveAttribute(
         'href',
-        `/templates/message-plans/choose-text-message-template/${routingConfigId}`
+        `/templates/message-plans/choose-text-message-template/${messagePlanId}?lockNumber=0`
       );
       await expect(chooseTemplatesPage.sms.changeTemplateLink).toBeHidden();
       await expect(chooseTemplatesPage.sms.removeTemplateLink).toBeHidden();
@@ -294,7 +304,7 @@ test.describe('Routing - Choose Templates page', () => {
     await chooseTemplatesPage.nhsApp.clickChooseTemplateLink();
 
     await expect(page).toHaveURL(
-      `${baseURL}/templates/message-plans/choose-nhs-app-template/${routingConfigId}`
+      `${baseURL}/templates/message-plans/choose-nhs-app-template/${messagePlanId}?lockNumber=0`
     );
 
     // TODO: CCM-11537 Choose template then return and assert updated
@@ -304,9 +314,11 @@ test.describe('Routing - Choose Templates page', () => {
     page,
     baseURL,
   }) => {
-    const chooseTemplatesPage = new RoutingChooseTemplatesPage(page);
+    const chooseTemplatesPage = new RoutingChooseTemplatesPage(
+      page
+    ).setPathParam('messagePlanId', validRoutingConfigId);
 
-    await chooseTemplatesPage.loadPage(validRoutingConfigId);
+    await chooseTemplatesPage.loadPage();
 
     await test.step('app channel with template has template name and change link', async () => {
       await expect(chooseTemplatesPage.nhsApp.templateName).toHaveText(
@@ -317,7 +329,7 @@ test.describe('Routing - Choose Templates page', () => {
         chooseTemplatesPage.nhsApp.changeTemplateLink
       ).toHaveAttribute(
         'href',
-        `/templates/message-plans/choose-nhs-app-template/${validRoutingConfigId}`
+        `/templates/message-plans/choose-nhs-app-template/${validRoutingConfigId}?lockNumber=${messagePlans.valid.lockNumber}`
       );
     });
 
@@ -333,14 +345,14 @@ test.describe('Routing - Choose Templates page', () => {
       await expect(chooseTemplatesPage.sms.changeTemplateLink).toBeVisible();
       await expect(chooseTemplatesPage.sms.changeTemplateLink).toHaveAttribute(
         'href',
-        `/templates/message-plans/choose-text-message-template/${validRoutingConfigId}`
+        `/templates/message-plans/choose-text-message-template/${validRoutingConfigId}?lockNumber=${messagePlans.valid.lockNumber}`
       );
     });
 
     await chooseTemplatesPage.nhsApp.clickChangeTemplateLink();
 
     await expect(page).toHaveURL(
-      `${baseURL}/templates/message-plans/choose-nhs-app-template/${validRoutingConfigId}`
+      `${baseURL}/templates/message-plans/choose-nhs-app-template/${validRoutingConfigId}?lockNumber=${messagePlans.valid.lockNumber}`
     );
 
     // TODO: CCM-11537 Choose template then return and assert updated
@@ -350,9 +362,11 @@ test.describe('Routing - Choose Templates page', () => {
     page,
     baseURL,
   }) => {
-    const chooseTemplatesPage = new RoutingChooseTemplatesPage(page);
+    const chooseTemplatesPage = new RoutingChooseTemplatesPage(
+      page
+    ).setPathParam('messagePlanId', validRoutingConfigId);
 
-    await chooseTemplatesPage.loadPage(validRoutingConfigId);
+    await chooseTemplatesPage.loadPage();
 
     await expect(chooseTemplatesPage.nhsApp.templateName).toHaveText(
       templates.NHSAPP.name
@@ -381,9 +395,11 @@ test.describe('Routing - Choose Templates page', () => {
     page,
     baseURL,
   }) => {
-    const chooseTemplatesPage = new RoutingChooseTemplatesPage(page);
+    const chooseTemplatesPage = new RoutingChooseTemplatesPage(
+      page
+    ).setPathParam('messagePlanId', validRoutingConfigId);
 
-    await chooseTemplatesPage.loadPage(validRoutingConfigId);
+    await chooseTemplatesPage.loadPage();
 
     await chooseTemplatesPage.saveAndCloseButton.click();
 
@@ -400,9 +416,11 @@ test.describe('Routing - Choose Templates page', () => {
 
   test.describe('redirects to invalid message plan page', () => {
     test('when message plan cannot be found', async ({ page, baseURL }) => {
-      const chooseTemplatesPage = new RoutingChooseTemplatesPage(page);
+      const chooseTemplatesPage = new RoutingChooseTemplatesPage(
+        page
+      ).setPathParam('messagePlanId', notFoundRoutingConfigId);
 
-      await chooseTemplatesPage.loadPage(notFoundRoutingConfigId);
+      await chooseTemplatesPage.loadPage();
 
       await expect(page).toHaveURL(
         `${baseURL}/templates/message-plans/invalid`
@@ -410,9 +428,11 @@ test.describe('Routing - Choose Templates page', () => {
     });
 
     test('when routing config ID is invalid', async ({ page, baseURL }) => {
-      const chooseTemplatesPage = new RoutingChooseTemplatesPage(page);
+      const chooseTemplatesPage = new RoutingChooseTemplatesPage(
+        page
+      ).setPathParam('messagePlanId', invalidRoutingConfigId);
 
-      await chooseTemplatesPage.loadPage(invalidRoutingConfigId);
+      await chooseTemplatesPage.loadPage();
 
       await expect(page).toHaveURL(
         `${baseURL}/templates/message-plans/invalid`
diff --git a/tests/test-team/template-mgmt-routing-component-tests/create-message-plan.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/create-message-plan.routing-component.spec.ts
index 783ca1210..68330f9c2 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/create-message-plan.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/create-message-plan.routing-component.spec.ts
@@ -46,9 +46,9 @@ test.describe('Create Message Plan Page', () => {
       test('creates a message plan and redirects to the template selection page for the created message plan', async ({
         page,
       }) => {
-        const createMessagePlanPage = new RoutingCreateMessagePlanPage(page, {
-          messageOrder,
-        });
+        const createMessagePlanPage = new RoutingCreateMessagePlanPage(
+          page
+        ).setSearchParam('messageOrder', messageOrder);
 
         await createMessagePlanPage.loadPage();
 
@@ -73,9 +73,9 @@ test.describe('Create Message Plan Page', () => {
       });
 
       test('displays error if name is empty', async ({ page }) => {
-        const createMessagePlanPage = new RoutingCreateMessagePlanPage(page, {
-          messageOrder,
-        });
+        const createMessagePlanPage = new RoutingCreateMessagePlanPage(
+          page
+        ).setSearchParam('messageOrder', messageOrder);
 
         await createMessagePlanPage.loadPage();
 
@@ -87,9 +87,9 @@ test.describe('Create Message Plan Page', () => {
       });
 
       test('displays error if name is too long', async ({ page }) => {
-        const createMessagePlanPage = new RoutingCreateMessagePlanPage(page, {
-          messageOrder,
-        });
+        const createMessagePlanPage = new RoutingCreateMessagePlanPage(
+          page
+        ).setSearchParam('messageOrder', messageOrder);
 
         await createMessagePlanPage.loadPage();
 
@@ -114,9 +114,9 @@ test.describe('Create Message Plan Page', () => {
     test('creates a message plan and redirects to the template selection page for the created template', async ({
       page,
     }) => {
-      const createMessagePlanPage = new RoutingCreateMessagePlanPage(page, {
-        messageOrder: 'NHSAPP',
-      });
+      const createMessagePlanPage = new RoutingCreateMessagePlanPage(
+        page
+      ).setSearchParam('messageOrder', 'NHSAPP');
 
       await createMessagePlanPage.loadPage();
 
@@ -143,9 +143,9 @@ test.describe('Create Message Plan Page', () => {
     });
 
     test('displays error if campaign id is not selected', async ({ page }) => {
-      const createMessagePlanPage = new RoutingCreateMessagePlanPage(page, {
-        messageOrder: 'NHSAPP',
-      });
+      const createMessagePlanPage = new RoutingCreateMessagePlanPage(
+        page
+      ).setSearchParam('messageOrder', 'NHSAPP');
 
       await createMessagePlanPage.loadPage();
 
@@ -167,9 +167,9 @@ test.describe('Create Message Plan Page', () => {
     });
 
     test('redirects to invalid config page', async ({ baseURL, page }) => {
-      const createMessagePlanPage = new RoutingCreateMessagePlanPage(page, {
-        messageOrder: 'NHSAPP',
-      });
+      const createMessagePlanPage = new RoutingCreateMessagePlanPage(
+        page
+      ).setSearchParam('messageOrder', 'NHSAPP');
 
       await createMessagePlanPage.loadPage();
 
@@ -182,9 +182,9 @@ test.describe('Create Message Plan Page', () => {
   for (const { messageOrder } of ROUTING_CONFIG_MESSAGE_ORDER_OPTION_MAPPINGS)
     test.describe(`with the messageOrder query parameter set to ${messageOrder}`, () => {
       test('common page tests', async ({ page, baseURL }) => {
-        const createMessagePlanPage = new RoutingCreateMessagePlanPage(page, {
-          messageOrder,
-        });
+        const createMessagePlanPage = new RoutingCreateMessagePlanPage(
+          page
+        ).setSearchParam('messageOrder', messageOrder);
 
         await createMessagePlanPage.loadPage();
 
@@ -197,7 +197,6 @@ test.describe('Create Message Plan Page', () => {
 
         const props = {
           page: createMessagePlanPage,
-          id: '',
           baseURL,
           expectedUrl: 'templates/message-plans/choose-message-order',
         };
@@ -224,9 +223,9 @@ test.describe('Create Message Plan Page', () => {
 
   test.describe('with invalid messageOrder query parameter set', () => {
     test('redirects to message order page', async ({ page, baseURL }) => {
-      const createMessagePlanPage = new RoutingCreateMessagePlanPage(page, {
-        messageOrder: 'INVALID',
-      });
+      const createMessagePlanPage = new RoutingCreateMessagePlanPage(
+        page
+      ).setSearchParam('messageOrder', 'INVALID');
 
       await createMessagePlanPage.loadPage();
 
diff --git a/tests/test-team/template-mgmt-routing-component-tests/edit-message-plan-settings.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/edit-message-plan-settings.routing-component.spec.ts
index 4f57eb6b4..7f415cdaf 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/edit-message-plan-settings.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/edit-message-plan-settings.routing-component.spec.ts
@@ -41,9 +41,12 @@ test('common page tests', async ({ page, baseURL }) => {
 
   await storageHelper.seed([plan.dbEntry]);
 
-  const editPage = new RoutingEditMessagePlanSettingsPage(page);
+  const editPage = new RoutingEditMessagePlanSettingsPage(page).setPathParam(
+    'messagePlanId',
+    plan.dbEntry.id
+  );
 
-  await editPage.loadPage(plan.dbEntry.id);
+  await editPage.loadPage();
 
   await expect(page).toHaveURL(
     `${baseURL}/templates/message-plans/edit-message-plan-settings/${plan.dbEntry.id}`
@@ -53,7 +56,6 @@ test('common page tests', async ({ page, baseURL }) => {
 
   const props = {
     page: editPage,
-    id: plan.dbEntry.id,
     baseURL,
     expectedUrl: `templates/message-plans/choose-templates/${plan.dbEntry.id}`,
   };
@@ -66,9 +68,12 @@ test('common page tests', async ({ page, baseURL }) => {
 });
 
 test("message plan doesn't exist", async ({ page, baseURL }) => {
-  const editPage = new RoutingEditMessagePlanSettingsPage(page);
+  const editPage = new RoutingEditMessagePlanSettingsPage(page).setPathParam(
+    'messagePlanId',
+    randomUUID()
+  );
 
-  await editPage.loadPage(randomUUID());
+  await editPage.loadPage();
 
   await expect(page).toHaveURL(`${baseURL}/templates/message-plans/invalid`);
 });
@@ -82,9 +87,12 @@ test.describe('single campaign client', () => {
 
     await storageHelper.seed([plan.dbEntry]);
 
-    const editPage = new RoutingEditMessagePlanSettingsPage(page);
+    const editPage = new RoutingEditMessagePlanSettingsPage(page).setPathParam(
+      'messagePlanId',
+      plan.dbEntry.id
+    );
 
-    await editPage.loadPage(plan.dbEntry.id);
+    await editPage.loadPage();
 
     await expect(editPage.nameField).toHaveValue(plan.dbEntry.name);
 
@@ -102,7 +110,7 @@ test.describe('single campaign client', () => {
     );
 
     // reload the edit page - should display the latest data
-    await editPage.loadPage(plan.dbEntry.id);
+    await editPage.loadPage();
 
     await expect(editPage.nameField).toHaveValue('New name!');
 
@@ -116,9 +124,12 @@ test.describe('single campaign client', () => {
 
     await storageHelper.seed([plan.dbEntry]);
 
-    const editPage = new RoutingEditMessagePlanSettingsPage(page);
+    const editPage = new RoutingEditMessagePlanSettingsPage(page).setPathParam(
+      'messagePlanId',
+      plan.dbEntry.id
+    );
 
-    await editPage.loadPage(plan.dbEntry.id);
+    await editPage.loadPage();
 
     await editPage.nameField.clear();
 
@@ -134,9 +145,12 @@ test.describe('single campaign client', () => {
 
     await storageHelper.seed([plan.dbEntry]);
 
-    const editPage = new RoutingEditMessagePlanSettingsPage(page);
+    const editPage = new RoutingEditMessagePlanSettingsPage(page).setPathParam(
+      'messagePlanId',
+      plan.dbEntry.id
+    );
 
-    await editPage.loadPage(plan.dbEntry.id);
+    await editPage.loadPage();
 
     await editPage.nameField.fill('x'.repeat(201));
 
@@ -163,9 +177,12 @@ test.describe('client has multiple campaigns', () => {
 
     await storageHelper.seed([plan.dbEntry]);
 
-    const editPage = new RoutingEditMessagePlanSettingsPage(page);
+    const editPage = new RoutingEditMessagePlanSettingsPage(page).setPathParam(
+      'messagePlanId',
+      plan.dbEntry.id
+    );
 
-    await editPage.loadPage(plan.dbEntry.id);
+    await editPage.loadPage();
 
     await expect(editPage.nameField).toHaveValue(plan.dbEntry.name);
 
@@ -187,7 +204,7 @@ test.describe('client has multiple campaigns', () => {
     );
 
     // reload the edit page - should display the latest data
-    await editPage.loadPage(plan.dbEntry.id);
+    await editPage.loadPage();
 
     await expect(editPage.nameField).toHaveValue('Updated name');
 
@@ -201,9 +218,12 @@ test.describe('client has multiple campaigns', () => {
 
     await storageHelper.seed([plan.dbEntry]);
 
-    const editPage = new RoutingEditMessagePlanSettingsPage(page);
+    const editPage = new RoutingEditMessagePlanSettingsPage(page).setPathParam(
+      'messagePlanId',
+      plan.dbEntry.id
+    );
 
-    await editPage.loadPage(plan.dbEntry.id);
+    await editPage.loadPage();
 
     await editPage.campaignIdSelector.selectOption('');
 
@@ -227,9 +247,12 @@ test.describe('client has no campaign id', () => {
 
     await storageHelper.seed([plan.dbEntry]);
 
-    const editPage = new RoutingEditMessagePlanSettingsPage(page);
+    const editPage = new RoutingEditMessagePlanSettingsPage(page).setPathParam(
+      'messagePlanId',
+      plan.dbEntry.id
+    );
 
-    await editPage.loadPage(plan.dbEntry.id);
+    await editPage.loadPage();
 
     await expect(page).toHaveURL(
       `${baseURL}/templates/message-plans/campaign-id-required`
diff --git a/tests/test-team/template-mgmt-routing-component-tests/email/choose-email-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/email/choose-email-template.routing-component.spec.ts
index 47fd62cf3..94952f60c 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/email/choose-email-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/email/choose-email-template.routing-component.spec.ts
@@ -83,8 +83,13 @@ test.describe('Routing - Choose email template page', () => {
 
   test('common page tests', async ({ page, baseURL }) => {
     const props = {
-      page: new RoutingChooseEmailTemplatePage(page),
-      id: messagePlans.EMAIL_ROUTING_CONFIG.id,
+      page: new RoutingChooseEmailTemplatePage(page)
+        .setPathParam('messagePlanId', messagePlans.EMAIL_ROUTING_CONFIG.id)
+        .setSearchParam(
+          'lockNumber',
+          String(messagePlans.EMAIL_ROUTING_CONFIG.lockNumber)
+        ),
+
       baseURL,
     };
     await assertSkipToMainContent(props);
@@ -98,12 +103,15 @@ test.describe('Routing - Choose email template page', () => {
     page,
     baseURL,
   }) => {
-    const chooseEmailTemplatePage = new RoutingChooseEmailTemplatePage(page);
-    await chooseEmailTemplatePage.loadPage(
-      messagePlans.EMAIL_ROUTING_CONFIG.id
-    );
+    const plan = messagePlans.EMAIL_ROUTING_CONFIG;
+    const chooseEmailTemplatePage = new RoutingChooseEmailTemplatePage(page)
+      .setPathParam('messagePlanId', plan.id)
+      .setSearchParam('lockNumber', String(plan.lockNumber));
+
+    await chooseEmailTemplatePage.loadPage();
+
     await expect(page).toHaveURL(
-      `${baseURL}/templates/message-plans/choose-email-template/${messagePlans.EMAIL_ROUTING_CONFIG.id}`
+      `${baseURL}/templates/message-plans/choose-email-template/${plan.id}?lockNumber=${plan.lockNumber}`
     );
 
     await test.step('displays list of email templates to choose from', async () => {
@@ -142,7 +150,7 @@ test.describe('Routing - Choose email template page', () => {
         await expect(previewLink).toHaveText('Preview');
         await expect(previewLink).toHaveAttribute(
           'href',
-          `/templates/message-plans/choose-email-template/${messagePlans.EMAIL_ROUTING_CONFIG.id}/preview-template/${template.id}`
+          `/templates/message-plans/choose-email-template/${plan.id}/preview-template/${template.id}`
         );
       }
 
@@ -156,7 +164,7 @@ test.describe('Routing - Choose email template page', () => {
       await expect(goBackLink).toBeVisible();
       await expect(goBackLink).toHaveAttribute(
         'href',
-        `/templates/message-plans/choose-templates/${messagePlans.EMAIL_ROUTING_CONFIG.id}`
+        `/templates/message-plans/choose-templates/${plan.id}`
       );
     });
 
@@ -164,7 +172,7 @@ test.describe('Routing - Choose email template page', () => {
       await page.getByTestId('submit-button').click();
 
       await expect(page).toHaveURL(
-        `${baseURL}/templates/message-plans/choose-email-template/${messagePlans.EMAIL_ROUTING_CONFIG.id}`
+        `${baseURL}/templates/message-plans/choose-email-template/${plan.id}?lockNumber=${plan.lockNumber}`
       );
 
       await expect(chooseEmailTemplatePage.errorSummary).toBeVisible();
@@ -174,22 +182,18 @@ test.describe('Routing - Choose email template page', () => {
     });
 
     await test.step('submits selected template and navigates to choose templates page', async () => {
-      await chooseEmailTemplatePage.loadPage(
-        messagePlans.EMAIL_ROUTING_CONFIG.id
-      );
+      await chooseEmailTemplatePage.loadPage();
 
       await page.getByTestId(`${templates.EMAIL2.id}-radio`).check();
       await page.getByTestId('submit-button').click();
 
       await expect(page).toHaveURL(
-        `${baseURL}/templates/message-plans/choose-templates/${messagePlans.EMAIL_ROUTING_CONFIG.id}`
+        `${baseURL}/templates/message-plans/choose-templates/${plan.id}`
       );
     });
 
     await test.step('pre-selects previously selected template', async () => {
-      await chooseEmailTemplatePage.loadPage(
-        messagePlans.EMAIL_ROUTING_CONFIG.id
-      );
+      await chooseEmailTemplatePage.loadPage();
 
       // Check summary list is present and displays the name of the previously selected template
       const summaryList = page.getByTestId('previous-selection-summary');
@@ -204,9 +208,11 @@ test.describe('Routing - Choose email template page', () => {
 
   test.describe('redirects to invalid message plan page', () => {
     test('when message plan cannot be found', async ({ page, baseURL }) => {
-      const chooseEmailTemplatePage = new RoutingChooseEmailTemplatePage(page);
+      const chooseEmailTemplatePage = new RoutingChooseEmailTemplatePage(page)
+        .setPathParam('messagePlanId', notFoundMessagePlanId)
+        .setSearchParam('lockNumber', '42');
 
-      await chooseEmailTemplatePage.loadPage(notFoundMessagePlanId);
+      await chooseEmailTemplatePage.loadPage();
 
       await expect(page).toHaveURL(
         `${baseURL}/templates/message-plans/invalid`
@@ -214,9 +220,11 @@ test.describe('Routing - Choose email template page', () => {
     });
 
     test('when routing config ID is invalid', async ({ page, baseURL }) => {
-      const chooseEmailTemplatePage = new RoutingChooseEmailTemplatePage(page);
+      const chooseEmailTemplatePage = new RoutingChooseEmailTemplatePage(page)
+        .setPathParam('messagePlanId', invalidMessagePlanId)
+        .setSearchParam('lockNumber', '42');
 
-      await chooseEmailTemplatePage.loadPage(invalidMessagePlanId);
+      await chooseEmailTemplatePage.loadPage();
 
       await expect(page).toHaveURL(
         `${baseURL}/templates/message-plans/invalid`
@@ -227,15 +235,32 @@ test.describe('Routing - Choose email template page', () => {
       page,
       baseURL,
     }) => {
-      const chooseEmailTemplatePage = new RoutingChooseEmailTemplatePage(page);
+      const chooseEmailTemplatePage = new RoutingChooseEmailTemplatePage(page)
+        .setPathParam('messagePlanId', messagePlans.NON_EMAIL_ROUTING_CONFIG.id)
+        .setSearchParam(
+          'lockNumber',
+          String(messagePlans.NON_EMAIL_ROUTING_CONFIG.lockNumber)
+        );
 
-      await chooseEmailTemplatePage.loadPage(
-        messagePlans.NON_EMAIL_ROUTING_CONFIG.id
-      );
+      await chooseEmailTemplatePage.loadPage();
 
       await expect(page).toHaveURL(
         `${baseURL}/templates/message-plans/invalid`
       );
     });
   });
+
+  test.describe('redirects to choose templates page', () => {
+    test('when no lockNumber in url', async ({ page, baseURL }) => {
+      const chooseTemplatePage = new RoutingChooseEmailTemplatePage(
+        page
+      ).setPathParam('messagePlanId', messagePlans.EMAIL_ROUTING_CONFIG.id);
+
+      await chooseTemplatePage.loadPage();
+
+      await expect(page).toHaveURL(
+        `${baseURL}/templates/message-plans/choose-templates/${messagePlans.EMAIL_ROUTING_CONFIG.id}`
+      );
+    });
+  });
 });
diff --git a/tests/test-team/template-mgmt-routing-component-tests/email/preview-email-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/email/preview-email-template.routing-component.spec.ts
index ac2a2cad2..ea2d93f55 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/email/preview-email-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/email/preview-email-template.routing-component.spec.ts
@@ -69,9 +69,9 @@ test.describe('Routing - Preview email template page', () => {
 
   test('common page tests', async ({ page, baseURL }) => {
     const props = {
-      page: new RoutingPreviewEmailTemplatePage(page),
-      id: messagePlans.EMAIL_ROUTING_CONFIG.id,
-      additionalIds: [templates.EMAIL.id],
+      page: new RoutingPreviewEmailTemplatePage(page)
+        .setPathParam('messagePlanId', messagePlans.EMAIL_ROUTING_CONFIG.id)
+        .setPathParam('templateId', templates.EMAIL.id),
       baseURL,
       expectedUrl: `templates/message-plans/choose-email-template/${messagePlans.EMAIL_ROUTING_CONFIG.id}`,
     };
@@ -83,11 +83,12 @@ test.describe('Routing - Preview email template page', () => {
   });
 
   test('loads the email template', async ({ page, baseURL }) => {
-    const previewEmailTemplatePage = new RoutingPreviewEmailTemplatePage(page);
-    await previewEmailTemplatePage.loadPage(
-      messagePlans.EMAIL_ROUTING_CONFIG.id,
-      templates.EMAIL.id
-    );
+    const previewEmailTemplatePage = new RoutingPreviewEmailTemplatePage(page)
+      .setPathParam('messagePlanId', messagePlans.EMAIL_ROUTING_CONFIG.id)
+      .setPathParam('templateId', templates.EMAIL.id);
+
+    await previewEmailTemplatePage.loadPage();
+
     await expect(page).toHaveURL(
       `${baseURL}/templates/message-plans/choose-email-template/${messagePlans.EMAIL_ROUTING_CONFIG.id}/preview-template/${templates.EMAIL.id}`
     );
@@ -109,40 +110,31 @@ test.describe('Routing - Preview email template page', () => {
 
   test.describe('redirects to invalid template page', () => {
     test('when template cannot be found', async ({ page, baseURL }) => {
-      const previewEmailTemplatePage = new RoutingPreviewEmailTemplatePage(
-        page
-      );
+      const previewEmailTemplatePage = new RoutingPreviewEmailTemplatePage(page)
+        .setPathParam('messagePlanId', messagePlans.EMAIL_ROUTING_CONFIG.id)
+        .setPathParam('templateId', notFoundTemplateId);
 
-      await previewEmailTemplatePage.loadPage(
-        messagePlans.EMAIL_ROUTING_CONFIG.id,
-        notFoundTemplateId
-      );
+      await previewEmailTemplatePage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
 
     test('when template ID is invalid', async ({ page, baseURL }) => {
-      const previewEmailTemplatePage = new RoutingPreviewEmailTemplatePage(
-        page
-      );
+      const previewEmailTemplatePage = new RoutingPreviewEmailTemplatePage(page)
+        .setPathParam('messagePlanId', messagePlans.EMAIL_ROUTING_CONFIG.id)
+        .setPathParam('templateId', invalidTemplateId);
 
-      await previewEmailTemplatePage.loadPage(
-        messagePlans.EMAIL_ROUTING_CONFIG.id,
-        invalidTemplateId
-      );
+      await previewEmailTemplatePage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
 
     test('when template is not email', async ({ page, baseURL }) => {
-      const previewEmailTemplatePage = new RoutingPreviewEmailTemplatePage(
-        page
-      );
-
-      await previewEmailTemplatePage.loadPage(
-        messagePlans.EMAIL_ROUTING_CONFIG.id,
-        templates.APP.id
-      );
+      const previewEmailTemplatePage = new RoutingPreviewEmailTemplatePage(page)
+        .setPathParam('messagePlanId', messagePlans.EMAIL_ROUTING_CONFIG.id)
+        .setPathParam('templateId', templates.APP.id);
+
+      await previewEmailTemplatePage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
diff --git a/tests/test-team/template-mgmt-routing-component-tests/letter/choose-standard-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/letter/choose-standard-letter-template.routing-component.spec.ts
index d5860ddb7..9e3e7b1b4 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/letter/choose-standard-letter-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/letter/choose-standard-letter-template.routing-component.spec.ts
@@ -103,9 +103,11 @@ test.describe('Routing - Choose letter template page', () => {
   });
 
   test('common page tests', async ({ page, baseURL }) => {
+    const plan = messagePlans.LETTER_ROUTING_CONFIG;
     const props = {
-      page: new RoutingChooseStandardLetterTemplatePage(page),
-      id: messagePlans.LETTER_ROUTING_CONFIG.id,
+      page: new RoutingChooseStandardLetterTemplatePage(page)
+        .setPathParam('messagePlanId', plan.id)
+        .setSearchParam('lockNumber', String(plan.lockNumber)),
       baseURL,
     };
     await assertSkipToMainContent(props);
@@ -119,13 +121,14 @@ test.describe('Routing - Choose letter template page', () => {
     page,
     baseURL,
   }) => {
+    const plan = messagePlans.LETTER_ROUTING_CONFIG;
     const chooseLetterTemplatePage =
-      new RoutingChooseStandardLetterTemplatePage(page);
-    await chooseLetterTemplatePage.loadPage(
-      messagePlans.LETTER_ROUTING_CONFIG.id
-    );
+      new RoutingChooseStandardLetterTemplatePage(page)
+        .setPathParam('messagePlanId', plan.id)
+        .setSearchParam('lockNumber', String(plan.lockNumber));
+    await chooseLetterTemplatePage.loadPage();
     await expect(page).toHaveURL(
-      `${baseURL}/templates/message-plans/choose-standard-english-letter-template/${messagePlans.LETTER_ROUTING_CONFIG.id}`
+      `${baseURL}/templates/message-plans/choose-standard-english-letter-template/${plan.id}?lockNumber=${plan.lockNumber}`
     );
 
     await test.step('displays list of letter templates to choose from', async () => {
@@ -164,7 +167,7 @@ test.describe('Routing - Choose letter template page', () => {
         await expect(previewLink).toHaveText('Preview');
         await expect(previewLink).toHaveAttribute(
           'href',
-          `/templates/message-plans/choose-standard-english-letter-template/${messagePlans.LETTER_ROUTING_CONFIG.id}/preview-template/${template.id}`
+          `/templates/message-plans/choose-standard-english-letter-template/${plan.id}/preview-template/${template.id}`
         );
       }
 
@@ -183,7 +186,7 @@ test.describe('Routing - Choose letter template page', () => {
       await expect(goBackLink).toBeVisible();
       await expect(goBackLink).toHaveAttribute(
         'href',
-        `/templates/message-plans/choose-templates/${messagePlans.LETTER_ROUTING_CONFIG.id}`
+        `/templates/message-plans/choose-templates/${plan.id}`
       );
     });
 
@@ -191,7 +194,7 @@ test.describe('Routing - Choose letter template page', () => {
       await page.getByTestId('submit-button').click();
 
       await expect(page).toHaveURL(
-        `${baseURL}/templates/message-plans/choose-standard-english-letter-template/${messagePlans.LETTER_ROUTING_CONFIG.id}`
+        `${baseURL}/templates/message-plans/choose-standard-english-letter-template/${plan.id}?lockNumber=${plan.lockNumber}`
       );
 
       await expect(chooseLetterTemplatePage.errorSummary).toBeVisible();
@@ -201,22 +204,18 @@ test.describe('Routing - Choose letter template page', () => {
     });
 
     await test.step('submits selected template and navigates to choose templates page', async () => {
-      await chooseLetterTemplatePage.loadPage(
-        messagePlans.LETTER_ROUTING_CONFIG.id
-      );
+      await chooseLetterTemplatePage.loadPage();
 
       await page.getByTestId(`${templates.LETTER2.id}-radio`).check();
       await page.getByTestId('submit-button').click();
 
       await expect(page).toHaveURL(
-        `${baseURL}/templates/message-plans/choose-templates/${messagePlans.LETTER_ROUTING_CONFIG.id}`
+        `${baseURL}/templates/message-plans/choose-templates/${plan.id}`
       );
     });
 
     await test.step('pre-selects previously selected template', async () => {
-      await chooseLetterTemplatePage.loadPage(
-        messagePlans.LETTER_ROUTING_CONFIG.id
-      );
+      await chooseLetterTemplatePage.loadPage();
 
       // Check summary list is present and displays the name of the previously selected template
       const summaryList = page.getByTestId('previous-selection-summary');
@@ -232,9 +231,11 @@ test.describe('Routing - Choose letter template page', () => {
   test.describe('redirects to invalid message plan page', () => {
     test('when message plan cannot be found', async ({ page, baseURL }) => {
       const chooseLetterTemplatePage =
-        new RoutingChooseStandardLetterTemplatePage(page);
+        new RoutingChooseStandardLetterTemplatePage(page)
+          .setPathParam('messagePlanId', notFoundMessagePlanId)
+          .setSearchParam('lockNumber', '42');
 
-      await chooseLetterTemplatePage.loadPage(notFoundMessagePlanId);
+      await chooseLetterTemplatePage.loadPage();
 
       await expect(page).toHaveURL(
         `${baseURL}/templates/message-plans/invalid`
@@ -243,9 +244,11 @@ test.describe('Routing - Choose letter template page', () => {
 
     test('when routing config ID is invalid', async ({ page, baseURL }) => {
       const chooseLetterTemplatePage =
-        new RoutingChooseStandardLetterTemplatePage(page);
+        new RoutingChooseStandardLetterTemplatePage(page)
+          .setPathParam('messagePlanId', invalidMessagePlanId)
+          .setSearchParam('lockNumber', '42');
 
-      await chooseLetterTemplatePage.loadPage(invalidMessagePlanId);
+      await chooseLetterTemplatePage.loadPage();
 
       await expect(page).toHaveURL(
         `${baseURL}/templates/message-plans/invalid`
@@ -257,14 +260,34 @@ test.describe('Routing - Choose letter template page', () => {
       baseURL,
     }) => {
       const chooseLetterTemplatePage =
-        new RoutingChooseStandardLetterTemplatePage(page);
+        new RoutingChooseStandardLetterTemplatePage(page)
+          .setPathParam(
+            'messagePlanId',
+            messagePlans.NON_LETTER_ROUTING_CONFIG.id
+          )
+          .setSearchParam(
+            'lockNumber',
+            String(messagePlans.NON_LETTER_ROUTING_CONFIG.lockNumber)
+          );
+
+      await chooseLetterTemplatePage.loadPage();
 
-      await chooseLetterTemplatePage.loadPage(
-        messagePlans.NON_LETTER_ROUTING_CONFIG.id
+      await expect(page).toHaveURL(
+        `${baseURL}/templates/message-plans/invalid`
       );
+    });
+  });
+
+  test.describe('redirects to choose templates page', () => {
+    test('when no lockNumber in url', async ({ page, baseURL }) => {
+      const chooseTemplatePage = new RoutingChooseStandardLetterTemplatePage(
+        page
+      ).setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id);
+
+      await chooseTemplatePage.loadPage();
 
       await expect(page).toHaveURL(
-        `${baseURL}/templates/message-plans/invalid`
+        `${baseURL}/templates/message-plans/choose-templates/${messagePlans.LETTER_ROUTING_CONFIG.id}`
       );
     });
   });
diff --git a/tests/test-team/template-mgmt-routing-component-tests/letter/preview-standard-letter-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/letter/preview-standard-letter-template.routing-component.spec.ts
index 8effc2572..51093d1de 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/letter/preview-standard-letter-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/letter/preview-standard-letter-template.routing-component.spec.ts
@@ -69,9 +69,9 @@ test.describe('Routing - Preview Letter template page', () => {
 
   test('common page tests', async ({ page, baseURL }) => {
     const props = {
-      page: new RoutingPreviewStandardLetterTemplatePage(page),
-      id: messagePlans.LETTER_ROUTING_CONFIG.id,
-      additionalIds: [templates.LETTER.id],
+      page: new RoutingPreviewStandardLetterTemplatePage(page)
+        .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
+        .setPathParam('templateId', templates.LETTER.id),
       baseURL,
       expectedUrl: `templates/message-plans/choose-standard-english-letter-template/${messagePlans.LETTER_ROUTING_CONFIG.id}`,
     };
@@ -84,11 +84,12 @@ test.describe('Routing - Preview Letter template page', () => {
 
   test('loads the Letter template', async ({ page, baseURL }) => {
     const previewLetterTemplatePage =
-      new RoutingPreviewStandardLetterTemplatePage(page);
-    await previewLetterTemplatePage.loadPage(
-      messagePlans.LETTER_ROUTING_CONFIG.id,
-      templates.LETTER.id
-    );
+      new RoutingPreviewStandardLetterTemplatePage(page)
+        .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
+        .setPathParam('templateId', templates.LETTER.id);
+
+    await previewLetterTemplatePage.loadPage();
+
     await expect(page).toHaveURL(
       `${baseURL}/templates/message-plans/choose-standard-english-letter-template/${messagePlans.LETTER_ROUTING_CONFIG.id}/preview-template/${templates.LETTER.id}`
     );
@@ -121,36 +122,33 @@ test.describe('Routing - Preview Letter template page', () => {
   test.describe('redirects to invalid template page', () => {
     test('when template cannot be found', async ({ page, baseURL }) => {
       const previewLetterTemplatePage =
-        new RoutingPreviewStandardLetterTemplatePage(page);
+        new RoutingPreviewStandardLetterTemplatePage(page)
+          .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
+          .setPathParam('templateId', notFoundTemplateId);
 
-      await previewLetterTemplatePage.loadPage(
-        messagePlans.LETTER_ROUTING_CONFIG.id,
-        notFoundTemplateId
-      );
+      await previewLetterTemplatePage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
 
     test('when template ID is invalid', async ({ page, baseURL }) => {
       const previewLetterTemplatePage =
-        new RoutingPreviewStandardLetterTemplatePage(page);
+        new RoutingPreviewStandardLetterTemplatePage(page)
+          .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
+          .setPathParam('templateId', invalidTemplateId);
 
-      await previewLetterTemplatePage.loadPage(
-        messagePlans.LETTER_ROUTING_CONFIG.id,
-        invalidTemplateId
-      );
+      await previewLetterTemplatePage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
 
     test('when template is not letter', async ({ page, baseURL }) => {
       const previewLetterTemplatePage =
-        new RoutingPreviewStandardLetterTemplatePage(page);
+        new RoutingPreviewStandardLetterTemplatePage(page)
+          .setPathParam('messagePlanId', messagePlans.LETTER_ROUTING_CONFIG.id)
+          .setPathParam('templateId', templates.EMAIL.id);
 
-      await previewLetterTemplatePage.loadPage(
-        messagePlans.LETTER_ROUTING_CONFIG.id,
-        templates.EMAIL.id
-      );
+      await previewLetterTemplatePage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
diff --git a/tests/test-team/template-mgmt-routing-component-tests/nhs-app/choose-nhs-app-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/nhs-app/choose-nhs-app-template.routing-component.spec.ts
index bd7ff6390..4c2fca755 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/nhs-app/choose-nhs-app-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/nhs-app/choose-nhs-app-template.routing-component.spec.ts
@@ -84,8 +84,12 @@ test.describe('Routing - Choose NHS app template page', () => {
 
   test('common page tests', async ({ page, baseURL }) => {
     const props = {
-      page: new RoutingChooseNhsAppTemplatePage(page),
-      id: messagePlans.APP_ROUTING_CONFIG.id,
+      page: new RoutingChooseNhsAppTemplatePage(page)
+        .setPathParam('messagePlanId', messagePlans.APP_ROUTING_CONFIG.id)
+        .setSearchParam(
+          'lockNumber',
+          String(messagePlans.APP_ROUTING_CONFIG.lockNumber)
+        ),
       baseURL,
     };
     await assertSkipToMainContent(props);
@@ -99,10 +103,15 @@ test.describe('Routing - Choose NHS app template page', () => {
     page,
     baseURL,
   }) => {
-    const chooseNhsAppTemplatePage = new RoutingChooseNhsAppTemplatePage(page);
-    await chooseNhsAppTemplatePage.loadPage(messagePlans.APP_ROUTING_CONFIG.id);
+    const plan = messagePlans.APP_ROUTING_CONFIG;
+    const chooseNhsAppTemplatePage = new RoutingChooseNhsAppTemplatePage(page)
+      .setPathParam('messagePlanId', plan.id)
+      .setSearchParam('lockNumber', String(plan.lockNumber));
+
+    await chooseNhsAppTemplatePage.loadPage();
+
     await expect(page).toHaveURL(
-      `${baseURL}/templates/message-plans/choose-nhs-app-template/${messagePlans.APP_ROUTING_CONFIG.id}`
+      `${baseURL}/templates/message-plans/choose-nhs-app-template/${plan.id}?lockNumber=${plan.lockNumber}`
     );
 
     await test.step('displays list of NHS app templates to choose from', async () => {
@@ -137,7 +146,7 @@ test.describe('Routing - Choose NHS app template page', () => {
         await expect(previewLink).toHaveText('Preview');
         await expect(previewLink).toHaveAttribute(
           'href',
-          `/templates/message-plans/choose-nhs-app-template/${messagePlans.APP_ROUTING_CONFIG.id}/preview-template/${template.id}`
+          `/templates/message-plans/choose-nhs-app-template/${plan.id}/preview-template/${template.id}`
         );
       }
 
@@ -151,7 +160,7 @@ test.describe('Routing - Choose NHS app template page', () => {
       await expect(goBackLink).toBeVisible();
       await expect(goBackLink).toHaveAttribute(
         'href',
-        `/templates/message-plans/choose-templates/${messagePlans.APP_ROUTING_CONFIG.id}`
+        `/templates/message-plans/choose-templates/${plan.id}`
       );
     });
 
@@ -159,7 +168,7 @@ test.describe('Routing - Choose NHS app template page', () => {
       await page.getByTestId('submit-button').click();
 
       await expect(page).toHaveURL(
-        `${baseURL}/templates/message-plans/choose-nhs-app-template/${messagePlans.APP_ROUTING_CONFIG.id}`
+        `${baseURL}/templates/message-plans/choose-nhs-app-template/${plan.id}?lockNumber=${plan.lockNumber}`
       );
 
       await expect(chooseNhsAppTemplatePage.errorSummary).toBeVisible();
@@ -169,22 +178,18 @@ test.describe('Routing - Choose NHS app template page', () => {
     });
 
     await test.step('submits selected template and navigates to choose templates page', async () => {
-      await chooseNhsAppTemplatePage.loadPage(
-        messagePlans.APP_ROUTING_CONFIG.id
-      );
+      await chooseNhsAppTemplatePage.loadPage();
 
       await page.getByTestId(`${templates.APP2.id}-radio`).check();
       await page.getByTestId('submit-button').click();
 
       await expect(page).toHaveURL(
-        `${baseURL}/templates/message-plans/choose-templates/${messagePlans.APP_ROUTING_CONFIG.id}`
+        `${baseURL}/templates/message-plans/choose-templates/${plan.id}`
       );
     });
 
     await test.step('pre-selects previously selected template', async () => {
-      await chooseNhsAppTemplatePage.loadPage(
-        messagePlans.APP_ROUTING_CONFIG.id
-      );
+      await chooseNhsAppTemplatePage.loadPage();
 
       // Check summary list is present and displays the name of the previously selected template
       const summaryList = page.getByTestId('previous-selection-summary');
@@ -199,11 +204,11 @@ test.describe('Routing - Choose NHS app template page', () => {
 
   test.describe('redirects to invalid message plan page', () => {
     test('when message plan cannot be found', async ({ page, baseURL }) => {
-      const chooseNhsAppTemplatePage = new RoutingChooseNhsAppTemplatePage(
-        page
-      );
+      const chooseNhsAppTemplatePage = new RoutingChooseNhsAppTemplatePage(page)
+        .setPathParam('messagePlanId', notFoundMessagePlanId)
+        .setSearchParam('lockNumber', '42');
 
-      await chooseNhsAppTemplatePage.loadPage(notFoundMessagePlanId);
+      await chooseNhsAppTemplatePage.loadPage();
 
       await expect(page).toHaveURL(
         `${baseURL}/templates/message-plans/invalid`
@@ -211,11 +216,11 @@ test.describe('Routing - Choose NHS app template page', () => {
     });
 
     test('when routing config ID is invalid', async ({ page, baseURL }) => {
-      const chooseNhsAppTemplatePage = new RoutingChooseNhsAppTemplatePage(
-        page
-      );
+      const chooseNhsAppTemplatePage = new RoutingChooseNhsAppTemplatePage(page)
+        .setPathParam('messagePlanId', invalidMessagePlanId)
+        .setSearchParam('lockNumber', '42');
 
-      await chooseNhsAppTemplatePage.loadPage(invalidMessagePlanId);
+      await chooseNhsAppTemplatePage.loadPage();
 
       await expect(page).toHaveURL(
         `${baseURL}/templates/message-plans/invalid`
@@ -226,17 +231,32 @@ test.describe('Routing - Choose NHS app template page', () => {
       page,
       baseURL,
     }) => {
-      const chooseNhsAppTemplatePage = new RoutingChooseNhsAppTemplatePage(
-        page
-      );
+      const chooseNhsAppTemplatePage = new RoutingChooseNhsAppTemplatePage(page)
+        .setPathParam('messagePlanId', messagePlans.NON_APP_ROUTING_CONFIG.id)
+        .setSearchParam(
+          'lockNumber',
+          String(messagePlans.NON_APP_ROUTING_CONFIG.lockNumber)
+        );
 
-      await chooseNhsAppTemplatePage.loadPage(
-        messagePlans.NON_APP_ROUTING_CONFIG.id
-      );
+      await chooseNhsAppTemplatePage.loadPage();
 
       await expect(page).toHaveURL(
         `${baseURL}/templates/message-plans/invalid`
       );
     });
   });
+
+  test.describe('redirects to choose templates page', () => {
+    test('when no lockNumber in url', async ({ page, baseURL }) => {
+      const chooseTemplatePage = new RoutingChooseNhsAppTemplatePage(
+        page
+      ).setPathParam('messagePlanId', messagePlans.APP_ROUTING_CONFIG.id);
+
+      await chooseTemplatePage.loadPage();
+
+      await expect(page).toHaveURL(
+        `${baseURL}/templates/message-plans/choose-templates/${messagePlans.APP_ROUTING_CONFIG.id}`
+      );
+    });
+  });
 });
diff --git a/tests/test-team/template-mgmt-routing-component-tests/nhs-app/preview-nhs-app-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/nhs-app/preview-nhs-app-template.routing-component.spec.ts
index a30d0291d..f6689440a 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/nhs-app/preview-nhs-app-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/nhs-app/preview-nhs-app-template.routing-component.spec.ts
@@ -69,9 +69,9 @@ test.describe('Routing - Preview app template page', () => {
 
   test('common page tests', async ({ page, baseURL }) => {
     const props = {
-      page: new RoutingPreviewNhsAppTemplatePage(page),
-      id: messagePlans.APP_ROUTING_CONFIG.id,
-      additionalIds: [templates.APP.id],
+      page: new RoutingPreviewNhsAppTemplatePage(page)
+        .setPathParam('messagePlanId', messagePlans.APP_ROUTING_CONFIG.id)
+        .setPathParam('templateId', templates.APP.id),
       baseURL,
       expectedUrl: `templates/message-plans/choose-nhs-app-template/${messagePlans.APP_ROUTING_CONFIG.id}`,
     };
@@ -83,13 +83,12 @@ test.describe('Routing - Preview app template page', () => {
   });
 
   test('loads the NHS app template', async ({ page, baseURL }) => {
-    const previewNhsAppTemplatePage = new RoutingPreviewNhsAppTemplatePage(
-      page
-    );
-    await previewNhsAppTemplatePage.loadPage(
-      messagePlans.APP_ROUTING_CONFIG.id,
-      templates.APP.id
-    );
+    const previewNhsAppTemplatePage = new RoutingPreviewNhsAppTemplatePage(page)
+      .setPathParam('messagePlanId', messagePlans.APP_ROUTING_CONFIG.id)
+      .setPathParam('templateId', templates.APP.id);
+
+    await previewNhsAppTemplatePage.loadPage();
+
     await expect(page).toHaveURL(
       `${baseURL}/templates/message-plans/choose-nhs-app-template/${messagePlans.APP_ROUTING_CONFIG.id}/preview-template/${templates.APP.id}`
     );
@@ -109,12 +108,11 @@ test.describe('Routing - Preview app template page', () => {
     test('when template cannot be found', async ({ page, baseURL }) => {
       const previewNhsAppTemplatePage = new RoutingPreviewNhsAppTemplatePage(
         page
-      );
+      )
+        .setPathParam('messagePlanId', messagePlans.APP_ROUTING_CONFIG.id)
+        .setPathParam('templateId', notFoundTemplateId);
 
-      await previewNhsAppTemplatePage.loadPage(
-        messagePlans.APP_ROUTING_CONFIG.id,
-        notFoundTemplateId
-      );
+      await previewNhsAppTemplatePage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
@@ -122,12 +120,11 @@ test.describe('Routing - Preview app template page', () => {
     test('when template ID is invalid', async ({ page, baseURL }) => {
       const previewNhsAppTemplatePage = new RoutingPreviewNhsAppTemplatePage(
         page
-      );
+      )
+        .setPathParam('messagePlanId', messagePlans.APP_ROUTING_CONFIG.id)
+        .setPathParam('templateId', invalidTemplateId);
 
-      await previewNhsAppTemplatePage.loadPage(
-        messagePlans.APP_ROUTING_CONFIG.id,
-        invalidTemplateId
-      );
+      await previewNhsAppTemplatePage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
@@ -135,12 +132,11 @@ test.describe('Routing - Preview app template page', () => {
     test('when template is not NHS app', async ({ page, baseURL }) => {
       const previewNhsAppTemplatePage = new RoutingPreviewNhsAppTemplatePage(
         page
-      );
+      )
+        .setPathParam('messagePlanId', messagePlans.APP_ROUTING_CONFIG.id)
+        .setPathParam('templateId', templates.EMAIL.id);
 
-      await previewNhsAppTemplatePage.loadPage(
-        messagePlans.APP_ROUTING_CONFIG.id,
-        templates.EMAIL.id
-      );
+      await previewNhsAppTemplatePage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
diff --git a/tests/test-team/template-mgmt-routing-component-tests/sms/choose-sms-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/sms/choose-sms-template.routing-component.spec.ts
index 6b732f8d2..fe1d432f1 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/sms/choose-sms-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/sms/choose-sms-template.routing-component.spec.ts
@@ -84,8 +84,12 @@ test.describe('Routing - Choose sms template page', () => {
 
   test('common page tests', async ({ page, baseURL }) => {
     const props = {
-      page: new RoutingChooseTextMessageTemplatePage(page),
-      id: messagePlans.SMS_ROUTING_CONFIG.id,
+      page: new RoutingChooseTextMessageTemplatePage(page)
+        .setPathParam('messagePlanId', messagePlans.SMS_ROUTING_CONFIG.id)
+        .setSearchParam(
+          'lockNumber',
+          String(messagePlans.SMS_ROUTING_CONFIG.lockNumber)
+        ),
       baseURL,
     };
     await assertSkipToMainContent(props);
@@ -99,12 +103,15 @@ test.describe('Routing - Choose sms template page', () => {
     page,
     baseURL,
   }) => {
-    const chooseSmsTemplatePage = new RoutingChooseTextMessageTemplatePage(
-      page
-    );
-    await chooseSmsTemplatePage.loadPage(messagePlans.SMS_ROUTING_CONFIG.id);
+    const plan = messagePlans.SMS_ROUTING_CONFIG;
+    const chooseSmsTemplatePage = new RoutingChooseTextMessageTemplatePage(page)
+      .setPathParam('messagePlanId', plan.id)
+      .setSearchParam('lockNumber', String(plan.lockNumber));
+
+    await chooseSmsTemplatePage.loadPage();
+
     await expect(page).toHaveURL(
-      `${baseURL}/templates/message-plans/choose-text-message-template/${messagePlans.SMS_ROUTING_CONFIG.id}`
+      `${baseURL}/templates/message-plans/choose-text-message-template/${plan.id}?lockNumber=${plan.lockNumber}`
     );
 
     await test.step('displays list of sms templates to choose from', async () => {
@@ -139,7 +146,7 @@ test.describe('Routing - Choose sms template page', () => {
         await expect(previewLink).toHaveText('Preview');
         await expect(previewLink).toHaveAttribute(
           'href',
-          `/templates/message-plans/choose-text-message-template/${messagePlans.SMS_ROUTING_CONFIG.id}/preview-template/${template.id}`
+          `/templates/message-plans/choose-text-message-template/${plan.id}/preview-template/${template.id}`
         );
       }
 
@@ -153,7 +160,7 @@ test.describe('Routing - Choose sms template page', () => {
       await expect(goBackLink).toBeVisible();
       await expect(goBackLink).toHaveAttribute(
         'href',
-        `/templates/message-plans/choose-templates/${messagePlans.SMS_ROUTING_CONFIG.id}`
+        `/templates/message-plans/choose-templates/${plan.id}`
       );
     });
 
@@ -161,7 +168,7 @@ test.describe('Routing - Choose sms template page', () => {
       await page.getByTestId('submit-button').click();
 
       await expect(page).toHaveURL(
-        `${baseURL}/templates/message-plans/choose-text-message-template/${messagePlans.SMS_ROUTING_CONFIG.id}`
+        `${baseURL}/templates/message-plans/choose-text-message-template/${plan.id}?lockNumber=${plan.lockNumber}`
       );
 
       await expect(chooseSmsTemplatePage.errorSummary).toBeVisible();
@@ -171,18 +178,18 @@ test.describe('Routing - Choose sms template page', () => {
     });
 
     await test.step('submits selected template and navigates to choose templates page', async () => {
-      await chooseSmsTemplatePage.loadPage(messagePlans.SMS_ROUTING_CONFIG.id);
+      await chooseSmsTemplatePage.loadPage();
 
       await page.getByTestId(`${templates.SMS2.id}-radio`).check();
       await page.getByTestId('submit-button').click();
 
       await expect(page).toHaveURL(
-        `${baseURL}/templates/message-plans/choose-templates/${messagePlans.SMS_ROUTING_CONFIG.id}`
+        `${baseURL}/templates/message-plans/choose-templates/${plan.id}`
       );
     });
 
     await test.step('pre-selects previously selected template', async () => {
-      await chooseSmsTemplatePage.loadPage(messagePlans.SMS_ROUTING_CONFIG.id);
+      await chooseSmsTemplatePage.loadPage();
 
       // Check summary list is present and displays the name of the previously selected template
       const summaryList = page.getByTestId('previous-selection-summary');
@@ -199,9 +206,11 @@ test.describe('Routing - Choose sms template page', () => {
     test('when message plan cannot be found', async ({ page, baseURL }) => {
       const chooseSmsTemplatePage = new RoutingChooseTextMessageTemplatePage(
         page
-      );
+      )
+        .setPathParam('messagePlanId', notFoundMessagePlanId)
+        .setSearchParam('lockNumber', '42');
 
-      await chooseSmsTemplatePage.loadPage(notFoundMessagePlanId);
+      await chooseSmsTemplatePage.loadPage();
 
       await expect(page).toHaveURL(
         `${baseURL}/templates/message-plans/invalid`
@@ -211,9 +220,11 @@ test.describe('Routing - Choose sms template page', () => {
     test('when routing config ID is invalid', async ({ page, baseURL }) => {
       const chooseSmsTemplatePage = new RoutingChooseTextMessageTemplatePage(
         page
-      );
+      )
+        .setPathParam('messagePlanId', invalidMessagePlanId)
+        .setSearchParam('lockNumber', '42');
 
-      await chooseSmsTemplatePage.loadPage(invalidMessagePlanId);
+      await chooseSmsTemplatePage.loadPage();
 
       await expect(page).toHaveURL(
         `${baseURL}/templates/message-plans/invalid`
@@ -226,15 +237,32 @@ test.describe('Routing - Choose sms template page', () => {
     }) => {
       const chooseSmsTemplatePage = new RoutingChooseTextMessageTemplatePage(
         page
-      );
+      )
+        .setPathParam('messagePlanId', messagePlans.NON_SMS_ROUTING_CONFIG.id)
+        .setSearchParam(
+          'lockNumber',
+          String(messagePlans.NON_SMS_ROUTING_CONFIG.lockNumber)
+        );
 
-      await chooseSmsTemplatePage.loadPage(
-        messagePlans.NON_SMS_ROUTING_CONFIG.id
-      );
+      await chooseSmsTemplatePage.loadPage();
 
       await expect(page).toHaveURL(
         `${baseURL}/templates/message-plans/invalid`
       );
     });
+
+    test.describe('redirects to choose templates page', () => {
+      test('when no lockNumber in url', async ({ page, baseURL }) => {
+        const chooseTemplatePage = new RoutingChooseTextMessageTemplatePage(
+          page
+        ).setPathParam('messagePlanId', messagePlans.SMS_ROUTING_CONFIG.id);
+
+        await chooseTemplatePage.loadPage();
+
+        await expect(page).toHaveURL(
+          `${baseURL}/templates/message-plans/choose-templates/${messagePlans.SMS_ROUTING_CONFIG.id}`
+        );
+      });
+    });
   });
 });
diff --git a/tests/test-team/template-mgmt-routing-component-tests/sms/preview-sms-template.routing-component.spec.ts b/tests/test-team/template-mgmt-routing-component-tests/sms/preview-sms-template.routing-component.spec.ts
index 383f3fd43..4eae9407d 100644
--- a/tests/test-team/template-mgmt-routing-component-tests/sms/preview-sms-template.routing-component.spec.ts
+++ b/tests/test-team/template-mgmt-routing-component-tests/sms/preview-sms-template.routing-component.spec.ts
@@ -69,9 +69,9 @@ test.describe('Routing - Preview SMS template page', () => {
 
   test('common page tests', async ({ page, baseURL }) => {
     const props = {
-      page: new RoutingPreviewSmsTemplatePage(page),
-      id: messagePlans.SMS_ROUTING_CONFIG.id,
-      additionalIds: [templates.SMS.id],
+      page: new RoutingPreviewSmsTemplatePage(page)
+        .setPathParam('messagePlanId', messagePlans.SMS_ROUTING_CONFIG.id)
+        .setPathParam('templateId', templates.SMS.id),
       baseURL,
       expectedUrl: `templates/message-plans/choose-text-message-template/${messagePlans.SMS_ROUTING_CONFIG.id}`,
     };
@@ -83,11 +83,12 @@ test.describe('Routing - Preview SMS template page', () => {
   });
 
   test('loads the SMS template', async ({ page, baseURL }) => {
-    const previewSmsTemplatePage = new RoutingPreviewSmsTemplatePage(page);
-    await previewSmsTemplatePage.loadPage(
-      messagePlans.SMS_ROUTING_CONFIG.id,
-      templates.SMS.id
-    );
+    const previewSmsTemplatePage = new RoutingPreviewSmsTemplatePage(page)
+      .setPathParam('messagePlanId', messagePlans.SMS_ROUTING_CONFIG.id)
+      .setPathParam('templateId', templates.SMS.id);
+
+    await previewSmsTemplatePage.loadPage();
+
     await expect(page).toHaveURL(
       `${baseURL}/templates/message-plans/choose-text-message-template/${messagePlans.SMS_ROUTING_CONFIG.id}/preview-template/${templates.SMS.id}`
     );
@@ -105,34 +106,31 @@ test.describe('Routing - Preview SMS template page', () => {
 
   test.describe('redirects to invalid template page', () => {
     test('when template cannot be found', async ({ page, baseURL }) => {
-      const previewSmsTemplatePage = new RoutingPreviewSmsTemplatePage(page);
+      const previewSmsTemplatePage = new RoutingPreviewSmsTemplatePage(page)
+        .setPathParam('messagePlanId', messagePlans.SMS_ROUTING_CONFIG.id)
+        .setPathParam('templateId', notFoundTemplateId);
 
-      await previewSmsTemplatePage.loadPage(
-        messagePlans.SMS_ROUTING_CONFIG.id,
-        notFoundTemplateId
-      );
+      await previewSmsTemplatePage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
 
     test('when template ID is invalid', async ({ page, baseURL }) => {
-      const previewSmsTemplatePage = new RoutingPreviewSmsTemplatePage(page);
+      const previewSmsTemplatePage = new RoutingPreviewSmsTemplatePage(page)
+        .setPathParam('messagePlanId', messagePlans.SMS_ROUTING_CONFIG.id)
+        .setPathParam('templateId', invalidTemplateId);
 
-      await previewSmsTemplatePage.loadPage(
-        messagePlans.SMS_ROUTING_CONFIG.id,
-        invalidTemplateId
-      );
+      await previewSmsTemplatePage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
 
     test('when template is not SMS', async ({ page, baseURL }) => {
-      const previewSmsTemplatePage = new RoutingPreviewSmsTemplatePage(page);
+      const previewSmsTemplatePage = new RoutingPreviewSmsTemplatePage(page)
+        .setPathParam('messagePlanId', messagePlans.SMS_ROUTING_CONFIG.id)
+        .setPathParam('templateId', templates.EMAIL.id);
 
-      await previewSmsTemplatePage.loadPage(
-        messagePlans.SMS_ROUTING_CONFIG.id,
-        templates.EMAIL.id
-      );
+      await previewSmsTemplatePage.loadPage();
 
       await expect(page).toHaveURL(`${baseURL}/templates/invalid-template`);
     });
diff --git a/utils/entity-update-command-builder/src/__tests__/routing-config-update-builder.test.ts b/utils/entity-update-command-builder/src/__tests__/routing-config-update-builder.test.ts
index 01bdba11d..d449ae6f3 100644
--- a/utils/entity-update-command-builder/src/__tests__/routing-config-update-builder.test.ts
+++ b/utils/entity-update-command-builder/src/__tests__/routing-config-update-builder.test.ts
@@ -332,4 +332,61 @@ describe('RoutingConfigUpdateBuilder', () => {
       });
     });
   });
+
+  describe('expectLockNumber', () => {
+    test('adds condition for existing lock number', () => {
+      const builder = new RoutingConfigUpdateBuilder(
+        mockTableName,
+        mockOwner,
+        mockId
+      );
+
+      const res = builder.setStatus('COMPLETED').expectLockNumber(5).build();
+
+      expect(res).toEqual({
+        ExpressionAttributeNames: {
+          '#lockNumber': 'lockNumber',
+          '#status': 'status',
+        },
+        ExpressionAttributeValues: {
+          ':condition_1_lockNumber': 5,
+          ':status': 'COMPLETED',
+        },
+        ConditionExpression: '#lockNumber = :condition_1_lockNumber',
+        Key: {
+          id: mockId,
+          owner: mockOwnerKey,
+        },
+        TableName: 'TABLE_NAME',
+        UpdateExpression: 'SET #status = :status',
+      });
+    });
+  });
+
+  describe('incrementLockNumber', () => {
+    test('increments lock number by 1', () => {
+      const builder = new RoutingConfigUpdateBuilder(
+        mockTableName,
+        mockOwner,
+        mockId
+      );
+
+      const res = builder.incrementLockNumber().build();
+
+      expect(res).toEqual({
+        ExpressionAttributeNames: {
+          '#lockNumber': 'lockNumber',
+        },
+        ExpressionAttributeValues: {
+          ':lockNumber': 1,
+        },
+        Key: {
+          id: mockId,
+          owner: mockOwnerKey,
+        },
+        TableName: 'TABLE_NAME',
+        UpdateExpression: 'ADD #lockNumber :lockNumber',
+      });
+    });
+  });
 });
diff --git a/utils/entity-update-command-builder/src/routing-config-update-builder.ts b/utils/entity-update-command-builder/src/routing-config-update-builder.ts
index 818b068dc..2eb947dc5 100644
--- a/utils/entity-update-command-builder/src/routing-config-update-builder.ts
+++ b/utils/entity-update-command-builder/src/routing-config-update-builder.ts
@@ -79,6 +79,17 @@ export class RoutingConfigUpdateBuilder extends EntityUpdateBuilder<
     return this;
   }
 
+  expectLockNumber(lockNumber: number) {
+    this.updateBuilder.conditions.and('lockNumber', '=', lockNumber);
+
+    return this;
+  }
+
+  incrementLockNumber() {
+    this.updateBuilder.addToValue('lockNumber', 1);
+    return this;
+  }
+
   build() {
     return this.updateBuilder.finalise();
   }
diff --git a/utils/utils/src/types.ts b/utils/utils/src/types.ts
index 8052378b0..97b9bd465 100644
--- a/utils/utils/src/types.ts
+++ b/utils/utils/src/types.ts
@@ -58,27 +58,26 @@ export type LetterTemplate = Extract<TemplateDto, { templateType: 'LETTER' }>;
 export type TemplateFormState<T = CreateUpdateTemplate | TemplateDto> =
   FormState & T;
 
-export type TemplatePageProps = {
-  params: Promise<{
-    templateId: string;
-  }>;
+export type NextJsPageProps = {
+  params?: Promise<Record<string, string>>;
+  searchParams?: Promise<{ [key: string]: string | string[] | undefined }>;
 };
 
-export type MessagePlanPageProps = {
+export type TemplatePageProps = NextJsPageProps & {
   params: Promise<{
-    routingConfigId: string;
+    templateId: string;
   }>;
 };
 
-export type MessagePlanAndTemplatePageProps = {
+export type MessagePlanPageProps = NextJsPageProps & {
   params: Promise<{
     routingConfigId: string;
-    templateId: string;
   }>;
 };
 
-export type TemplateSubmittedPageProps = {
+export type MessagePlanAndTemplatePageProps = NextJsPageProps & {
   params: Promise<{
+    routingConfigId: string;
     templateId: string;
   }>;
 };