diff --git a/x-pack/platform/plugins/shared/index_management/public/application/sections/home/template_list/template_details/tabs/tab_summary.tsx b/x-pack/platform/plugins/shared/index_management/public/application/sections/home/template_list/template_details/tabs/tab_summary.tsx
index 6958a32845fe6..a6fbe93642813 100644
--- a/x-pack/platform/plugins/shared/index_management/public/application/sections/home/template_list/template_details/tabs/tab_summary.tsx
+++ b/x-pack/platform/plugins/shared/index_management/public/application/sections/home/template_list/template_details/tabs/tab_summary.tsx
@@ -234,7 +234,7 @@ export const TabSummary: React.FunctionComponent<Props> = ({ templateDetails })
                     defaultMessage="Index mode"
                   />
                 </EuiDescriptionListTitle>
-                <EuiDescriptionListDescription>
+                <EuiDescriptionListDescription data-test-subj="indexModeValue">
                   {indexModeLabels[indexMode]}
                 </EuiDescriptionListDescription>
               </>
diff --git a/x-pack/test/functional/apps/index_management/data_streams_tab/data_streams_tab.ts b/x-pack/test/functional/apps/index_management/data_streams_tab/data_streams_tab.ts
index e91bdeeb5e417..ae32297fe96a0 100644
--- a/x-pack/test/functional/apps/index_management/data_streams_tab/data_streams_tab.ts
+++ b/x-pack/test/functional/apps/index_management/data_streams_tab/data_streams_tab.ts
@@ -282,6 +282,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
 
         // Click update template
         await pageObjects.indexManagement.clickNextButton();
+        await pageObjects.header.waitUntilLoadingHasFinished();
 
         // Verify index mode and close detail tab
         expect(await testSubjects.getVisibleText('indexModeValue')).to.be(indexModeName);
@@ -322,11 +323,8 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
 
         await changeIndexMode('index_mode_logsdb');
         // Navigate to the last step of the wizard
-        await testSubjects.click('nextButton');
-        await testSubjects.click('nextButton');
-        await testSubjects.click('nextButton');
-        await testSubjects.click('nextButton');
-        await testSubjects.click('nextButton');
+        await testSubjects.click('formWizardStep-5');
+        await pageObjects.header.waitUntilLoadingHasFinished();
 
         await verifyModeHasBeenChanged(INDEX_MODE.LOGSDB);
       });
@@ -339,11 +337,8 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
 
         await changeIndexMode('index_mode_standard');
         // Navigate to the last step of the wizard
-        await testSubjects.click('nextButton');
-        await testSubjects.click('nextButton');
-        await testSubjects.click('nextButton');
-        await testSubjects.click('nextButton');
-        await testSubjects.click('nextButton');
+        await testSubjects.click('formWizardStep-5');
+        await pageObjects.header.waitUntilLoadingHasFinished();
 
         await verifyModeHasBeenChanged(INDEX_MODE.STANDARD);
       });
@@ -357,16 +352,15 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
 
         await changeIndexMode('index_mode_logsdb');
 
-        await testSubjects.click('nextButton');
-        await testSubjects.click('nextButton');
+        await testSubjects.click('formWizardStep-2');
+        await pageObjects.header.waitUntilLoadingHasFinished();
         // Modify Index settings
         await testSubjects.setValue('kibanaCodeEditor', '{}', {
           clearWithKeyboard: true,
         });
         // Navigate to the last step of the wizard
-        await testSubjects.click('nextButton');
-        await testSubjects.click('nextButton');
-        await testSubjects.click('nextButton');
+        await testSubjects.click('formWizardStep-5');
+        await pageObjects.header.waitUntilLoadingHasFinished();
 
         await verifyModeHasBeenChanged(INDEX_MODE.LOGSDB);
       });
@@ -379,8 +373,8 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
 
         await changeIndexMode('index_mode_time_series');
 
-        await testSubjects.click('nextButton');
-        await testSubjects.click('nextButton');
+        await testSubjects.click('formWizardStep-2');
+        await pageObjects.header.waitUntilLoadingHasFinished();
         // Modify Index settings
         await testSubjects.setValue(
           'kibanaCodeEditor',
@@ -390,9 +384,8 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
           }
         );
         // Navigate to the last step of the wizard
-        await testSubjects.click('nextButton');
-        await testSubjects.click('nextButton');
-        await testSubjects.click('nextButton');
+        await testSubjects.click('formWizardStep-5');
+        await pageObjects.header.waitUntilLoadingHasFinished();
 
         await verifyModeHasBeenChanged(INDEX_MODE.TIME_SERIES);
       });
diff --git a/x-pack/test/functional/apps/index_management/index_templates_tab/index_template_tab.ts b/x-pack/test/functional/apps/index_management/index_templates_tab/index_template_tab.ts
index 75f022eaf7555..32337c04f05ad 100644
--- a/x-pack/test/functional/apps/index_management/index_templates_tab/index_template_tab.ts
+++ b/x-pack/test/functional/apps/index_management/index_templates_tab/index_template_tab.ts
@@ -47,11 +47,8 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       await testSubjects.click('show-filters-button');
       await testSubjects.click('filter-option-h');
       // Navigate to the last step of the wizard
