diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index 4600949d5..55e2c3710 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -123,12 +123,11 @@ jobs:
           cache-from: type=gha,scope=integration-tests-testing
           cache-to: type=gha,mode=max,scope=integration-tests-testing
 
-      - name: Run docker-compose
+      - name: Run docker compose
         run: |
-          docker-compose run -e DATABASE_NAME=opensips_${{ inputs.context }}_test gateway-bootstrap create_db ${{ inputs.context }}
-          docker-compose up -d client_gateway public_gateway media_proxy freeswitch freeswitch_event_logger switch-app redis testing
-          sleep 30
+          docker compose run -e DATABASE_NAME=opensips_${{ inputs.context }}_test gateway-bootstrap create_db ${{ inputs.context }}
+          docker compose up --wait -d client_gateway public_gateway media_proxy freeswitch freeswitch_event_logger switch-app redis testing
 
       - name: Run ${{ inputs.context }} Tests
         run: |
-          docker-compose run -e UAS=true testing ./tests.sh ./tests/${{ inputs.context }}
+          docker compose run -e UAS=true testing ./tests.sh ./tests/${{ inputs.context }}
diff --git a/components/testing/tests/public_gateway/modify_call_test.sh b/components/testing/tests/public_gateway/modify_connect_stream_test.sh
similarity index 100%
rename from components/testing/tests/public_gateway/modify_call_test.sh
rename to components/testing/tests/public_gateway/modify_connect_stream_test.sh
diff --git a/docker-compose.yml b/docker-compose.yml
index d5b905cb1..f82fee99d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@
 #
 # Note:
 # Assumes postgres is running on the host machine.
-# Postgres is not included in this docker-compose configuration
+# Postgres is not included in this docker compose configuration
 # because of the complexity of adding code to wait for postgres to start.
 
 version: "3.9"
@@ -166,7 +166,7 @@ services:
       FILE_SERVER_PORT: 8000
       SWITCH_PORT: 8080
       FILE_SERVER_LOG_FILE: http-server.log
-      UAS: true
+      UAS: "false"
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes: