diff --git a/androidComposePrototype/src/androidTest/java/com/genesys/cloud/messenger/uitest/page/BasePage.kt b/androidComposePrototype/src/androidTest/java/com/genesys/cloud/messenger/uitest/page/BasePage.kt
index 638613e9..d51a5e85 100644
--- a/androidComposePrototype/src/androidTest/java/com/genesys/cloud/messenger/uitest/page/BasePage.kt
+++ b/androidComposePrototype/src/androidTest/java/com/genesys/cloud/messenger/uitest/page/BasePage.kt
@@ -11,7 +11,7 @@ import androidx.test.uiautomator.Until
 
 open class BasePage(val activity: Activity) {
 
-    val waitTime = 40.toLong()
+    val waitTime = 50.toLong()
     val shortWaitTime = 5.toLong()
 
     // Initialize activity
diff --git a/androidComposePrototype/src/androidTest/java/com/genesys/cloud/messenger/uitest/test/ComposePrototypeUITest.kt b/androidComposePrototype/src/androidTest/java/com/genesys/cloud/messenger/uitest/test/ComposePrototypeUITest.kt
index 4aa5c108..05e01afe 100644
--- a/androidComposePrototype/src/androidTest/java/com/genesys/cloud/messenger/uitest/test/ComposePrototypeUITest.kt
+++ b/androidComposePrototype/src/androidTest/java/com/genesys/cloud/messenger/uitest/test/ComposePrototypeUITest.kt
@@ -395,7 +395,7 @@ class ComposePrototypeUITest : BaseTests() {
     @Test
     fun testDisconnectAgent_ReadOnly() {
         apiHelper.disconnectAllConversations()
-        enterDeploymentInfo(testConfig.deploymentId)
+        enterDeploymentInfo(testConfig.agentDisconnectDeploymentId)
         connect()
         sendMsg(helloText)
         val conversationInfo = apiHelper.answerNewConversation()
@@ -418,7 +418,7 @@ class ComposePrototypeUITest : BaseTests() {
     @Test
     fun testDisconnectAgent_NotReadOnly() {
         apiHelper.disconnectAllConversations()
-        enterDeploymentInfo(testConfig.agentDisconnectDeploymentId)
+        enterDeploymentInfo(testConfig.deploymentId)
         connect()
         sendMsg(helloText)
         val conversationInfo = apiHelper.answerNewConversation()
@@ -447,7 +447,7 @@ class ComposePrototypeUITest : BaseTests() {
     @Test
     fun testHistoryPull() {
         apiHelper.disconnectAllConversations()
-        enterDeploymentInfo(testConfig.deploymentId)
+        enterDeploymentInfo(testConfig.agentDisconnectDeploymentId)
         connect()
         sendMsg(helloText)
         val conversationInfo = apiHelper.answerNewConversation()