diff --git a/LocationServices/LocationServices/Scenes/Settings/Controller/SettingsVC.swift b/LocationServices/LocationServices/Scenes/Settings/Controller/SettingsVC.swift
index a2dc67c2..f72d5931 100644
--- a/LocationServices/LocationServices/Scenes/Settings/Controller/SettingsVC.swift
+++ b/LocationServices/LocationServices/Scenes/Settings/Controller/SettingsVC.swift
@@ -89,8 +89,7 @@ final class SettingsVC: UIViewController {
         self.view.addSubview(tableView)
         self.view.addSubview(disconnectButton)
         self.view.addSubview(logoutButton)
-        
-        tableView.accessibilityIdentifier = "settingsTableView"
+    
         headerTitle.snp.makeConstraints {
             $0.top.equalTo(self.view.safeAreaLayoutGuide)
             $0.leading.equalToSuperview().offset(Constants.horizontalOffset)
@@ -131,8 +130,8 @@ final class SettingsVC: UIViewController {
     private func updateLogoutButtonVisibility() {
         // show logout button only if we are not signed in
         DispatchQueue.main.async {
-            self.logoutButton.isHidden = UserDefaultsHelper.getAppState() != .loggedIn
-            self.disconnectButton.isHidden = UserDefaultsHelper.getAppState() != .customAWSConnected
+            //self.logoutButton.isHidden = UserDefaultsHelper.getAppState() != .loggedIn
+            //self.disconnectButton.isHidden = UserDefaultsHelper.getAppState() != .customAWSConnected
         }
     }
 }
diff --git a/LocationServices/LocationServicesUITests/Screens/UITestSettingsScreen.swift b/LocationServices/LocationServicesUITests/Screens/UITestSettingsScreen.swift
index 3711256a..aa6f3620 100644
--- a/LocationServices/LocationServicesUITests/Screens/UITestSettingsScreen.swift
+++ b/LocationServices/LocationServicesUITests/Screens/UITestSettingsScreen.swift
@@ -72,37 +72,29 @@ struct UITestSettingsScreen: UITestScreen {
     // MARK: - Private functions
     private func getRouteOptionCell() -> XCUIElement {
         app.activate()
-        let tableview = app.tables["settingsTableView"]
-        XCTAssertTrue(tableview.waitForExistence(timeout: UITestWaitTime.long.time))
-        let cell = tableview.cells[Identifiers.routeOptionCell]
+        let cell = app.cells[Identifiers.routeOptionCell]
         XCTAssertTrue(cell.waitForExistence(timeout: UITestWaitTime.long.time))
         return cell
     }
     
     private func getAWSCloudCell() -> XCUIElement {
         app.activate()
-        let tableview = app.tables["settingsTableView"]
-        XCTAssertTrue(tableview.waitForExistence(timeout: UITestWaitTime.long.time))
-        let cell = tableview.cells[Identifiers.awsCloudCell]
-        XCTAssertTrue(cell.waitForExistence(timeout: UITestWaitTime.long.time))
+        let cell = app.cells[Identifiers.awsCloudCell]
+        XCTAssertTrue(cell.waitForExistence(timeout: UITestWaitTime.regular.time))
         return cell
     }
     
     private func getDataProviderCell() -> XCUIElement {
         app.activate()
-        let tableview = app.tables["settingsTableView"]
-        XCTAssertTrue(tableview.waitForExistence(timeout: UITestWaitTime.long.time))
-        let cell = tableview.cells[Identifiers.dataProviderCell]
-        XCTAssertTrue(cell.waitForExistence(timeout: UITestWaitTime.long.time))
+        let cell = app.cells[Identifiers.dataProviderCell]
+        XCTAssertTrue(cell.waitForExistence(timeout: UITestWaitTime.regular.time))
         return cell
     }
     
     private func getMapStyleCell() -> XCUIElement {
         app.activate()
-        let tableview = app.tables["settingsTableView"]
-        XCTAssertTrue(tableview.waitForExistence(timeout: UITestWaitTime.long.time))
-        let cell = tableview.cells[Identifiers.mapStyleCell]
-        XCTAssertTrue(cell.waitForExistence(timeout: UITestWaitTime.long.time))
+        let cell = app.cells[Identifiers.mapStyleCell]
+        XCTAssertTrue(cell.waitForExistence(timeout: UITestWaitTime.regular.time))
         return cell
     }