diff --git a/.circleci/build/build.Dockerfile b/.circleci/build/build.Dockerfile
index 3a16101820..a782ce506e 100644
--- a/.circleci/build/build.Dockerfile
+++ b/.circleci/build/build.Dockerfile
@@ -28,8 +28,8 @@ RUN mkdir -p /data && chown -R node:node /data
 COPY --chown=node:node ./docker-entry.sh ./
 RUN chmod +x docker-entry.sh
 
-# since RI is hard-code to port 5000, expose it from the container
-EXPOSE 5000
+# since RI is hard-code to port 5540, expose it from the container
+EXPOSE 5540
 
 # don't run the node process as root
 USER node
diff --git a/.github/build/build.Dockerfile b/.github/build/build.Dockerfile
index 3a16101820..a782ce506e 100644
--- a/.github/build/build.Dockerfile
+++ b/.github/build/build.Dockerfile
@@ -28,8 +28,8 @@ RUN mkdir -p /data && chown -R node:node /data
 COPY --chown=node:node ./docker-entry.sh ./
 RUN chmod +x docker-entry.sh
 
-# since RI is hard-code to port 5000, expose it from the container
-EXPOSE 5000
+# since RI is hard-code to port 5540, expose it from the container
+EXPOSE 5540
 
 # don't run the node process as root
 USER node
diff --git a/.github/workflows/tests-integration.yml b/.github/workflows/tests-integration.yml
index ea561ef5d3..f46aacd649 100644
--- a/.github/workflows/tests-integration.yml
+++ b/.github/workflows/tests-integration.yml
@@ -114,6 +114,10 @@ jobs:
       run: |
         docker image load -i ./release/docker/docker-linux-alpine.amd64.tar
 
+    - name: Make sure coverage dir exists
+      # Important: this directory is mounted on both the `app` and `test` Docker containers.
+      run: mkdir -p ./redisinsight/api/test/test-runs/coverage
+
     - name: Run tests
       timeout-minutes: 20
       run: |
@@ -122,7 +126,7 @@ jobs:
         fi
 
         ./redisinsight/api/test/test-runs/start-test-run.sh -r ${{ matrix.rte }} -t ${{ inputs.build }}
-        mkdir -p mkdir itest/coverages && mkdir -p itest/results
+        mkdir -p itest/coverages && mkdir -p itest/results
 
         cp ./redisinsight/api/test/test-runs/coverage/test-run-result.json ./itest/results/${{ matrix.rte }}.result.json
         cp ./redisinsight/api/test/test-runs/coverage/test-run-result.xml ./itest/results/${{ matrix.rte }}.result.xml
diff --git a/redisinsight/api/test/test-runs/docker.build.env b/redisinsight/api/test/test-runs/docker.build.env
index a9236d07d5..64ca7d26e6 100644
--- a/redisinsight/api/test/test-runs/docker.build.env
+++ b/redisinsight/api/test/test-runs/docker.build.env
@@ -1,7 +1,7 @@
 COV_FOLDER=./coverage
 ID=defaultid
 RTE=defaultrte
-APP_IMAGE=riv2:latest
-TEST_BE_SERVER=https://app:5000/api
+APP_IMAGE=redisinsight:amd64
+TEST_BE_SERVER=http://app:5540/api
 RI_NOTIFICATION_UPDATE_URL=https://s3.amazonaws.com/redisinsight.test/public/tests/notifications.json
 CERTS_FOLDER=/root/.redisinsight-v2.0
diff --git a/redisinsight/api/test/test-runs/docker.build.yml b/redisinsight/api/test/test-runs/docker.build.yml
index 11bd2cf002..c0f1db09b4 100644
--- a/redisinsight/api/test/test-runs/docker.build.yml
+++ b/redisinsight/api/test/test-runs/docker.build.yml
@@ -14,8 +14,9 @@ services:
       dockerfile: ./test/test-runs/test.Dockerfile
     tty: true
     volumes:
-      - ${COV_FOLDER}:/usr/src/app/coverage
-      - ${COV_FOLDER}:/root/.redisinsight-v2.0
+      - shared-data:/usr/src/app/coverage
+      - shared-data:/root/.redisinsight-v2.0
+      - shared-data:/data
     depends_on:
       - redis
       - app
@@ -34,7 +35,8 @@ services:
     depends_on:
       - redis
     volumes:
-      - ${COV_FOLDER}:/root/.redisinsight-v2.0
+      - shared-data:/root/.redisinsight-v2.0
+      - shared-data:/data
     environment:
       RI_REDIS_CLIENTS_FORCE_STRATEGY: ${RI_REDIS_CLIENTS_FORCE_STRATEGY}
       CERTS_FOLDER: "/root/.redisinsight-v2.0"
@@ -49,3 +51,10 @@ networks:
   default:
     name: ${ID}
 
+volumes:
+  shared-data:
+    driver: local
+    driver_opts:
+      type: none
+      device: ${COV_FOLDER}
+      o: bind