diff --git a/SAS/TMSS/docker-compose-ua.yml b/SAS/TMSS/docker-compose-ua.yml
index 92097328364f16615a1a435ad1d3a6b61a046f43..7d2f96c0c010b2c8614ad920c1977b78eaa33019 100644
--- a/SAS/TMSS/docker-compose-ua.yml
+++ b/SAS/TMSS/docker-compose-ua.yml
@@ -1,6 +1,12 @@
 # This docker-compose is used to run TMSS together with a test open ID connect server on the User Acceptance system (tmss-ua)
 version: "3"
 services:
+  rabbitmq:
+    image: rabbitmq:latest
+    hostname: rabbitmq
+    ports:
+      - 5672:5672
+      - 15672:15672
   web:
     image: nexus.cep4.control.lofar:18080/tmss_django:latest
     restart: on-failure
diff --git a/SAS/TMSS/src/tmss/settings.py b/SAS/TMSS/src/tmss/settings.py
index 6ad450c3e6b4f378fe1c3ea88e6a494f58471c8d..47971bdf52622687b5db7aaf09a0e69a779d9bb4 100644
--- a/SAS/TMSS/src/tmss/settings.py
+++ b/SAS/TMSS/src/tmss/settings.py
@@ -260,16 +260,15 @@ if "OIDC_RP_CLIENT_ID" in os.environ.keys():
 
     # OPEN-ID CONNECT
     OIDC_DRF_AUTH_BACKEND = 'mozilla_django_oidc.auth.OIDCAuthenticationBackend'
-
     # For talking to Mozilla Identity Provider:
     OIDC_RP_SCOPES = "openid email profile"  # todo: groups are not a standard scope, how to handle those?
     OIDC_RP_CLIENT_ID = os.environ.get('OIDC_RP_CLIENT_ID', '2')  # Secret, do not put real credentials on Git
     OIDC_RP_CLIENT_SECRET = os.environ.get('OIDC_RP_CLIENT_SECRET',
                                            'secret')  # Secret, do not put real credentials on Git
     OIDC_ENDPOINT_HOST = os.environ.get('OIDC_ENDPOINT_HOST', 'tmss_test_oidc')
-    OIDC_OP_AUTHORIZATION_ENDPOINT = "http://%s:8088/openid/authorize" % OIDC_ENDPOINT_HOST
-    OIDC_OP_TOKEN_ENDPOINT = "http://%s:8088/openid/token" % OIDC_ENDPOINT_HOST
-    OIDC_OP_USER_ENDPOINT = "http://%s:8088/openid/userinfo" % OIDC_ENDPOINT_HOST
+    OIDC_OP_AUTHORIZATION_ENDPOINT = "http://%s:8088/openid/authorize/" % OIDC_ENDPOINT_HOST
+    OIDC_OP_TOKEN_ENDPOINT = "http://%s:8088/openid/token/" % OIDC_ENDPOINT_HOST
+    OIDC_OP_USER_ENDPOINT = "http://%s:8088/openid/userinfo/" % OIDC_ENDPOINT_HOST
 
     AUTHENTICATION_BACKENDS += ('mozilla_django_oidc.auth.OIDCAuthenticationBackend',)
     MIDDLEWARE.append('mozilla_django_oidc.middleware.SessionRefresh')