diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a04521a27d5a3461551ae9ced61fe2a00bec6eb1..b219c82a48e8f101eb3653b01077cd67ee6e1b8f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ variables:
   OPENWRT_VERSION: 23.05.3
   FILES: ${CI_PROJECT_DIR}/files
   DEFAULT_PACKAGES: luci
-  EXTRA_PACKAGES: openwisp-config openwisp-monitoring netjson-monitoring
+  EXTRA_PACKAGES: ""
   DISABLED_SERVICES: dnsmasq firewall odhcpd
   EXTRA_IMAGE_NAME: fakedOrg
 
diff --git a/files/etc/uci-defaults/99_custom b/files/etc/uci-defaults/99_custom
index fafe4a8d5a7d6c543f2cd5d11b411b81bc52de8b..75b4d939014bb849519d833f87e922de9d5f64d7 100644
--- a/files/etc/uci-defaults/99_custom
+++ b/files/etc/uci-defaults/99_custom
@@ -3,6 +3,9 @@
 uci set system.@system[0].hostname='openwrt'
 uci commit system
 
+uci del dhcp.dnsmasq1
+uci commit dhcp
+
 uci batch <<-EOF >/dev/null
   set network.lan.proto=dhcp
   delete network.lan.ipaddr