diff --git a/x-pack/plugins/osquery/cypress/e2e/all/packs_create_edit.cy.ts b/x-pack/plugins/osquery/cypress/e2e/all/packs_create_edit.cy.ts
index dbed4e56f88a0..1b8dd92c2b06a 100644
--- a/x-pack/plugins/osquery/cypress/e2e/all/packs_create_edit.cy.ts
+++ b/x-pack/plugins/osquery/cypress/e2e/all/packs_create_edit.cy.ts
@@ -38,309 +38,256 @@ import { loadSavedQuery, cleanupSavedQuery, cleanupPack, loadPack } from '../../
 import { request } from '../../tasks/common';
 import { ServerlessRoleName } from '../../support/roles';
 
-describe('Packs - Create and Edit', { tags: ['@ess', '@serverless'] }, () => {
-  let savedQueryId: string;
-  let savedQueryName: string;
-  let nomappingSavedQueryId: string;
-  let nomappingSavedQueryName: string;
-  let oneMappingSavedQueryId: string;
-  let oneMappingSavedQueryName: string;
-  let multipleMappingsSavedQueryId: string;
-  let multipleMappingsSavedQueryName: string;
-
-  const PACK_NAME = 'Pack-name' + generateRandomStringName(1)[0];
-
-  before(() => {
-    loadSavedQuery().then((data) => {
-      savedQueryId = data.saved_object_id;
-      savedQueryName = data.id;
-    });
-    loadSavedQuery({
-      ecs_mapping: {},
-      interval: '3600',
-      query: 'select * from uptime;',
-    }).then((data) => {
-      nomappingSavedQueryId = data.saved_object_id;
-      nomappingSavedQueryName = data.id;
-    });
-    loadSavedQuery({
-      ecs_mapping: {
-        'client.geo.continent_name': {
-          field: 'seconds',
-        },
-      },
-      interval: '3600',
-      query: 'select * from uptime;',
-      timeout: 607,
-    }).then((data) => {
-      oneMappingSavedQueryId = data.saved_object_id;
-      oneMappingSavedQueryName = data.id;
-    });
-    loadSavedQuery({
-      ecs_mapping: {
-        labels: {
-          field: 'days',
-        },
-        tags: {
-          field: 'seconds',
+describe(
+  'Packs - Create and Edit',
+  // TODO: failing on MKI https://github.com/elastic/kibana/issues/200302
+  { tags: ['@ess', '@serverless', '@skipInServerlessMKI'] },
+  () => {
+    let savedQueryId: string;
+    let savedQueryName: string;
+    let nomappingSavedQueryId: string;
+    let nomappingSavedQueryName: string;
+    let oneMappingSavedQueryId: string;
+    let oneMappingSavedQueryName: string;
+    let multipleMappingsSavedQueryId: string;
+    let multipleMappingsSavedQueryName: string;
+
+    const PACK_NAME = 'Pack-name' + generateRandomStringName(1)[0];
+
+    before(() => {
+      loadSavedQuery().then((data) => {
+        savedQueryId = data.saved_object_id;
+        savedQueryName = data.id;
+      });
+      loadSavedQuery({
+        ecs_mapping: {},
+        interval: '3600',
+        query: 'select * from uptime;',
+      }).then((data) => {
+        nomappingSavedQueryId = data.saved_object_id;
+        nomappingSavedQueryName = data.id;
+      });
+      loadSavedQuery({
+        ecs_mapping: {
+          'client.geo.continent_name': {
+            field: 'seconds',
+          },
         },
-        'client.address': {
-          field: 'total_seconds',
+        interval: '3600',
+        query: 'select * from uptime;',
+        timeout: 607,
+      }).then((data) => {
+        oneMappingSavedQueryId = data.saved_object_id;
+        oneMappingSavedQueryName = data.id;
+      });
+      loadSavedQuery({
+        ecs_mapping: {
+          labels: {
+            field: 'days',
+          },
+          tags: {
+            field: 'seconds',
+          },
+          'client.address': {
+            field: 'total_seconds',
+          },
         },
-      },
-      interval: '3600',
-      query: 'select * from uptime;',
-    }).then((data) => {
-      multipleMappingsSavedQueryId = data.saved_object_id;
-      multipleMappingsSavedQueryName = data.id;
+        interval: '3600',
+        query: 'select * from uptime;',
+      }).then((data) => {
+        multipleMappingsSavedQueryId = data.saved_object_id;
+        multipleMappingsSavedQueryName = data.id;
+      });
     });
-  });
-
-  beforeEach(() => {
-    cy.login(ServerlessRoleName.SOC_MANAGER);
-    navigateTo('/app/osquery');
-  });
-
-  after(() => {
-    cleanupSavedQuery(savedQueryId);
-    cleanupSavedQuery(nomappingSavedQueryId);
-    cleanupSavedQuery(oneMappingSavedQueryId);
-    cleanupSavedQuery(multipleMappingsSavedQueryId);
-  });
-
-  describe('Check if result type is correct', { tags: ['@ess', '@serverless'] }, () => {
-    let resultTypePackId: string;
 
     beforeEach(() => {
-      interceptPackId((pack) => {
-        resultTypePackId = pack;
-      });
+      cy.login(ServerlessRoleName.SOC_MANAGER);
+      navigateTo('/app/osquery');
     });
 
-    afterEach(() => {
-      cleanupPack(resultTypePackId);
+    after(() => {
+      cleanupSavedQuery(savedQueryId);
+      cleanupSavedQuery(nomappingSavedQueryId);
+      cleanupSavedQuery(oneMappingSavedQueryId);
+      cleanupSavedQuery(multipleMappingsSavedQueryId);
     });
 
-    it('Check if result type is correct', () => {
-      const packName = 'ResultType' + generateRandomStringName(1)[0];
+    describe('Check if result type is correct', { tags: ['@ess', '@serverless'] }, () => {
+      let resultTypePackId: string;
 
-      cy.contains('Packs').click();
-      cy.getBySel(ADD_PACK_HEADER_BUTTON).click();
-      cy.get(formFieldInputSelector('name')).type(`${packName}{downArrow}{enter}`);
+      beforeEach(() => {
+        interceptPackId((pack) => {
+          resultTypePackId = pack;
+        });
+      });
 
-      cy.getBySel(ADD_QUERY_BUTTON).click();
+      afterEach(() => {
+        cleanupPack(resultTypePackId);
+      });
 
-      cy.contains('Attach next query');
-      getIdFormField().type('Query1');
-      inputQuery('select * from uptime;');
-      cy.getBySel('timeout-input').clear().type('601');
-      cy.wait(500); // wait for the validation to trigger - cypress is way faster than users ;)
-      cy.getBySel(FLYOUT_SAVED_QUERY_SAVE_BUTTON).click();
+      it('Check if result type is correct', () => {
+        const packName = 'ResultType' + generateRandomStringName(1)[0];
 
-      cy.getBySel(ADD_QUERY_BUTTON).click();
+        cy.contains('Packs').click();
+        cy.getBySel(ADD_PACK_HEADER_BUTTON).click();
+        cy.get(formFieldInputSelector('name')).type(`${packName}{downArrow}{enter}`);
 
-      cy.contains('Attach next query');
-      getIdFormField().type('Query2');
-      inputQuery('select * from uptime;');
-      cy.getBySel('timeout-input').clear().type('602');
+        cy.getBySel(ADD_QUERY_BUTTON).click();
 
-      cy.getBySel('resultsTypeField').click();
-      cy.contains('Differential').click();
-      cy.wait(500); // wait for the validation to trigger - cypress is way faster than users ;)
-      cy.getBySel(FLYOUT_SAVED_QUERY_SAVE_BUTTON).click();
+        cy.contains('Attach next query');
+        getIdFormField().type('Query1');
+        inputQuery('select * from uptime;');
+        cy.getBySel('timeout-input').clear().type('601');
+        cy.wait(500); // wait for the validation to trigger - cypress is way faster than users ;)
+        cy.getBySel(FLYOUT_SAVED_QUERY_SAVE_BUTTON).click();
+
+        cy.getBySel(ADD_QUERY_BUTTON).click();
 
-      cy.getBySel(ADD_QUERY_BUTTON).click();
+        cy.contains('Attach next query');
+        getIdFormField().type('Query2');
+        inputQuery('select * from uptime;');
+        cy.getBySel('timeout-input').clear().type('602');
 
-      cy.contains('Attach next query');
-      getIdFormField().type('Query3');
-      inputQuery('select * from uptime;');
-      cy.getBySel('timeout-input').clear().type('603');
-      cy.getBySel('resultsTypeField').click();
-      cy.contains('Differential (Ignore removals)').click();
-      cy.wait(500); // wait for the validation to trigger - cypress is way faster than users ;)
-      cy.getBySel(FLYOUT_SAVED_QUERY_SAVE_BUTTON).click();
+        cy.getBySel('resultsTypeField').click();
+        cy.contains('Differential').click();
+        cy.wait(500); // wait for the validation to trigger - cypress is way faster than users ;)
+        cy.getBySel(FLYOUT_SAVED_QUERY_SAVE_BUTTON).click();
+
+        cy.getBySel(ADD_QUERY_BUTTON).click();
 
-      cy.getBySel(SAVE_PACK_BUTTON).click();
+        cy.contains('Attach next query');
+        getIdFormField().type('Query3');
+        inputQuery('select * from uptime;');
+        cy.getBySel('timeout-input').clear().type('603');
+        cy.getBySel('resultsTypeField').click();
+        cy.contains('Differential (Ignore removals)').click();
+        cy.wait(500); // wait for the validation to trigger - cypress is way faster than users ;)
+        cy.getBySel(FLYOUT_SAVED_QUERY_SAVE_BUTTON).click();
 
-      cy.getBySel('tablePaginationPopoverButton').click();
-      cy.getBySel('tablePagination-50-rows').click();
-      cy.contains(packName).click();
+        cy.getBySel(SAVE_PACK_BUTTON).click();
 
-      cy.getBySel('edit-pack-button').click();
+        cy.getBySel('tablePaginationPopoverButton').click();
+        cy.getBySel('tablePagination-50-rows').click();
+        cy.contains(packName).click();
 
-      cy.contains('Query1');
-      cy.contains('Query2');
-      cy.contains('Query3');
-      cy.get(customActionEditSavedQuerySelector('Query1')).click();
+        cy.getBySel('edit-pack-button').click();
 
-      cy.getBySel('resultsTypeField').contains('Snapshot').click();
-      cy.contains('Differential').click();
+        cy.contains('Query1');
+        cy.contains('Query2');
+        cy.contains('Query3');
+        cy.get(customActionEditSavedQuerySelector('Query1')).click();
 
-      cy.getBySel(FLYOUT_SAVED_QUERY_SAVE_BUTTON).click();
+        cy.getBySel('resultsTypeField').contains('Snapshot').click();
+        cy.contains('Differential').click();
 
-      cy.get(customActionEditSavedQuerySelector('Query2')).click();
+        cy.getBySel(FLYOUT_SAVED_QUERY_SAVE_BUTTON).click();
 
-      cy.getBySel('resultsTypeField').contains('Differential').click();
-      cy.contains('Differential (Ignore removals)').click();
-      cy.getBySel(FLYOUT_SAVED_QUERY_SAVE_BUTTON).click();
+        cy.get(customActionEditSavedQuerySelector('Query2')).click();
 
-      cy.get(customActionEditSavedQuerySelector('Query3')).click();
+        cy.getBySel('resultsTypeField').contains('Differential').click();
+        cy.contains('Differential (Ignore removals)').click();
+        cy.getBySel(FLYOUT_SAVED_QUERY_SAVE_BUTTON).click();
 
-      cy.getBySel('resultsTypeField').contains('(Ignore removals)').click();
-      cy.contains('Snapshot').click();
-      cy.getBySel(FLYOUT_SAVED_QUERY_SAVE_BUTTON).click();
+        cy.get(customActionEditSavedQuerySelector('Query3')).click();
 
-      cy.getBySel(POLICY_SELECT_COMBOBOX).type(`${DEFAULT_POLICY} {downArrow}{enter}`);
+        cy.getBySel('resultsTypeField').contains('(Ignore removals)').click();
+        cy.contains('Snapshot').click();
+        cy.getBySel(FLYOUT_SAVED_QUERY_SAVE_BUTTON).click();
 
-      cy.getBySel(UPDATE_PACK_BUTTON).click();
-      closeModalIfVisible();
+        cy.getBySel(POLICY_SELECT_COMBOBOX).type(`${DEFAULT_POLICY} {downArrow}{enter}`);
 
-      cy.contains(
-        'Create packs to organize sets of queries and to schedule queries for agent policies.'
-      );
-      const queries = {
-        Query1: {
-          interval: 3600,
-          timeout: 601,
-          query: 'select * from uptime;',
-          removed: true,
-          snapshot: false,
-        },
-        Query2: {
-          interval: 3600,
-          timeout: 602,
-          query: 'select * from uptime;',
-          removed: false,
-          snapshot: false,
-        },
-        Query3: {
-          interval: 3600,
-          timeout: 603,
-          query: 'select * from uptime;',
-        },
-      };
-      request<{ items: PackagePolicy[] }>({
-        url: '/internal/osquery/fleet_wrapper/package_policies',
-        headers: {
-          'Elastic-Api-Version': API_VERSIONS.internal.v1,
-        },
-      }).then((response) => {
-        const item = response.body.items.find(
-          (policy: PackagePolicy) => policy.name === `Policy for ${DEFAULT_POLICY}`
-        );
+        cy.getBySel(UPDATE_PACK_BUTTON).click();
+        closeModalIfVisible();
 
-        expect(item?.inputs[0].config?.osquery.value.packs[packName].queries).to.deep.equal(
-          queries
+        cy.contains(
+          'Create packs to organize sets of queries and to schedule queries for agent policies.'
         );
+        const queries = {
+          Query1: {
+            interval: 3600,
+            timeout: 601,
+            query: 'select * from uptime;',
+            removed: true,
+            snapshot: false,
+          },
+          Query2: {
+            interval: 3600,
+            timeout: 602,
+            query: 'select * from uptime;',
+            removed: false,
+            snapshot: false,
+          },
+          Query3: {
+            interval: 3600,
+            timeout: 603,
+            query: 'select * from uptime;',
+          },
+        };
+        request<{ items: PackagePolicy[] }>({
+          url: '/internal/osquery/fleet_wrapper/package_policies',
+          headers: {
+            'Elastic-Api-Version': API_VERSIONS.internal.v1,
+          },
+        }).then((response) => {
+          const item = response.body.items.find(
+            (policy: PackagePolicy) => policy.name === `Policy for ${DEFAULT_POLICY}`
+          );
+
+          expect(item?.inputs[0].config?.osquery.value.packs[packName].queries).to.deep.equal(
+            queries
+          );
+        });
       });
     });
-  });
 
-  describe('Check if pack is created', { tags: ['@ess', '@serverless'] }, () => {
-    let packId: string;
-    let packName: string;
+    describe('Check if pack is created', { tags: ['@ess', '@serverless'] }, () => {
+      let packId: string;
+      let packName: string;
 
-    beforeEach(() => {
-      interceptPackId((pack) => {
-        packId = pack;
+      beforeEach(() => {
+        interceptPackId((pack) => {
+          packId = pack;
+        });
+        packName = 'Pack-name' + generateRandomStringName(1)[0];
       });
-      packName = 'Pack-name' + generateRandomStringName(1)[0];
-    });
-
-    afterEach(() => {
-      cleanupPack(packId);
-    });
 
-    it('should add a pack from a saved query', () => {
-      cy.contains('Packs').click();
-
-      cy.getBySel(ADD_PACK_HEADER_BUTTON).click();
-      cy.get(formFieldInputSelector('name')).type(`${packName}{downArrow}{enter}`);
-      cy.get(formFieldInputSelector('description')).type(`Pack description{downArrow}{enter}`);
-      cy.getBySel(POLICY_SELECT_COMBOBOX).type(`${DEFAULT_POLICY} {downArrow}{enter}`);
-      cy.getBySel(ADD_QUERY_BUTTON).click();
-
-      cy.contains('Attach next query');
-      cy.getBySel('globalLoadingIndicator').should('not.exist');
-      cy.getBySel(LIVE_QUERY_EDITOR).should('exist');
-      cy.getBySel(SAVED_QUERY_DROPDOWN_SELECT).type(`${savedQueryName}{downArrow}{enter}`);
-      cy.getBySel('osquery-interval-field').click().clear().type('5');
-      cy.getBySel(FLYOUT_SAVED_QUERY_SAVE_BUTTON).click();
-
-      cy.get(TABLE_ROWS).contains(savedQueryName);
-      cy.getBySel(SAVE_PACK_BUTTON).click();
-      closeModalIfVisible();
-      cy.getBySel('tablePaginationPopoverButton').click();
-      cy.getBySel('tablePagination-50-rows').click();
-      cy.contains(packName);
-      cy.contains(`Successfully created "${packName}" pack`);
-      closeToastIfVisible();
-    });
-  });
+      afterEach(() => {
+        cleanupPack(packId);
+      });
 
-  describe('to click the edit button and edit pack', { tags: ['@ess', '@serverless'] }, () => {
-    let packId: string;
-    let packName: string;
-    let newQueryName: string;
+      it('should add a pack from a saved query', () => {
+        cy.contains('Packs').click();
 
-    beforeEach(() => {
-      request<{ items: PackagePolicy[] }>({
-        url: '/internal/osquery/fleet_wrapper/package_policies',
-        headers: {
-          'Elastic-Api-Version': API_VERSIONS.internal.v1,
-        },
-      })
-        .then((response) =>
-          loadPack({
-            policy_ids: response.body.items[0].policy_ids,
-            queries: {
-              [savedQueryName]: { ecs_mapping: {}, interval: 3600, query: 'select * from uptime;' },
-            },
-          })
-        )
-        .then((pack) => {
-          packId = pack.saved_object_id;
-          packName = pack.name;
-        });
-      newQueryName = 'new-query-name' + generateRandomStringName(1)[0];
-    });
+        cy.getBySel(ADD_PACK_HEADER_BUTTON).click();
+        cy.get(formFieldInputSelector('name')).type(`${packName}{downArrow}{enter}`);
+        cy.get(formFieldInputSelector('description')).type(`Pack description{downArrow}{enter}`);
+        cy.getBySel(POLICY_SELECT_COMBOBOX).type(`${DEFAULT_POLICY} {downArrow}{enter}`);
+        cy.getBySel(ADD_QUERY_BUTTON).click();
 
-    afterEach(() => {
-      cleanupPack(packId);
-    });
+        cy.contains('Attach next query');
+        cy.getBySel('globalLoadingIndicator').should('not.exist');
+        cy.getBySel(LIVE_QUERY_EDITOR).should('exist');
+        cy.getBySel(SAVED_QUERY_DROPDOWN_SELECT).type(`${savedQueryName}{downArrow}{enter}`);
+        cy.getBySel('osquery-interval-field').click().clear().type('5');
+        cy.getBySel(FLYOUT_SAVED_QUERY_SAVE_BUTTON).click();
 
-    it('', () => {
-      preparePack(packName);
-      cy.getBySel('edit-pack-button').click();
-
-      cy.contains(`Edit ${packName}`);
-      cy.getBySel(ADD_QUERY_BUTTON).click();
-
-      cy.contains('Attach next query');
-      inputQuery('select * from uptime');
-      cy.get(formFieldInputSelector('id')).type(`${savedQueryName}{downArrow}{enter}`);
-
-      cy.getBySel(FLYOUT_SAVED_QUERY_SAVE_BUTTON).click();
-      cy.contains('ID must be unique').should('exist');
-      cy.get(formFieldInputSelector('id')).type(`${newQueryName}{downArrow}{enter}`);
-      cy.contains('ID must be unique').should('not.exist');
-      cy.getBySel(FLYOUT_SAVED_QUERY_SAVE_BUTTON).click();
-      cy.get(TABLE_ROWS).contains(newQueryName);
-      cy.getBySel(UPDATE_PACK_BUTTON).click();
-      closeModalIfVisible();
-      cy.contains(`Successfully updated "${packName}" pack`);
-      closeToastIfVisible();
+        cy.get(TABLE_ROWS).contains(savedQueryName);
+        cy.getBySel(SAVE_PACK_BUTTON).click();
+        closeModalIfVisible();
+        cy.getBySel('tablePaginationPopoverButton').click();
+        cy.getBySel('tablePagination-50-rows').click();
+        cy.contains(packName);
+        cy.contains(`Successfully created "${packName}" pack`);
+        closeToastIfVisible();
+      });
     });
-  });
 
-  describe(
-    'should trigger validation when saved query is being chosen',
-    { tags: ['@ess', '@serverless'] },
-    () => {
+    describe('to click the edit button and edit pack', { tags: ['@ess', '@serverless'] }, () => {
       let packId: string;
       let packName: string;
+      let newQueryName: string;
 
-      before(() => {
+      beforeEach(() => {
         request<{ items: PackagePolicy[] }>({
           url: '/internal/osquery/fleet_wrapper/package_policies',
           headers: {
@@ -363,95 +310,97 @@ describe('Packs - Create and Edit', { tags: ['@ess', '@serverless'] }, () => {
             packId = pack.saved_object_id;
             packName = pack.name;
           });
+        newQueryName = 'new-query-name' + generateRandomStringName(1)[0];
       });
 
-      after(() => {
+      afterEach(() => {
         cleanupPack(packId);
       });
 
       it('', () => {
         preparePack(packName);
-        cy.getBySel(EDIT_PACK_HEADER_BUTTON).click();
+        cy.getBySel('edit-pack-button').click();
 
+        cy.contains(`Edit ${packName}`);
         cy.getBySel(ADD_QUERY_BUTTON).click();
 
         cy.contains('Attach next query');
-        cy.getBySel('globalLoadingIndicator').should('not.exist');
-        cy.getBySel(LIVE_QUERY_EDITOR).should('exist');
-        cy.contains('ID must be unique').should('not.exist');
-        cy.getBySel(SAVED_QUERY_DROPDOWN_SELECT).type(`${savedQueryName}{downArrow}{enter}`);
-        cy.getBySel(FLYOUT_SAVED_QUERY_SAVE_BUTTON).click();
+        inputQuery('select * from uptime');
+        cy.get(formFieldInputSelector('id')).type(`${savedQueryName}{downArrow}{enter}`);
 
+        cy.getBySel(FLYOUT_SAVED_QUERY_SAVE_BUTTON).click();
         cy.contains('ID must be unique').should('exist');
-        cy.getBySel(FLYOUT_SAVED_QUERY_CANCEL_BUTTON).click();
+        cy.get(formFieldInputSelector('id')).type(`${newQueryName}{downArrow}{enter}`);
+        cy.contains('ID must be unique').should('not.exist');
+        cy.getBySel(FLYOUT_SAVED_QUERY_SAVE_BUTTON).click();
+        cy.get(TABLE_ROWS).contains(newQueryName);
+        cy.getBySel(UPDATE_PACK_BUTTON).click();
+        closeModalIfVisible();
+        cy.contains(`Successfully updated "${packName}" pack`);
+        closeToastIfVisible();
       });
-    }
-  );
-
-  describe('should open lens in new tab', { tags: ['@ess', '@brokenInServerless'] }, () => {
-    let packId: string;
-    let packName: string;
+    });
 
-    beforeEach(() => {
-      request<{ items: PackagePolicy[] }>({
-        url: '/internal/osquery/fleet_wrapper/package_policies',
-        headers: {
-          'Elastic-Api-Version': API_VERSIONS.internal.v1,
-        },
-      })
-        .then((response) =>
-          loadPack({
-            policy_ids: response.body.items[0].policy_ids,
-            queries: {
-              [savedQueryName]: {
-                ecs_mapping: {},
-                interval: 3600,
-                query: 'select * from uptime;',
-              },
+    describe(
+      'should trigger validation when saved query is being chosen',
+      { tags: ['@ess', '@serverless'] },
+      () => {
+        let packId: string;
+        let packName: string;
+
+        before(() => {
+          request<{ items: PackagePolicy[] }>({
+            url: '/internal/osquery/fleet_wrapper/package_policies',
+            headers: {
+              'Elastic-Api-Version': API_VERSIONS.internal.v1,
             },
           })
-        )
-        .then((pack) => {
-          packId = pack.saved_object_id;
-          packName = pack.name;
+            .then((response) =>
+              loadPack({
+                policy_ids: response.body.items[0].policy_ids,
+                queries: {
+                  [savedQueryName]: {
+                    ecs_mapping: {},
+                    interval: 3600,
+                    query: 'select * from uptime;',
+                  },
+                },
+              })
+            )
+            .then((pack) => {
+              packId = pack.saved_object_id;
+              packName = pack.name;
+            });
         });
-    });
 
-    afterEach(() => {
-      cleanupPack(packId);
-    });
+        after(() => {
+          cleanupPack(packId);
+        });
 
-    it('', { tags: ['@ess', '@brokenInServerless'] }, () => {
-      let lensUrl = '';
-      cy.window().then((win) => {
-        cy.stub(win, 'open')
-          .as('windowOpen')
-          .callsFake((url) => {
-            lensUrl = url;
-          });
-      });
-      preparePack(packName);
-      cy.getBySel('docsLoading').should('exist');
-      cy.getBySel('docsLoading').should('not.exist');
-      cy.get(`[aria-label="View in Lens"]`).eq(0).click();
-      cy.window()
-        .its('open')
-        .then(() => {
-          cy.visit(lensUrl);
+        it('', () => {
+          preparePack(packName);
+          cy.getBySel(EDIT_PACK_HEADER_BUTTON).click();
+
+          cy.getBySel(ADD_QUERY_BUTTON).click();
+
+          cy.contains('Attach next query');
+          cy.getBySel('globalLoadingIndicator').should('not.exist');
+          cy.getBySel(LIVE_QUERY_EDITOR).should('exist');
+          cy.contains('ID must be unique').should('not.exist');
+          cy.getBySel(SAVED_QUERY_DROPDOWN_SELECT).type(`${savedQueryName}{downArrow}{enter}`);
+          cy.getBySel(FLYOUT_SAVED_QUERY_SAVE_BUTTON).click();
+
+          cy.contains('ID must be unique').should('exist');
+          cy.getBySel(FLYOUT_SAVED_QUERY_CANCEL_BUTTON).click();
         });
-      cy.getBySel('lnsWorkspace').should('exist');
-      cy.getBySel('breadcrumbs').contains(`Action pack_${packName}_${savedQueryName}`);
-    });
-  });
+      }
+    );
 
-  describe.skip(
-    'should open discover in new tab',
-    { tags: ['@ess', '@brokenInServerless'] },
-    () => {
+    describe('should open lens in new tab', { tags: ['@ess', '@brokenInServerless'] }, () => {
       let packId: string;
       let packName: string;
 
-      before(() => {
+      beforeEach(() => {
         request<{ items: PackagePolicy[] }>({
           url: '/internal/osquery/fleet_wrapper/package_policies',
           headers: {
@@ -476,176 +425,190 @@ describe('Packs - Create and Edit', { tags: ['@ess', '@serverless'] }, () => {
           });
       });
 
-      after(() => {
+      afterEach(() => {
         cleanupPack(packId);
       });
 
-      it('', () => {
+      it('', { tags: ['@ess', '@brokenInServerless'] }, () => {
+        let lensUrl = '';
+        cy.window().then((win) => {
+          cy.stub(win, 'open')
+            .as('windowOpen')
+            .callsFake((url) => {
+              lensUrl = url;
+            });
+        });
         preparePack(packName);
-        cy.get(customActionRunSavedQuerySelector(savedQueryName))
-          .should('exist')
-          .within(() => {
-            cy.get('a')
-              .should('have.attr', 'href')
-              .then(($href) => {
-                // @ts-expect-error-next-line href string - check types
-                cy.visit($href);
-                cy.getBySel('breadcrumbs').contains('Discover').should('exist');
-                cy.contains(`action_id: pack_${PACK_NAME}_${savedQueryName}`);
-                cy.getBySel('superDatePickerToggleQuickMenuButton').click();
-                cy.getBySel('superDatePickerCommonlyUsed_Today').click();
-                cy.getBySel('discoverDocTable', { timeout: 60000 }).contains(
-                  `pack_${PACK_NAME}_${savedQueryName}`
-                );
-              });
+        cy.getBySel('docsLoading').should('exist');
+        cy.getBySel('docsLoading').should('not.exist');
+        cy.get(`[aria-label="View in Lens"]`).eq(0).click();
+        cy.window()
+          .its('open')
+          .then(() => {
+            cy.visit(lensUrl);
           });
+        cy.getBySel('lnsWorkspace').should('exist');
+        cy.getBySel('breadcrumbs').contains(`Action pack_${packName}_${savedQueryName}`);
       });
-    }
-  );
-
-  describe('deactivate and activate pack', { tags: ['@ess', '@serverless'] }, () => {
-    let packId: string;
-    let packName: string;
-
-    beforeEach(() => {
-      request<{ items: PackagePolicy[] }>({
-        url: '/internal/osquery/fleet_wrapper/package_policies',
-        headers: {
-          'Elastic-Api-Version': API_VERSIONS.internal.v1,
-        },
-      })
-        .then((response) =>
-          loadPack({
-            policy_ids: response.body.items[0].policy_ids,
-            queries: {
-              [savedQueryName]: { ecs_mapping: {}, interval: 3600, query: 'select * from uptime;' },
-            },
-          })
-        )
-        .then((pack) => {
-          packId = pack.saved_object_id;
-          packName = pack.name;
-        });
-    });
-
-    afterEach(() => {
-      cleanupPack(packId);
     });
 
-    it('', () => {
-      cy.contains('Packs').click();
-      changePackActiveStatus(packName);
-      changePackActiveStatus(packName);
-    });
-  });
-
-  describe('should verify that packs are triggered', { tags: ['@ess', '@serverless'] }, () => {
-    let packId: string;
-    let packName: string;
-
-    beforeEach(() => {
-      request<{ items: PackagePolicy[] }>({
-        url: '/internal/osquery/fleet_wrapper/package_policies',
-        headers: {
-          'Elastic-Api-Version': API_VERSIONS.internal.v1,
-        },
-      })
-        .then((response) =>
-          loadPack({
-            policy_ids: response.body.items[0].policy_ids,
-            queries: {
-              [savedQueryName]: { ecs_mapping: {}, interval: 60, query: 'select * from uptime;' },
+    describe.skip(
+      'should open discover in new tab',
+      { tags: ['@ess', '@brokenInServerless'] },
+      () => {
+        let packId: string;
+        let packName: string;
+
+        before(() => {
+          request<{ items: PackagePolicy[] }>({
+            url: '/internal/osquery/fleet_wrapper/package_policies',
+            headers: {
+              'Elastic-Api-Version': API_VERSIONS.internal.v1,
             },
           })
-        )
-        .then((pack) => {
-          packId = pack.saved_object_id;
-          packName = pack.name;
+            .then((response) =>
+              loadPack({
+                policy_ids: response.body.items[0].policy_ids,
+                queries: {
+                  [savedQueryName]: {
+                    ecs_mapping: {},
+                    interval: 3600,
+                    query: 'select * from uptime;',
+                  },
+                },
+              })
+            )
+            .then((pack) => {
+              packId = pack.saved_object_id;
+              packName = pack.name;
+            });
         });
-    });
 
-    afterEach(() => {
-      cleanupPack(packId);
-    });
+        after(() => {
+          cleanupPack(packId);
+        });
 
-    it('', () => {
-      preparePack(packName);
-      cy.contains(`${packName} details`).should('exist');
+        it('', () => {
+          preparePack(packName);
+          cy.get(customActionRunSavedQuerySelector(savedQueryName))
+            .should('exist')
+            .within(() => {
+              cy.get('a')
+                .should('have.attr', 'href')
+                .then(($href) => {
+                  // @ts-expect-error-next-line href string - check types
+                  cy.visit($href);
+                  cy.getBySel('breadcrumbs').contains('Discover').should('exist');
+                  cy.contains(`action_id: pack_${PACK_NAME}_${savedQueryName}`);
+                  cy.getBySel('superDatePickerToggleQuickMenuButton').click();
+                  cy.getBySel('superDatePickerCommonlyUsed_Today').click();
+                  cy.getBySel('discoverDocTable', { timeout: 60000 }).contains(
+                    `pack_${PACK_NAME}_${savedQueryName}`
+                  );
+                });
+            });
+        });
+      }
+    );
 
-      recurse<string>(
-        () => {
-          cy.getBySel('docsLoading').should('exist');
-          cy.getBySel('docsLoading').should('not.exist');
+    describe('deactivate and activate pack', { tags: ['@ess', '@serverless'] }, () => {
+      let packId: string;
+      let packName: string;
 
-          return cy
-            .get('tbody .euiTableRow > td:nth-child(5) > .euiTableCellContent')
-            .invoke('text');
-        },
-        (response) => response !== '-',
-        {
-          timeout: 300000,
-          post: () => {
-            cy.reload();
+      beforeEach(() => {
+        request<{ items: PackagePolicy[] }>({
+          url: '/internal/osquery/fleet_wrapper/package_policies',
+          headers: {
+            'Elastic-Api-Version': API_VERSIONS.internal.v1,
           },
-        }
-      );
-      cy.getBySel('last-results-date').should('exist');
-      cy.getBySel('docs-count-badge').contains('1');
-      cy.getBySel('agent-count-badge').contains('1');
-      cy.getBySel('packResultsErrorsEmpty').should('have.length', 1);
-    });
-  });
+        })
+          .then((response) =>
+            loadPack({
+              policy_ids: response.body.items[0].policy_ids,
+              queries: {
+                [savedQueryName]: {
+                  ecs_mapping: {},
+                  interval: 3600,
+                  query: 'select * from uptime;',
+                },
+              },
+            })
+          )
+          .then((pack) => {
+            packId = pack.saved_object_id;
+            packName = pack.name;
+          });
+      });
 
-  describe('delete all queries in the pack', { tags: ['@ess', '@serverless'] }, () => {
-    let packId: string;
-    let packName: string;
+      afterEach(() => {
+        cleanupPack(packId);
+      });
 
-    beforeEach(() => {
-      request<{ items: PackagePolicy[] }>({
-        url: '/internal/osquery/fleet_wrapper/package_policies',
-        headers: {
-          'Elastic-Api-Version': API_VERSIONS.internal.v1,
-        },
-      })
-        .then((response) =>
-          loadPack({
-            policy_ids: response.body.items[0].policy_ids,
-            queries: {
-              [savedQueryName]: { ecs_mapping: {}, interval: 3600, query: 'select * from uptime;' },
-            },
-          })
-        )
-        .then((pack) => {
-          packId = pack.saved_object_id;
-          packName = pack.name;
-        });
+      it('', () => {
+        cy.contains('Packs').click();
+        changePackActiveStatus(packName);
+        changePackActiveStatus(packName);
+      });
     });
 
-    afterEach(() => {
-      cleanupPack(packId);
-    });
+    describe('should verify that packs are triggered', { tags: ['@ess', '@serverless'] }, () => {
+      let packId: string;
+      let packName: string;
 
-    it('', () => {
-      preparePack(packName);
-      cy.contains(/^Edit$/).click();
+      beforeEach(() => {
+        request<{ items: PackagePolicy[] }>({
+          url: '/internal/osquery/fleet_wrapper/package_policies',
+          headers: {
+            'Elastic-Api-Version': API_VERSIONS.internal.v1,
+          },
+        })
+          .then((response) =>
+            loadPack({
+              policy_ids: response.body.items[0].policy_ids,
+              queries: {
+                [savedQueryName]: { ecs_mapping: {}, interval: 60, query: 'select * from uptime;' },
+              },
+            })
+          )
+          .then((pack) => {
+            packId = pack.saved_object_id;
+            packName = pack.name;
+          });
+      });
 
-      cy.getBySel('checkboxSelectAll').click();
+      afterEach(() => {
+        cleanupPack(packId);
+      });
 
-      cy.contains(/^Delete \d+ quer(y|ies)/).click();
-      cy.contains(/^Update pack$/).click();
+      it('', () => {
+        preparePack(packName);
+        cy.contains(`${packName} details`).should('exist');
 
-      closeModalIfVisible();
+        recurse<string>(
+          () => {
+            cy.getBySel('docsLoading').should('exist');
+            cy.getBySel('docsLoading').should('not.exist');
 
-      cy.get('a').contains(packName).click();
-      cy.contains(`${packName} details`).should('exist');
-      cy.contains(/^No items found/).should('exist');
+            return cy
+              .get('tbody .euiTableRow > td:nth-child(5) > .euiTableCellContent')
+              .invoke('text');
+          },
+          (response) => response !== '-',
+          {
+            timeout: 300000,
+            post: () => {
+              cy.reload();
+            },
+          }
+        );
+        cy.getBySel('last-results-date').should('exist');
+        cy.getBySel('docs-count-badge').contains('1');
+        cy.getBySel('agent-count-badge').contains('1');
+        cy.getBySel('packResultsErrorsEmpty').should('have.length', 1);
+      });
     });
-  });
 
-  describe(
-    'enable changing saved queries and ecs_mappings',
-    { tags: ['@ess', '@serverless'] },
-    () => {
+    describe('delete all queries in the pack', { tags: ['@ess', '@serverless'] }, () => {
       let packId: string;
       let packName: string;
 
@@ -682,82 +645,140 @@ describe('Packs - Create and Edit', { tags: ['@ess', '@serverless'] }, () => {
         preparePack(packName);
         cy.contains(/^Edit$/).click();
 
-        cy.getBySel(ADD_QUERY_BUTTON).click();
+        cy.getBySel('checkboxSelectAll').click();
 
-        cy.getBySel('globalLoadingIndicator').should('not.exist');
-        cy.getBySel(LIVE_QUERY_EDITOR).should('exist');
-        cy.getBySel(SAVED_QUERY_DROPDOWN_SELECT).type(
-          `${multipleMappingsSavedQueryName} {downArrow} {enter}`
-        );
-        cy.contains('Custom key/value pairs').should('exist');
-        cy.contains('Days of uptime').should('exist');
-        cy.contains('List of keywords used to tag each').should('exist');
-        cy.contains('Seconds of uptime').should('exist');
-        cy.contains('Client network address.').should('exist');
-        cy.contains('Total uptime seconds').should('exist');
-        cy.getBySel('ECSMappingEditorForm').should('have.length', 4);
-
-        cy.getBySel(SAVED_QUERY_DROPDOWN_SELECT).type(
-          `${nomappingSavedQueryName} {downArrow} {enter}`
-        );
-        cy.contains('Custom key/value pairs').should('not.exist');
-        cy.contains('Days of uptime').should('not.exist');
-        cy.contains('List of keywords used to tag each').should('not.exist');
-        cy.contains('Seconds of uptime').should('not.exist');
-        cy.contains('Client network address.').should('not.exist');
-        cy.contains('Total uptime seconds').should('not.exist');
-        cy.getBySel('ECSMappingEditorForm').should('have.length', 1);
-
-        cy.getBySel(SAVED_QUERY_DROPDOWN_SELECT).type(
-          `${oneMappingSavedQueryName} {downArrow} {enter}`
-        );
-        cy.contains('Name of the continent').should('exist');
-        cy.contains('Seconds of uptime').should('exist');
-        cy.getBySel('ECSMappingEditorForm').should('have.length', 2);
+        cy.contains(/^Delete \d+ quer(y|ies)/).click();
+        cy.contains(/^Update pack$/).click();
 
-        cy.getBySel(FLYOUT_SAVED_QUERY_SAVE_BUTTON).click();
-        cy.get(customActionEditSavedQuerySelector(oneMappingSavedQueryName)).click();
+        closeModalIfVisible();
 
-        cy.contains('Name of the continent').should('exist');
-        cy.contains('Seconds of uptime').should('exist');
-        cy.getBySel('timeout-input').should('have.value', '607');
+        cy.get('a').contains(packName).click();
+        cy.contains(`${packName} details`).should('exist');
+        cy.contains(/^No items found/).should('exist');
       });
-    }
-  );
-
-  describe('to click delete button', { tags: ['@ess', '@serverless'] }, () => {
-    let packName: string;
-    let packId: string;
+    });
 
-    beforeEach(() => {
-      request<{ items: PackagePolicy[] }>({
-        url: '/internal/osquery/fleet_wrapper/package_policies',
-        headers: {
-          'Elastic-Api-Version': API_VERSIONS.internal.v1,
-        },
-      })
-        .then((response) =>
-          loadPack({
-            policy_ids: response.body.items[0].policy_ids,
-            queries: {
-              [savedQueryName]: { ecs_mapping: {}, interval: 3600, query: 'select * from uptime;' },
+    describe(
+      'enable changing saved queries and ecs_mappings',
+      { tags: ['@ess', '@serverless'] },
+      () => {
+        let packId: string;
+        let packName: string;
+
+        beforeEach(() => {
+          request<{ items: PackagePolicy[] }>({
+            url: '/internal/osquery/fleet_wrapper/package_policies',
+            headers: {
+              'Elastic-Api-Version': API_VERSIONS.internal.v1,
             },
           })
-        )
-        .then((pack) => {
-          packName = pack.name;
-          packId = pack.saved_object_id;
+            .then((response) =>
+              loadPack({
+                policy_ids: response.body.items[0].policy_ids,
+                queries: {
+                  [savedQueryName]: {
+                    ecs_mapping: {},
+                    interval: 3600,
+                    query: 'select * from uptime;',
+                  },
+                },
+              })
+            )
+            .then((pack) => {
+              packId = pack.saved_object_id;
+              packName = pack.name;
+            });
         });
-    });
-    afterEach(() => {
-      cleanupPack(packId);
-    });
 
-    it('', { tags: ['@ess', '@serverless'] }, () => {
-      preparePack(packName);
+        afterEach(() => {
+          cleanupPack(packId);
+        });
 
-      cy.getBySel(EDIT_PACK_HEADER_BUTTON).click();
-      deleteAndConfirm('pack');
+        it('', () => {
+          preparePack(packName);
+          cy.contains(/^Edit$/).click();
+
+          cy.getBySel(ADD_QUERY_BUTTON).click();
+
+          cy.getBySel('globalLoadingIndicator').should('not.exist');
+          cy.getBySel(LIVE_QUERY_EDITOR).should('exist');
+          cy.getBySel(SAVED_QUERY_DROPDOWN_SELECT).type(
+            `${multipleMappingsSavedQueryName} {downArrow} {enter}`
+          );
+          cy.contains('Custom key/value pairs').should('exist');
+          cy.contains('Days of uptime').should('exist');
+          cy.contains('List of keywords used to tag each').should('exist');
+          cy.contains('Seconds of uptime').should('exist');
+          cy.contains('Client network address.').should('exist');
+          cy.contains('Total uptime seconds').should('exist');
+          cy.getBySel('ECSMappingEditorForm').should('have.length', 4);
+
+          cy.getBySel(SAVED_QUERY_DROPDOWN_SELECT).type(
+            `${nomappingSavedQueryName} {downArrow} {enter}`
+          );
+          cy.contains('Custom key/value pairs').should('not.exist');
+          cy.contains('Days of uptime').should('not.exist');
+          cy.contains('List of keywords used to tag each').should('not.exist');
+          cy.contains('Seconds of uptime').should('not.exist');
+          cy.contains('Client network address.').should('not.exist');
+          cy.contains('Total uptime seconds').should('not.exist');
+          cy.getBySel('ECSMappingEditorForm').should('have.length', 1);
+
+          cy.getBySel(SAVED_QUERY_DROPDOWN_SELECT).type(
+            `${oneMappingSavedQueryName} {downArrow} {enter}`
+          );
+          cy.contains('Name of the continent').should('exist');
+          cy.contains('Seconds of uptime').should('exist');
+          cy.getBySel('ECSMappingEditorForm').should('have.length', 2);
+
+          cy.getBySel(FLYOUT_SAVED_QUERY_SAVE_BUTTON).click();
+          cy.get(customActionEditSavedQuerySelector(oneMappingSavedQueryName)).click();
+
+          cy.contains('Name of the continent').should('exist');
+          cy.contains('Seconds of uptime').should('exist');
+          cy.getBySel('timeout-input').should('have.value', '607');
+        });
+      }
+    );
+
+    describe('to click delete button', { tags: ['@ess', '@serverless'] }, () => {
+      let packName: string;
+      let packId: string;
+
+      beforeEach(() => {
+        request<{ items: PackagePolicy[] }>({
+          url: '/internal/osquery/fleet_wrapper/package_policies',
+          headers: {
+            'Elastic-Api-Version': API_VERSIONS.internal.v1,
+          },
+        })
+          .then((response) =>
+            loadPack({
+              policy_ids: response.body.items[0].policy_ids,
+              queries: {
+                [savedQueryName]: {
+                  ecs_mapping: {},
+                  interval: 3600,
+                  query: 'select * from uptime;',
+                },
+              },
+            })
+          )
+          .then((pack) => {
+            packName = pack.name;
+            packId = pack.saved_object_id;
+          });
+      });
+      afterEach(() => {
+        cleanupPack(packId);
+      });
+
+      it('', { tags: ['@ess', '@serverless'] }, () => {
+        preparePack(packName);
+
+        cy.getBySel(EDIT_PACK_HEADER_BUTTON).click();
+        deleteAndConfirm('pack');
+      });
     });
-  });
-});
+  }
+);