diff --git a/package/gluon-config-api/Makefile b/package/gluon-config-api/Makefile
index cc50a0db..7ee110d8 100644
--- a/package/gluon-config-api/Makefile
+++ b/package/gluon-config-api/Makefile
@@ -10,7 +10,7 @@ include ../gluon.mk
 
 define Package/gluon-config-api
   TITLE:=Provides a REST API to configure the gluon node
-  DEPENDS:=+gluon-web +uhttpd +libucl
+  DEPENDS:=+gluon-web +uhttpd +libucl +gluon-config-mode-core
 endef
 
 $(eval $(call BuildPackageGluon,gluon-config-api))
diff --git a/package/gluon-config-api/luasrc/lib/gluon/config-api/controller/controller.lua b/package/gluon-config-api/luasrc/lib/gluon/config-api/controller/controller.lua
index 3309f800..6bb81aed 100644
--- a/package/gluon-config-api/luasrc/lib/gluon/config-api/controller/controller.lua
+++ b/package/gluon-config-api/luasrc/lib/gluon/config-api/controller/controller.lua
@@ -6,7 +6,7 @@ local os = require 'os'
 local glob = require 'posix.glob'
 local libgen = require 'posix.libgen'
 local simpleuci = require 'simple-uci'
-local schema = dofile('../controller/schema.lua') -- pwd is www/
+local schema = dofile('/lib/gluon/config-api/controller/schema.lua')
 local ucl = require "ucl"
 
 package 'gluon-config-api'
diff --git a/package/gluon-config-api/luasrc/lib/gluon/config-api/www/cgi-bin/api b/package/gluon-config-api/luasrc/lib/gluon/config-mode/www/cgi-bin/api
similarity index 100%
rename from package/gluon-config-api/luasrc/lib/gluon/config-api/www/cgi-bin/api
rename to package/gluon-config-api/luasrc/lib/gluon/config-mode/www/cgi-bin/api
diff --git a/package/gluon-config-api/luasrc/lib/gluon/upgrade/500-config-api b/package/gluon-config-api/luasrc/lib/gluon/upgrade/500-config-api
deleted file mode 100755
index 035de770..00000000
--- a/package/gluon-config-api/luasrc/lib/gluon/upgrade/500-config-api
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/lua
-
-local uci = require('simple-uci').cursor()
-local site = require 'gluon.site'
-
-local function get_mem_total()
-	for line in io.lines('/proc/meminfo') do
-		local match = line:match('^MemTotal:%s+(%d+)')
-		if match then
-			return tonumber(match)
-		end
-	end
-end
-
-local max_requests = 32
-if get_mem_total() < 48*1024 then
-	max_requests = 16
-end
-
-uci:section('uhttpd', 'uhttpd', 'config_api', {
-	listen_http = { '0.0.0.0:83', '[::]:83' },
-	listen_https = {},
-
-	home = '/lib/gluon/config-api/www',
-	max_requests = max_requests,
-	max_connections = 100,
-	redirect_https = true,
-	rfc1918_filter = true,
-	cgi_prefix = '/cgi-bin',
-	script_timeout = 60,
-	network_timeout = 30,
-	http_keepalive = 20,
-	tcp_keepalive = true,
-})
-uci:save('uhttpd')
-uci:save('firewall')