diff --git a/tools/build_uec.sh b/tools/build_uec.sh
index 6bab526..33a6a27 100755
--- a/tools/build_uec.sh
+++ b/tools/build_uec.sh
@@ -90,9 +90,10 @@
 
 # libvirt.xml configuration
 NET_XML=$vm_dir/net.xml
+NET_NAME=${NET_NAME:-devstack-$GUEST_NETWORK}
 cat > $NET_XML <<EOF
 <network>
-  <name>devstack-$GUEST_NETWORK</name>
+  <name>$NET_NAME</name>
   <bridge name="stackbr%d" />
   <forward/>
   <ip address="$GUEST_GATEWAY" netmask="$GUEST_NETMASK">
@@ -104,9 +105,9 @@
 EOF
 
 if [[ "$GUEST_RECREATE_NET" == "yes" ]]; then
-    virsh net-destroy devstack-$GUEST_NETWORK || true
+    virsh net-destroy $NET_NAME || true
     # destroying the network isn't enough to delete the leases
-    rm -f /var/lib/libvirt/dnsmasq/devstack-$GUEST_NETWORK.leases
+    rm -f /var/lib/libvirt/dnsmasq/$NET_NAME.leases
     virsh net-create $vm_dir/net.xml
 fi
 
diff --git a/tools/jenkins/configurations/kvm.sh b/tools/jenkins/configurations/kvm.sh
index 2c52f64..e4c4bc5 100755
--- a/tools/jenkins/configurations/kvm.sh
+++ b/tools/jenkins/configurations/kvm.sh
@@ -27,7 +27,6 @@
 BASE_NAME=executor-`printf "%02d" $EXECUTOR_NUMBER`
 GUEST_NAME=$BASE_NAME.$ADAPTER
 virsh destroy `virsh list | grep $BASE_NAME | cut -d " " -f1` || true
-rm -f /var/lib/libvirt/dnsmasq/$BASE_NAME*.leases
 
 # Configure localrc
 cat <<EOF >localrc
@@ -43,6 +42,7 @@
 ADMIN_PASSWORD=chicken
 USERNAME=admin
 TENANT=admin
+NET_NAME=$GUEST_NAME
 EOF
 cd tools
 sudo ./build_uec.sh