diff --git a/SAS/TMSS/docker/tmss-testenv/docker-compose.yml b/SAS/TMSS/docker/tmss-testenv/docker-compose.yml
index cfdf09f4cb66aa15e655788a45db4995b9823c44..9220498435ec3513e6f0eea930c7373c34d01b8a 100644
--- a/SAS/TMSS/docker/tmss-testenv/docker-compose.yml
+++ b/SAS/TMSS/docker/tmss-testenv/docker-compose.yml
@@ -12,7 +12,11 @@ services:
       - "tmss"
     environment:
       - OIDC_ENDPOINT_HOST=172.25.0.10
+<<<<<<< HEAD
       - OIDC_RP_CLIENT_ID=1
+=======
+      - OIDC_RP_CLIENT_ID=2
+>>>>>>> TMSS-138: fixed docker compose setup for OIDC with static IP on bridge network
   tmss_test_nginx:
     build:
       context: .
@@ -20,6 +24,8 @@ services:
     container_name: tmss_test_nginx
     ports:
       - "5005:5005"
+    networks:
+      - "tmss"
   tmss_test_oidc:
     build:
       context: ../../test/oidc/docker-test-mozilla-django-oidc/
@@ -27,6 +33,9 @@ services:
     container_name: tmss_test_oidc
     ports:
       - "8088:8088"
+    networks:
+      tmss:
+        ipv4_address: 172.25.0.10
 networks:
   tmss:
     driver: bridge