diff --git a/integration-tests/cypress/support/page-objects/pipelines-po.ts b/integration-tests/cypress/support/page-objects/pipelines-po.ts
index e3a3589e..d3075aea 100644
--- a/integration-tests/cypress/support/page-objects/pipelines-po.ts
+++ b/integration-tests/cypress/support/page-objects/pipelines-po.ts
@@ -24,7 +24,7 @@ export const pipelineBuilderPO = {
     deleteTaskIcon: '[data-id="delete-task"]',
     seriesTask: '[data-id^="has-run-after-"][data-kind="node"]',
     parallelTask: '[data-id^="shared-parallel-"][data-kind="node"]',
-    sectionTitle: '.odc-pipeline-builder-page h2',
+    sectionTitle: '.odc-pipeline-builder-page [class*="form__label-text"]',
     addResourcesLink: '[data-test="add-action"]',
     quickSearchListItem(itemName: string, itemType: string): string {
       return `[data-test="item-name-${itemName}-${itemType}"]`;
@@ -49,7 +49,7 @@ export const pipelineBuilderPO = {
       parameterUrlHelper: '[data-test="parameter url"]',
       parameterRevision: '[data-test="value formData.tasks.0.params.1.value"]',
       parameterRevisionHelper: '[data-test="parameter revision"]',
-      imageName: '#form-input-formData-tasks-0-params-3-value-field',
+      imageName: '[data-test="value formData.tasks.0.params.0.value"]',
       script: '#SCRIPT',
       args: '#ARGS-0',
       actions: '[data-test-id="actions-menu-button"]',
diff --git a/integration-tests/cypress/support/pages/pipelines/pipelineBuilder-page.ts b/integration-tests/cypress/support/pages/pipelines/pipelineBuilder-page.ts
index a46785b0..89f24fe5 100644
--- a/integration-tests/cypress/support/pages/pipelines/pipelineBuilder-page.ts
+++ b/integration-tests/cypress/support/pages/pipelines/pipelineBuilder-page.ts
@@ -133,14 +133,14 @@ export const pipelineBuilderPage = {
   verifySection: () => {
     cy.get(pipelineBuilderPO.formView.sectionTitle).as('sectionTitle');
     cy.get('@sectionTitle')
-      .eq(0)
-      .should('contain.text', pipelineBuilderText.formView.Tasks);
+      .contains(pipelineBuilderText.formView.Tasks)
+      .should('be.visible');
     cy.get('@sectionTitle')
-      .eq(1)
-      .should('contain.text', pipelineBuilderText.formView.Parameters);
+      .contains(pipelineBuilderText.formView.Parameters)
+      .should('be.visible');
     cy.get('@sectionTitle')
-      .eq(2)
-      .should('contain.text', pipelineBuilderText.formView.Workspaces);
+      .contains(pipelineBuilderText.formView.Workspaces)
+      .should('be.visible');
   },
   clickCreateButton: () => {
     // eslint-disable-next-line cypress/no-unnecessary-waiting
diff --git a/integration-tests/cypress/support/step-definitions/common/pipelines.ts b/integration-tests/cypress/support/step-definitions/common/pipelines.ts
index 566e2ae5..5400ca97 100644
--- a/integration-tests/cypress/support/step-definitions/common/pipelines.ts
+++ b/integration-tests/cypress/support/step-definitions/common/pipelines.ts
@@ -147,3 +147,9 @@ Then(
     topologyPage.verifyPipelineRunStatus(status);
   },
 );
+
+Given('user is at {string} on Pipeline Builder page', (view: string) => {
+  navigateTo(devNavigationMenu.Pipelines);
+  pipelinesPage.clickOnCreatePipeline();
+  startPipelineInPipelinesPage.selectView(view);
+});
diff --git a/integration-tests/cypress/support/step-definitions/pipelines/create-from-builder-page.ts b/integration-tests/cypress/support/step-definitions/pipelines/create-from-builder-page.ts
index 662761b1..ecc081f9 100644
--- a/integration-tests/cypress/support/step-definitions/pipelines/create-from-builder-page.ts
+++ b/integration-tests/cypress/support/step-definitions/pipelines/create-from-builder-page.ts
@@ -406,9 +406,9 @@ When('user enters the value as {string}', (value: string) => {
   });
 });
 
-When('user clicks Create button on Pipeline Builder page', () => {
-  pipelineBuilderPage.clickCreateButton();
-});
+// When('user clicks Create button on Pipeline Builder page', () => {
+//   pipelineBuilderPage.clickCreateButton();
+// });
 
 Then(
   'user will see tooltip saying {string} while scrolling over diamond structure before conditional task',
@@ -492,7 +492,7 @@ Given('user has applied yaml {string}', (yamlFile: string) => {
 });
 
 Given('user is at YAML view', () => {
-  cy.get('[data-test="import-yaml"]').click();
+  cy.get('[data-test="item import-yaml"]').click();
   cy.get('.yaml-editor').should('be.visible');
 });
 
@@ -663,7 +663,7 @@ When('user hovers over the newly added task', () => {
   cy.mouseHover('[data-test="task-list"]');
   /* eslint-disable-next-line cypress/unsafe-to-chain-command */
   cy.get('[data-test="task-list"] .odc-task-list-node__trigger-underline')
-    .trigger('mouseenter')
+    .trigger('mouseenter', { force: true })
     .invoke('show');
 });
 
@@ -693,9 +693,9 @@ When(
     pipelineBuilderPage.clickAddTask();
     cy.get(pipelineBuilderPO.formView.quickSearch).type(task);
     cy.get('[aria-label="Quick search list"]').should('be.visible');
-    cy.get(
-      pipelineBuilderPO.formView.quickSearchListItem(task, provider),
-    ).click();
+    cy.get(pipelineBuilderPO.formView.quickSearchListItem(task, provider))
+      .eq(0)
+      .click();
     cy.byTestID('task-cta').click();
     pipelineBuilderPage.clickOnTask(task);
     pipelineBuilderSidePane.removeTask();
diff --git a/integration-tests/cypress/support/step-definitions/pipelines/create-pipeline-YAML-Editor.ts b/integration-tests/cypress/support/step-definitions/pipelines/create-pipeline-YAML-Editor.ts
index 42470eb8..eb99cbd8 100644
--- a/integration-tests/cypress/support/step-definitions/pipelines/create-pipeline-YAML-Editor.ts
+++ b/integration-tests/cypress/support/step-definitions/pipelines/create-pipeline-YAML-Editor.ts
@@ -1,18 +1,9 @@
-import { Given, Then, When } from '@badeball/cypress-cucumber-preprocessor';
+import { Then, When } from '@badeball/cypress-cucumber-preprocessor';
 import * as yamlEditor from '../../../../../tests/views/yaml-editor';
 import { devNavigationMenu } from '../../constants/global';
 import { pipelineBuilderPO } from '../../page-objects/pipelines-po';
 import { navigateTo } from '../../pages/app';
-import {
-  pipelinesPage,
-  startPipelineInPipelinesPage,
-} from '../../pages/pipelines/pipelines-page';
-
-Given('user is at {string} on Pipeline Builder page', (view: string) => {
-  navigateTo(devNavigationMenu.Pipelines);
-  pipelinesPage.clickOnCreatePipeline();
-  startPipelineInPipelinesPage.selectView(view);
-});
+import { pipelinesPage } from '../../pages/pipelines/pipelines-page';
 
 When(
   'user creates pipeline resource using YAML editor from {string}',