diff --git a/docker-compose.yml b/docker-compose.yml
index 13c548155242ce451ddf05230c82adcf33f36423..b8537bc56429faf479a8e3776b2dcf8e5c1dfef7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,12 +19,16 @@ services:
   policy:
     container_name: policy
     build:
-      context: $GOPATH/src/gitlab.eclipse.org/eclipse/xfsc/tsa/policy
+      context: ../policy
       dockerfile: deployment/compose/Dockerfile
     volumes:
-      - "$GOPATH/src/gitlab.eclipse.org/eclipse/xfsc/tsa/policy:/go/src/gitlab.eclipse.org/eclipse/xfsc/tsa/policy"
+      - "../policy:/go/src/gitlab.eclipse.org/eclipse/xfsc/tsa/policy"
     env_file:
       - ./env/policy.env
+    environment:
+      - USE_NGROK=true
+      - NGROK_TOKEN=${NGROK_TOKEN}
+      - NGROK_STATIC_DOMAIN=${NGROK_STATIC_DOMAIN}
     ports:
       - "8081:8080"
     depends_on:
@@ -42,10 +46,10 @@ services:
   task:
     container_name: task
     build:
-      context: $GOPATH/src/gitlab.eclipse.org/eclipse/xfsc/tsa/task
+      context: ../task
       dockerfile: deployment/compose/Dockerfile
     volumes:
-      - "$GOPATH/src/gitlab.eclipse.org/eclipse/xfsc/tsa/task:/go/src/gitlab.eclipse.org/eclipse/xfsc/tsa/task"
+      - "../task:/go/src/gitlab.eclipse.org/eclipse/xfsc/tsa/task"
     env_file:
       - ./env/task.env
     ports:
@@ -61,10 +65,10 @@ services:
   cache:
     container_name: cache
     build:
-      context: $GOPATH/src/gitlab.eclipse.org/eclipse/xfsc/tsa/cache
+      context: ../cache
       dockerfile: deployment/compose/Dockerfile
     volumes:
-      - "$GOPATH/src/gitlab.eclipse.org/eclipse/xfsc/tsa/cache:/go/src/gitlab.eclipse.org/eclipse/xfsc/tsa/cache"
+      - "../cache:/go/src/gitlab.eclipse.org/eclipse/xfsc/tsa/cache"
     env_file:
       - ./env/cache.env
     ports:
@@ -80,10 +84,10 @@ services:
   infohub:
     container_name: infohub
     build:
-      context: $GOPATH/src/gitlab.eclipse.org/eclipse/xfsc/tsa/infohub
+      context: ../infohub
       dockerfile: deployment/compose/Dockerfile
     volumes:
-      - "$GOPATH/src/gitlab.eclipse.org/eclipse/xfsc/tsa/infohub:/go/src/gitlab.eclipse.org/eclipse/xfsc/tsa/infohub"
+      - "../infohub:/go/src/gitlab.eclipse.org/eclipse/xfsc/tsa/infohub"
     env_file:
       - ./env/infohub.env
     ports:
@@ -101,10 +105,10 @@ services:
   signer:
     container_name: signer
     build:
-      context: $GOPATH/src/gitlab.eclipse.org/eclipse/xfsc/tsa/signer
+      context: ../signer
       dockerfile: deployment/compose/Dockerfile
     volumes:
-      - "$GOPATH/src/gitlab.eclipse.org/eclipse/xfsc/tsa/signer:/go/src/gitlab.eclipse.org/eclipse/xfsc/tsa/signer"
+      - "../signer:/go/src/gitlab.eclipse.org/eclipse/xfsc/tsa/signer"
     env_file:
       - ./env/signer.env
     ports:
@@ -121,10 +125,10 @@ services:
   login:
     container_name: login
     build:
-      context: $GOPATH/src/gitlab.eclipse.org/eclipse/xfsc/tsa/login
+      context: ../login
       dockerfile: deployment/compose/Dockerfile
     volumes:
-      - "$GOPATH/src/gitlab.eclipse.org/eclipse/xfsc/tsa/login:/go/src/gitlab.eclipse.org/eclipse/xfsc/tsa/login"
+      - "../login:/go/src/gitlab.eclipse.org/eclipse/xfsc/tsa/login"
     env_file:
       - ./env/login.env
     ports:
diff --git a/env/policy.env b/env/policy.env
index 4d73eff6c417a7a317517ba7b13a0fb4d5efc81d..9325e8c68df84ebe23d81d10f10ce392232120f8 100644
--- a/env/policy.env
+++ b/env/policy.env
@@ -21,4 +21,5 @@ OAUTH_CLIENT_ID="workspace"
 OAUTH_CLIENT_SECRET="79bdTGYCKLz9wYSY61vpQF5d4CyZBpsZ"
 OAUTH_TOKEN_URL="http://keycloak:8080/realms/workspace/protocol/openid-connect/token"
 IP_FILTER_ENABLE="false"
-IP_FILTER_ALLOWED_IPS="172.0.0.0/0,192.0.0.0/0"
\ No newline at end of file
+IP_FILTER_ALLOWED_IPS="172.0.0.0/0,192.0.0.0/0"
+NATS_ADDR="nats:4222"