diff --git a/Makefile b/Makefile
index 68224d77..b6b65fe2 100644
--- a/Makefile
+++ b/Makefile
@@ -154,3 +154,7 @@ runlora:
 	docker-compose -f docker/docker-compose.yml up -d
 	docker-compose -f docker/addons/influxdb-writer/docker-compose.yml up -d
 	docker-compose -f docker/addons/lora-adapter/docker-compose.yml up
+
+# Run all Mainflux core services except distributed tracing system - Jaeger. Recommended on gateways:
+rungw:
+	MF_JAEGER_URL= docker-compose -f docker/docker-compose.yml up --scale jaeger=0
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 3753494a..36bdb03a 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -139,6 +139,7 @@ services:
 
   jaeger:
     image: jaegertracing/all-in-one:1.13
+    container_name: mainflux-jaeger
     ports:
       - ${MF_JAEGER_PORT}:${MF_JAEGER_PORT}/udp
       - ${MF_JAEGER_FRONTEND}:${MF_JAEGER_FRONTEND}