diff --git a/Makefile b/Makefile
index 50c15c3..6d7a0d9 100644
--- a/Makefile
+++ b/Makefile
@@ -96,7 +96,7 @@ set/handover: $(BCONFIG)
 	@echo Set handover to true
 	@./scripts/config_edit.py $(BCONFIG) --handover=true
 	@$(MAKE) set/dataplane/free5gc
-	@$(MAKE) set/nb-ue/2
+	@$(MAKE) set/nb-ue/1
 	@$(MAKE) set/nb-edges/1
 	@$(MAKE) set/log-level/debug
 	@$(MAKE) set/full-debug/true
diff --git a/templates/compose.yaml.j2 b/templates/compose.yaml.j2
index f5a9ccb..14bce22 100644
--- a/templates/compose.yaml.j2
+++ b/templates/compose.yaml.j2
@@ -239,7 +239,7 @@ services:
       dataplane:
         ipv4_address: "{{ ipv4('gnb1', 'dataplane') }}"
 
-#~ if config["topology"]["nb_ue"] > 1
+#~ if (config["topology"]["nb_ue"] > 1) or (config["topology"]["ran"]["handover"])
   {{ container_s(name='gnb2', image='louisroyer/ueransim-gnb', enable_ipv6=True, restart='always', iface_tun=True, cap_net_admin=True, debug='allow') }}
     depends_on:
       amf: