diff --git a/cypress/e2e/userIsAbleToConnectAndDisconnectAwsAccount.cy.js b/cypress/e2e/userIsAbleToConnectAndDisconnectAwsAccount.cy.js
index 2b6331e1..333d2f6d 100644
--- a/cypress/e2e/userIsAbleToConnectAndDisconnectAwsAccount.cy.js
+++ b/cypress/e2e/userIsAbleToConnectAndDisconnectAwsAccount.cy.js
@@ -5,7 +5,7 @@ describe("Connecting and Disconnecting AWS account", () => {
 	beforeEach(() => {
 		cy.visitDomain(`${Cypress.env("WEB_DOMAIN")}/demo`);
 		cy.get('[data-testid="hamburger-menu"]').click();
-		cy.get('[data-testid="connect-aws-account-button"]').click();
+		cy.get('[data-testid="connect-aws-account-button"]').first().click();
 		cy.wait(5000);
 		cy.get('[placeholder="Enter IdentityPoolId"]').type(`${Cypress.env("IDENTITY_POOL_ID")}`);
 		cy.get('[placeholder="Enter UserDomain"]').type(`${Cypress.env("USER_DOMAIN")}`);
diff --git a/cypress/e2e/userIsAbleToUseGeofence.cy.js b/cypress/e2e/userIsAbleToUseGeofence.cy.js
index 9a404b11..3f6fcbf3 100644
--- a/cypress/e2e/userIsAbleToUseGeofence.cy.js
+++ b/cypress/e2e/userIsAbleToUseGeofence.cy.js
@@ -9,7 +9,7 @@ describe("Geofence", () => {
 	beforeEach(() => {
 		cy.visitDomain(`${Cypress.env("WEB_DOMAIN")}/demo`);
 		cy.get('[data-testid="hamburger-menu"]').click();
-		cy.get('[data-testid="connect-aws-account-button"]').click();
+		cy.get('[data-testid="connect-aws-account-button"]').first().click();
 		cy.wait(5000);
 		cy.get('[placeholder="Enter IdentityPoolId"]').type(`${Cypress.env("IDENTITY_POOL_ID")}`);
 		cy.get('[placeholder="Enter UserDomain"]').type(`${Cypress.env("USER_DOMAIN")}`);
diff --git a/cypress/e2e/userIsAbleToUseTracker.cy.js b/cypress/e2e/userIsAbleToUseTracker.cy.js
index 3930d5d5..0d2d4585 100644
--- a/cypress/e2e/userIsAbleToUseTracker.cy.js
+++ b/cypress/e2e/userIsAbleToUseTracker.cy.js
@@ -8,7 +8,7 @@ describe("Tracker", () => {
 	beforeEach(() => {
 		cy.visitDomain(`${Cypress.env("WEB_DOMAIN")}/demo`);
 		cy.get('[data-testid="hamburger-menu"]').click();
-		cy.get('[data-testid="connect-aws-account-button"]').click();
+		cy.get('[data-testid="connect-aws-account-button"]').first().click();
 		cy.wait(5000);
 		cy.get('[placeholder="Enter IdentityPoolId"]').type(`${Cypress.env("IDENTITY_POOL_ID")}`);
 		cy.get('[placeholder="Enter UserDomain"]').type(`${Cypress.env("USER_DOMAIN")}`);
diff --git a/src/atomicui/organisms/Sidebar/Sidebar.tsx b/src/atomicui/organisms/Sidebar/Sidebar.tsx
index b253a8ed..af412077 100644
--- a/src/atomicui/organisms/Sidebar/Sidebar.tsx
+++ b/src/atomicui/organisms/Sidebar/Sidebar.tsx
@@ -252,7 +252,7 @@ const Sidebar: FC<SidebarProps> = ({
 					</Button>
 				)}
 				<Button
-					data-testid="connect-aws-account-button"
+					data-testid="provide-feedback-button"
 					variation="primary"
 					fontFamily="AmazonEmber-Bold"
 					textAlign="center"