-      await testSubjects.click('nextButton');
-      await testSubjects.click('nextButton');
-      await testSubjects.click('nextButton');
-      await testSubjects.click('nextButton');
-      await testSubjects.click('nextButton');
+      await testSubjects.click('formWizardStep-5');
+      await pageObjects.header.waitUntilLoadingHasFinished();
 
       expect(await testSubjects.getVisibleText('lifecycleValue')).to.be('7 hours');
 
@@ -71,11 +68,8 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       await testSubjects.click('index_mode_logsdb');
 
       // Navigate to the last step of the wizard
-      await testSubjects.click('nextButton');
-      await testSubjects.click('nextButton');
-      await testSubjects.click('nextButton');
-      await testSubjects.click('nextButton');
-      await testSubjects.click('nextButton');
+      await testSubjects.click('formWizardStep-5');
+      await pageObjects.header.waitUntilLoadingHasFinished();
 
       expect(await testSubjects.exists('indexModeTitle')).to.be(true);
       expect(await testSubjects.getVisibleText('indexModeValue')).to.be('LogsDB');
diff --git a/x-pack/test_serverless/functional/test_suites/common/management/index_management/data_streams.ts b/x-pack/test_serverless/functional/test_suites/common/management/index_management/data_streams.ts
index 5ebef67bcec0c..9144c9875996c 100644
--- a/x-pack/test_serverless/functional/test_suites/common/management/index_management/data_streams.ts
+++ b/x-pack/test_serverless/functional/test_suites/common/management/index_management/data_streams.ts
@@ -198,6 +198,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
 
         // Click update template
         await pageObjects.indexManagement.clickNextButton();
+        await pageObjects.header.waitUntilLoadingHasFinished();
 
         // Verify index mode and close detail tab
         expect(await testSubjects.getVisibleText('indexModeValue')).to.be(indexModeName);
@@ -245,11 +246,8 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
 
         await changeIndexMode('index_mode_logsdb');
         // Navigate to the last step of the wizard
-        await testSubjects.click('nextButton');
-        await testSubjects.click('nextButton');
-        await testSubjects.click('nextButton');
-        await testSubjects.click('nextButton');
-        await testSubjects.click('nextButton');
+        await testSubjects.click('formWizardStep-5');
+        await pageObjects.header.waitUntilLoadingHasFinished();
 
         await verifyModeHasBeenChanged(INDEX_MODE.LOGSDB);
       });
@@ -262,11 +260,8 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
 
         await changeIndexMode('index_mode_standard');
         // Navigate to the last step of the wizard
-        await testSubjects.click('nextButton');
-        await testSubjects.click('nextButton');
-        await testSubjects.click('nextButton');
-        await testSubjects.click('nextButton');
-        await testSubjects.click('nextButton');
+        await testSubjects.click('formWizardStep-5');
+        await pageObjects.header.waitUntilLoadingHasFinished();
 
         await verifyModeHasBeenChanged(INDEX_MODE.STANDARD);
       });
@@ -280,16 +275,14 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
 
         await changeIndexMode('index_mode_logsdb');
 
-        await testSubjects.click('nextButton');
-        await testSubjects.click('nextButton');
+        await testSubjects.click('formWizardStep-2');
+        await pageObjects.header.waitUntilLoadingHasFinished();
         // Modify Index settings
         await testSubjects.setValue('kibanaCodeEditor', '{}', {
           clearWithKeyboard: true,
         });
         // Navigate to the last step of the wizard
-        await testSubjects.click('nextButton');
-        await testSubjects.click('nextButton');
-        await testSubjects.click('nextButton');
+        await testSubjects.click('formWizardStep-5');
 
         await verifyModeHasBeenChanged(INDEX_MODE.LOGSDB);
       });
@@ -302,8 +295,8 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
 
         await changeIndexMode('index_mode_time_series');
 
-        await testSubjects.click('nextButton');
-        await testSubjects.click('nextButton');
+        await testSubjects.click('formWizardStep-2');
+        await pageObjects.header.waitUntilLoadingHasFinished();
         // Modify Index settings
         await testSubjects.setValue(
           'kibanaCodeEditor',
@@ -313,9 +306,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
           }
         );
         // Navigate to the last step of the wizard
-        await testSubjects.click('nextButton');
-        await testSubjects.click('nextButton');
-        await testSubjects.click('nextButton');
+        await testSubjects.click('formWizardStep-5');
 
         await verifyModeHasBeenChanged(INDEX_MODE.TIME_SERIES);
       });
diff --git a/x-pack/test_serverless/functional/test_suites/common/management/index_management/index_templates.ts b/x-pack/test_serverless/functional/test_suites/common/management/index_management/index_templates.ts
index 30ed3c30104e3..5e2cfba50997f 100644
--- a/x-pack/test_serverless/functional/test_suites/common/management/index_management/index_templates.ts
+++ b/x-pack/test_serverless/functional/test_suites/common/management/index_management/index_templates.ts
@@ -117,10 +117,12 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
 
         // Click form summary step and then the submit button
         await testSubjects.click('formWizardStep-5');
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect(await testSubjects.getVisibleText('indexModeValue')).to.be('LogsDB');
 
         // Click update template
         await pageObjects.indexManagement.clickNextButton();
+        await pageObjects.header.waitUntilLoadingHasFinished();
 
         // Close detail tab
         expect(await testSubjects.getVisibleText('indexModeValue')).to.be('LogsDB');