diff --git a/.github/workflows/apollo.yml b/.github/workflows/apollo.yml
index d5acffe7..eafb8408 100644
--- a/.github/workflows/apollo.yml
+++ b/.github/workflows/apollo.yml
@@ -19,7 +19,7 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: 16.x
-      - run: npm ci
+      - run: npm ci --legacy-peer-deps
       - run: npm run lint
 
   build-code:
@@ -30,7 +30,7 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: 16.x
-      - run: npm ci
+      - run: npm ci --legacy-peer-deps
       - run: npm run build
 
   unit-tests:
@@ -41,5 +41,5 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: 16.x
-      - run: npm ci
+      - run: npm ci --legacy-peer-deps
       - run: npm test
diff --git a/packages/apollo/test/functional/features/8-InstallInstantiate1xSmartContract.feature b/packages/apollo/test/functional/features/8-InstallInstantiate1xSmartContract.feature
index 39d24df5..c6067a99 100644
--- a/packages/apollo/test/functional/features/8-InstallInstantiate1xSmartContract.feature
+++ b/packages/apollo/test/functional/features/8-InstallInstantiate1xSmartContract.feature
@@ -19,6 +19,7 @@ Feature: 1.x Smart Contract flow
         And I am logged in
         And I am ready to get started
         And I am on the 'smart_contracts' page
+        Then wait "5" seconds
         And I clicked the button with id 'overflow-installed-fabcar_2.1.1'
         And I clicked the button with id 'instantiate_modal'
         And I selected 'channel1' value from the 'div#chaincodeModal-channel-selectedChannel' dropdown
diff --git a/packages/apollo/test/functional/helpers/navigation.js b/packages/apollo/test/functional/helpers/navigation.js
index 05a6cba9..5384830d 100644
--- a/packages/apollo/test/functional/helpers/navigation.js
+++ b/packages/apollo/test/functional/helpers/navigation.js
@@ -27,7 +27,7 @@ async function clickButton(property, value) {
 		throw new Error('Property not supported');
 	}
 
-	await browser.wait(ExpectedConditions.elementToBeClickable(button), 60000);
+	await browser.wait(ExpectedConditions.elementToBeClickable(button), 2 * 60 * 1000);
 	await button.click();
 }
 
diff --git a/packages/apollo/test/functional/steps/chaincode.steps.js b/packages/apollo/test/functional/steps/chaincode.steps.js
index 9684dccd..b34d943a 100644
--- a/packages/apollo/test/functional/steps/chaincode.steps.js
+++ b/packages/apollo/test/functional/steps/chaincode.steps.js
@@ -22,16 +22,16 @@ Then(/^the chaincode with name (?:'|")(.*?)(?:'|") should have been created in (
 	let tileTitleEl;
 	try {
 		tileTitleEl = element(by.cssContainingText('.ibp-tile-content-title', chaincodeName));
-		await browser.wait(ExpectedConditions.elementToBeClickable(tileTitleEl), 3 * 60 * 1000);
+		await browser.wait(ExpectedConditions.elementToBeClickable(tileTitleEl), 6 * 60 * 1000);
 	} catch (e) {
 		await browser.sleep(60 * 1000);
 		await browser.refresh();
 		tileTitleEl = element(by.cssContainingText('.ibp-tile-content-title', chaincodeName));
-		await browser.wait(ExpectedConditions.elementToBeClickable(tileTitleEl), 3 * 60 * 1000);
+		await browser.wait(ExpectedConditions.elementToBeClickable(tileTitleEl), 6 * 60 * 1000);
 	}
 	let tile = await tileTitleEl.element(by.xpath('../..'));
 	let stateEl = await tile.element(by.css('.ibp-channel-chaincode-status'));
-	browser.wait(ExpectedConditions.textToBePresentInElement(stateEl, state), 3 * 60 * 1000);
+	browser.wait(ExpectedConditions.textToBePresentInElement(stateEl, state), 6 * 60 * 1000);
 	let stateText = await stateEl.getText();
 	stateText.should.equal(state);
 });
diff --git a/packages/apollo/test/functional/steps/notifcation.steps.js b/packages/apollo/test/functional/steps/notifcation.steps.js
index c16f2293..93234a4c 100644
--- a/packages/apollo/test/functional/steps/notifcation.steps.js
+++ b/packages/apollo/test/functional/steps/notifcation.steps.js
@@ -21,12 +21,12 @@ Then(/^I should see a success toast which says (?:'|")(.*?)(?:'|")$/, async expe
 	let successElement;
 	try {
 		successElement = element(by.className('bx--toast-notification__title'));
-		await browser.wait(ExpectedConditions.visibilityOf(successElement), 60000);
+		await browser.wait(ExpectedConditions.visibilityOf(successElement), 5 * 60 * 1000);
 		let successText = await successElement.getText();
 		successText.should.contain(expectedMessage);
 	} catch (err) {
 		successElement = element(by.className('bx--toast-notification__subtitle'));
-		await browser.wait(ExpectedConditions.visibilityOf(successElement), 60000);
+		await browser.wait(ExpectedConditions.visibilityOf(successElement), 5 * 60 * 1000);
 		let successText = await successElement.getText();
 		successText.should.contain(expectedMessage);
 	}