diff --git a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh
index b0a19fd52ba893acb220a94a30a28d12ec61099b..32c3a4d10e4aa7a8d4f81fc23960b494477a0bc8 100755
--- a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh
+++ b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh
@@ -213,15 +213,10 @@ fi
 
   # Configure gRPC interface:
   #
-  # 1. Map requests to EOS virtual identities
-  CLIENT_IP=$(host client|sed 's/^.* //')
+  # 1. Map requests from the client to EOS virtual identities
+  CLIENT_IP=$(cat /etc/grpc_client_ip)
   echo CLIENT_IP is $CLIENT_IP
-  eos -r 0 0 vid add gateway client grpc
-  #for i in {1..10}
-  #do
-    #ip_addr=10.254.75.$i
-    #eos -r 0 0 vid add gateway $ip_addr grpc
-  #done
+  eos -r 0 0 vid add gateway ${CLIENT_IP} grpc
   # 2. Add authorisation key
   #
   # Note: EOS_AUTH_KEY must be the same as the one specified in client.sh
diff --git a/continuousintegration/orchestration/create_instance.sh b/continuousintegration/orchestration/create_instance.sh
index 534c7113fc3f09d6f1825feb3f15e51bae94681e..4f68a9c08df4e0da087c0b03a0a5ced035e6bfb9 100755
--- a/continuousintegration/orchestration/create_instance.sh
+++ b/continuousintegration/orchestration/create_instance.sh
@@ -301,6 +301,8 @@ kubectl --namespace=${instance} exec kdc cat /root/eos-server.keytab | kubectl -
 kubectl --namespace=${instance} exec ctacli -- kinit -kt /root/ctaadmin1.keytab ctaadmin1@TEST.CTA
 kubectl --namespace=${instance} exec client -- kinit -kt /root/user1.keytab user1@TEST.CTA
 
+# Let EOS MGM pod know the address of the client pod, to configure the gRPC gateway
+kubectl --namespace=${instance} exec client -- hostname -i | kubectl --namespace=${instance} exec -i ctaeos -- bash -c "cat > /etc/grpc_client_ip"
 
 ## THE FILE IS MOVED THERE MUCH LATER AND OVERWRITES THIS
 # THIS HAS TO BE IMPROVED (DEFINITELY) SO THAT WE CAN ASYNCHRONOUSLY UPDATE THE CONFIGURATION FILES...