diff --git a/package/gluon-alfred/files/lib/gluon/upgrade/500-enable-alfred b/package/gluon-alfred/files/lib/gluon/upgrade/500-enable-alfred
index 8c52d8a6cb129d67a9176a915472bc2136fb1a23..d3802d8a481b9a08f16933d757a3403db940cb3a 100755
--- a/package/gluon-alfred/files/lib/gluon/upgrade/500-enable-alfred
+++ b/package/gluon-alfred/files/lib/gluon/upgrade/500-enable-alfred
@@ -16,4 +16,3 @@ c:section('alfred', 'alfred', 'alfred',
 )
 
 c:save('alfred')
-c:commit('alfred')
diff --git a/package/gluon-autoupdater/files/lib/gluon/upgrade/500-autoupdater b/package/gluon-autoupdater/files/lib/gluon/upgrade/500-autoupdater
index b569f24e08e7196a42bab544f3813354263df687..17006b700fd65233156467964ad23297149a412c 100755
--- a/package/gluon-autoupdater/files/lib/gluon/upgrade/500-autoupdater
+++ b/package/gluon-autoupdater/files/lib/gluon/upgrade/500-autoupdater
@@ -40,7 +40,6 @@ end
 c:set('autoupdater', 'settings', 'version_file', '/lib/gluon/release')
 
 c:save('autoupdater')
-c:commit('autoupdater')
 
 
 local autoupdater_util = require 'autoupdater.util'
diff --git a/package/gluon-client-bridge/files/lib/gluon/upgrade/300-gluon-client-bridge-network b/package/gluon-client-bridge/files/lib/gluon/upgrade/300-gluon-client-bridge-network
index 5ee558cf7413b235a9ea2a25fe6aeed7b76bb902..4a897f74e8de85c5425938cdb6a3836e9c45c0e7 100755
--- a/package/gluon-client-bridge/files/lib/gluon/upgrade/300-gluon-client-bridge-network
+++ b/package/gluon-client-bridge/files/lib/gluon/upgrade/300-gluon-client-bridge-network
@@ -24,4 +24,3 @@ end
 uci:set('network', 'client', 'macaddr', sysconfig.primary_mac)
 
 uci:save('network')
-uci:commit('network')
diff --git a/package/gluon-client-bridge/files/lib/gluon/upgrade/320-gluon-client-bridge-wireless b/package/gluon-client-bridge/files/lib/gluon/upgrade/320-gluon-client-bridge-wireless
index 4eaccacb58175b95afed932ae9e4e8f7a915504a..8d5c7181f0e8f48dc3059c64a159bf85f13fbe4a 100755
--- a/package/gluon-client-bridge/files/lib/gluon/upgrade/320-gluon-client-bridge-wireless
+++ b/package/gluon-client-bridge/files/lib/gluon/upgrade/320-gluon-client-bridge-wireless
@@ -45,4 +45,3 @@ end
 util.iterate_radios(configure_radio)
 
 uci:save('wireless')
-uci:commit('wireless')
diff --git a/package/gluon-core/files/lib/gluon/upgrade/020-interfaces b/package/gluon-core/files/lib/gluon/upgrade/020-interfaces
index a051c738d42500f3239bb3b02bcccb02c374d19b..1818ad00b3be768fed5cc5aaca911b1d60bebdba 100755
--- a/package/gluon-core/files/lib/gluon/upgrade/020-interfaces
+++ b/package/gluon-core/files/lib/gluon/upgrade/020-interfaces
@@ -32,5 +32,4 @@ if not (sysconfig.lan_ifname or sysconfig.wan_ifname) then
   uci:delete('network', 'wan')
 
   uci:save('network')
-  uci:commit('network')
 end
diff --git a/package/gluon-core/files/lib/gluon/upgrade/030-system b/package/gluon-core/files/lib/gluon/upgrade/030-system
index d7a6660507546a78eb6706e3388229cbf494f421..0086a5dca3ba9b3a0822eece2157bb8a0dd6467f 100755
--- a/package/gluon-core/files/lib/gluon/upgrade/030-system
+++ b/package/gluon-core/files/lib/gluon/upgrade/030-system
@@ -14,5 +14,4 @@ if not sysconfig.gluon_version then
   uci:set('system', system, 'timezone', site.timezone)
 
   uci:save('system')
-  uci:commit('system')
 end
diff --git a/package/gluon-core/files/lib/gluon/upgrade/110-network b/package/gluon-core/files/lib/gluon/upgrade/110-network
index 5de2f1f4550e38aed85f0e450fb9976b098e70aa..bf87d47f4562816994bed0b17f9fb5c46598e3e3 100755
--- a/package/gluon-core/files/lib/gluon/upgrade/110-network
+++ b/package/gluon-core/files/lib/gluon/upgrade/110-network
@@ -53,7 +53,6 @@ uci:section('network', 'route6', 'wan6_unreachable',
 )
 
 uci:save('network')
-uci:commit('network')
 
 
 uci:section('firewall', 'rule', 'wan_igmp',
@@ -79,7 +78,6 @@ uci:section('firewall', 'rule', 'wan_mld',
 )
 
 uci:save('firewall')
-uci:commit('firewall')
 
 
 sysctl.set('net.ipv6.conf.all.accept_ra', 0)
diff --git a/package/gluon-core/files/lib/gluon/upgrade/120-ntp-servers b/package/gluon-core/files/lib/gluon/upgrade/120-ntp-servers
index 2b3a2df6135e809a634fa26736a9e9369ca21acb..f38c1f5d0075433d84f0bfe0e20391afccc8582e 100755
--- a/package/gluon-core/files/lib/gluon/upgrade/120-ntp-servers
+++ b/package/gluon-core/files/lib/gluon/upgrade/120-ntp-servers
@@ -11,4 +11,3 @@ local c = uci.cursor()
 c:delete('system', 'ntp', 'server')
 c:set_list('system', 'ntp', 'server', site.ntp_servers)
 c:save('system')
-c:commit('system')
diff --git a/package/gluon-core/files/lib/gluon/upgrade/140-firewall-rules b/package/gluon-core/files/lib/gluon/upgrade/140-firewall-rules
index 792e06a2c08337f2ecc2fc93596ce87acfceee37..abd453818579756f4115a79836363688adf9b9e8 100755
--- a/package/gluon-core/files/lib/gluon/upgrade/140-firewall-rules
+++ b/package/gluon-core/files/lib/gluon/upgrade/140-firewall-rules
@@ -27,4 +27,3 @@ c:section('firewall', 'rule', 'wan_ssh',
 )
 
 c:save('firewall')
-c:commit('firewall')
diff --git a/package/gluon-core/files/lib/gluon/upgrade/200-wireless b/package/gluon-core/files/lib/gluon/upgrade/200-wireless
index 2ada9b3cc51c914e450032618a021fdde2c63f4a..5a4ec0a477ec7f1dcd4e4a5d771022280d3eb32f 100755
--- a/package/gluon-core/files/lib/gluon/upgrade/200-wireless
+++ b/package/gluon-core/files/lib/gluon/upgrade/200-wireless
@@ -33,4 +33,3 @@ end
 util.iterate_radios(configure_radio)
 
 uci:save('wireless')
-uci:commit('wireless')
diff --git a/package/gluon-core/files/lib/gluon/upgrade/998-commit b/package/gluon-core/files/lib/gluon/upgrade/998-commit
new file mode 100755
index 0000000000000000000000000000000000000000..5f1f7332b7f5e67b371381933b2cc32fd89d88dc
--- /dev/null
+++ b/package/gluon-core/files/lib/gluon/upgrade/998-commit
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+uci commit
diff --git a/package/gluon-legacy/files/lib/gluon/upgrade/019-legacy-interfaces b/package/gluon-legacy/files/lib/gluon/upgrade/019-legacy-interfaces
index b48e42b875f5b7683129133a7e394ed69a0caba3..691e4ad702c0e040abeb1099c1c0d163013a3616 100755
--- a/package/gluon-legacy/files/lib/gluon/upgrade/019-legacy-interfaces
+++ b/package/gluon-legacy/files/lib/gluon/upgrade/019-legacy-interfaces
@@ -34,7 +34,6 @@ if sysconfig.gluon_version == 'legacy' then
   uci:delete('network', 'wan')
 
   uci:save('network')
-  uci:commit('network')
 end
 
 
diff --git a/package/gluon-legacy/files/lib/gluon/upgrade/210-legacy-wireless b/package/gluon-legacy/files/lib/gluon/upgrade/210-legacy-wireless
index 36da0632adc3b6d104de56eee188ecf90e4a24c4..d8fd172097fa3cfd75e711d95c38d20461d3dc6d 100755
--- a/package/gluon-legacy/files/lib/gluon/upgrade/210-legacy-wireless
+++ b/package/gluon-legacy/files/lib/gluon/upgrade/210-legacy-wireless
@@ -20,5 +20,4 @@ if sysconfig.gluon_version == 'legacy' then
   uci:delete_all('wireless', 'wifi-iface', delete_legacy_iface)
 
   uci:save('wireless')
-  uci:commit('wireless')
 end
diff --git a/package/gluon-legacy/files/lib/gluon/upgrade/290-legacy-setup-mode b/package/gluon-legacy/files/lib/gluon/upgrade/290-legacy-setup-mode
index 0b97e1209f35f4fd6a4220e5509ac3c95cafa0c7..d2a67484438acc692f502ec9e315fbac087a91d3 100755
--- a/package/gluon-legacy/files/lib/gluon/upgrade/290-legacy-setup-mode
+++ b/package/gluon-legacy/files/lib/gluon/upgrade/290-legacy-setup-mode
@@ -12,9 +12,7 @@ if sysconfig.gluon_version == 'legacy' then
     if old == '1' then
       local setup_mode = uci:get_first('gluon-setup-mode', 'setup_mode')
       uci:set('gluon-setup-mode', setup_mode, 'configured', '1')
-
       uci:save('gluon-setup-mode')
-      uci:commit('gluon-setup-mode')
 
       break
     end
diff --git a/package/gluon-legacy/files/lib/gluon/upgrade/290-legacy-simple-tc b/package/gluon-legacy/files/lib/gluon/upgrade/290-legacy-simple-tc
index 566218878941ffd282557f2eda7063bf260cb7b8..652c53c950679f2492150d59e5b0147e59638b43 100755
--- a/package/gluon-legacy/files/lib/gluon/upgrade/290-legacy-simple-tc
+++ b/package/gluon-legacy/files/lib/gluon/upgrade/290-legacy-simple-tc
@@ -21,7 +21,6 @@ if sysconfig.gluon_version == 'legacy' then
       )
 
       uci:save('simple-tc')
-      uci:commit('simple-tc')
 
       break
     end
diff --git a/package/gluon-legacy/files/lib/gluon/upgrade/390-legacy-mesh-vpn-fastd b/package/gluon-legacy/files/lib/gluon/upgrade/390-legacy-mesh-vpn-fastd
index 468a35a6501eaed257e15164f31be1b84d98d689..21f95e07c27fa9bc99ee7704e353eaf1fed596b9 100755
--- a/package/gluon-legacy/files/lib/gluon/upgrade/390-legacy-mesh-vpn-fastd
+++ b/package/gluon-legacy/files/lib/gluon/upgrade/390-legacy-mesh-vpn-fastd
@@ -33,5 +33,4 @@ if sysconfig.gluon_version == 'legacy' then
   end
 
   uci:save('fastd')
-  uci:commit('fastd')
 end
diff --git a/package/gluon-mesh-batman-adv-14/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-14 b/package/gluon-mesh-batman-adv-14/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-14
index 05776c30f755a2ecb6fbdb74b8ae3d9f92705761..30e2682b5b4ae23448eaeb5e39a82ffde29e3d8c 100755
--- a/package/gluon-mesh-batman-adv-14/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-14
+++ b/package/gluon-mesh-batman-adv-14/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-14
@@ -45,4 +45,3 @@ end
 
 
 uci:save('network')
-uci:commit('network')
diff --git a/package/gluon-mesh-batman-adv-15/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-15 b/package/gluon-mesh-batman-adv-15/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-15
index f9f540033c670bf3e469041a4de6d29f95787487..7148d42ce4a8313443225004add1801c6ed5c55a 100755
--- a/package/gluon-mesh-batman-adv-15/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-15
+++ b/package/gluon-mesh-batman-adv-15/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-15
@@ -45,4 +45,3 @@ end
 
 
 uci:save('network')
-uci:commit('network')
diff --git a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan b/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan
index c9084ea67e7a3fce165b1430921fe9518606b7d6..00b1641472741357ee248b59ace36fb1e898e8ac 100755
--- a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan
+++ b/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan
@@ -7,5 +7,4 @@ local uci = require('luci.model.uci').cursor()
 -- fix up duplicate mac addresses (for mesh-on-WAN)
 uci:set('network', 'wan', 'macaddr', util.generate_mac(1, 0))
 uci:save('network')
-uci:commit('network')
 
diff --git a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/310-gluon-mesh-batman-adv-core-mesh b/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/310-gluon-mesh-batman-adv-core-mesh
index 0843e937339b3bdf0c8cbb00e5c0dd7170fa536a..d9999456d89f2d01cbc37d1775eff04c03cec725 100755
--- a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/310-gluon-mesh-batman-adv-core-mesh
+++ b/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/310-gluon-mesh-batman-adv-core-mesh
@@ -24,7 +24,6 @@ uci:section('batman-adv', 'mesh', 'bat0',
 	    }
 )
 uci:save('batman-adv')
-uci:commit('batman-adv')
 
 if not uci:get('network', 'client', 'ifname') then
   uci:add_to_set('network', 'client', 'ifname', 'bat0')
@@ -53,7 +52,6 @@ uci:section('network', 'interface', 'bat0',
 )
 
 uci:save('network')
-uci:commit('network')
 
 
 uci:delete('firewall', 'client')
@@ -77,7 +75,6 @@ uci:section('firewall', 'rule', 'client_dns',
 )
 
 uci:save('firewall')
-uci:commit('firewall')
 
 
 local dnsmasq = uci:get_first('dhcp', 'dnsmasq')
@@ -94,7 +91,6 @@ uci:section('dhcp', 'dhcp', 'client',
 )
 
 uci:save('dhcp')
-uci:commit('dhcp')
 
 
 sysctl.set('net.ipv6.conf.br-client.forwarding', 0)
diff --git a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/320-gluon-mesh-batman-adv-core-wireless b/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/320-gluon-mesh-batman-adv-core-wireless
index 8835c99736308c98dc0bca170d76d545acf3c872..a73912b863dadbe1934bc0e6597fa17579bd3ee7 100755
--- a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/320-gluon-mesh-batman-adv-core-wireless
+++ b/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/320-gluon-mesh-batman-adv-core-wireless
@@ -131,5 +131,3 @@ util.iterate_radios(configure_radio)
 
 uci:save('wireless')
 uci:save('network')
-uci:commit('wireless')
-uci:commit('network')
diff --git a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/330-gluon-mesh-batman-adv-core-mesh-on-wan b/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/330-gluon-mesh-batman-adv-core-mesh-on-wan
index 8db951451796c89811e6a9fe3a48e94b8708c92d..7a964ee28080bd4ebf0c9ad5d793270d30a83e4a 100755
--- a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/330-gluon-mesh-batman-adv-core-mesh-on-wan
+++ b/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/330-gluon-mesh-batman-adv-core-mesh-on-wan
@@ -16,4 +16,3 @@ if not c:get('network', 'mesh_wan') then
 end
 
 c:save('network')
-c:commit('network')
diff --git a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan b/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan
index 8b192adbd9ff4dc91ffa8b8216ce309496678385..27c1935bb66f0e92267e886566076a6e8af6055c 100755
--- a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan
+++ b/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan
@@ -33,5 +33,4 @@ if sysconfig.lan_ifname and not uci:get('network', 'mesh_lan') then
   })
 
   uci:save('network')
-  uci:commit('network')
 end
diff --git a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-core-rssid b/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-core-rssid
index 5ddb4f9003b85dd6562d5b88580dac53930edf4e..10b6717132f9595729c7de42ad70b2e3238b83b9 100755
--- a/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-core-rssid
+++ b/package/gluon-mesh-batman-adv-core/files/lib/gluon/upgrade/350-gluon-mesh-batman-adv-core-rssid
@@ -6,5 +6,4 @@ if uci:get('system', 'rssid_wlan0') then
   uci:set('system', 'rssid_wlan0', 'dev', 'mesh0')
 
   uci:save('system')
-  uci:commit('system')
 end
diff --git a/package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/400-mesh-vpn-fastd b/package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/400-mesh-vpn-fastd
index 316546bc95286e5b374b1b6431d3ba87f5c474b7..902f1ccd25e4e1eb73f56590db76ba14b524e973 100755
--- a/package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/400-mesh-vpn-fastd
+++ b/package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/400-mesh-vpn-fastd
@@ -119,7 +119,6 @@ add_groups('mesh_vpn', site.fastd_mesh_vpn.groups)
 
 
 uci:save('fastd')
-uci:commit('fastd')
 
 
 uci:section('network', 'interface', 'mesh_vpn',
@@ -133,7 +132,6 @@ uci:section('network', 'interface', 'mesh_vpn',
 )
 
 uci:save('network')
-uci:commit('network')
 
 
 uci:section('firewall', 'include', 'mesh_vpn_dns',
@@ -145,4 +143,3 @@ uci:section('firewall', 'include', 'mesh_vpn_dns',
 )
 
 uci:save('firewall')
-uci:commit('firewall')
diff --git a/package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/410-mesh-vpn-fastd-generate-secret b/package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/410-mesh-vpn-fastd-generate-secret
index 68a2fe6763ca3c140452a032fcbf6b7d02853118..e581dea8b77da4e34b9133833557d688f18b9c4e 100755
--- a/package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/410-mesh-vpn-fastd-generate-secret
+++ b/package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/410-mesh-vpn-fastd-generate-secret
@@ -9,5 +9,4 @@ local secret = c:get("fastd", "mesh_vpn", "secret")
 if not secret or not secret:match(("%x"):rep(64)) then
   c:set("fastd", "mesh_vpn", "secret", "generate")
   c:save("fastd")
-  c:commit("fastd")
 end
diff --git a/package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/420-mesh-vpn-fastd-simple-tc b/package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/420-mesh-vpn-fastd-simple-tc
index d4cfcddea81646be3498d1b6a522b676281c8692..3c3e10a450b33092b6dbd10f3776ae6281c05cba 100755
--- a/package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/420-mesh-vpn-fastd-simple-tc
+++ b/package/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/420-mesh-vpn-fastd-simple-tc
@@ -28,5 +28,4 @@ if not uci:get('simple-tc', 'mesh_vpn') then
 
   uci:section('simple-tc', 'interface', 'mesh_vpn', config)
   uci:save('simple-tc')
-  uci:commit('simple-tc')
 end
diff --git a/package/gluon-neighbour-info/files/lib/gluon/upgrade/400-neighbour-info-firewall b/package/gluon-neighbour-info/files/lib/gluon/upgrade/400-neighbour-info-firewall
index a6d7f490896cd7c800ce918170d205c148410f91..373f166a5211a04255e8674d8ca9023687ecdf7a 100755
--- a/package/gluon-neighbour-info/files/lib/gluon/upgrade/400-neighbour-info-firewall
+++ b/package/gluon-neighbour-info/files/lib/gluon/upgrade/400-neighbour-info-firewall
@@ -17,4 +17,3 @@ uci:section('firewall', 'rule', 'wan_respondd_reply',
 )
 
 uci:save('firewall')
-uci:commit('firewall')
diff --git a/package/gluon-next-node/files/lib/gluon/upgrade/400-next-node b/package/gluon-next-node/files/lib/gluon/upgrade/400-next-node
index 0ff959fe730ce6b17fed3468c557a2ee2a41267a..79cc036903ef1e68cca88d8d21239eb69fa4bc29 100755
--- a/package/gluon-next-node/files/lib/gluon/upgrade/400-next-node
+++ b/package/gluon-next-node/files/lib/gluon/upgrade/400-next-node
@@ -39,7 +39,6 @@ c:section('network', 'route6', 'local_node_route6',
 )
 
 c:save('network')
-c:commit('network')
 
 c:delete('firewall', 'local_node')
 c:section('firewall', 'zone', 'local_node',
@@ -52,4 +51,3 @@ c:section('firewall', 'zone', 'local_node',
 	  }
 )
 c:save('firewall')
-c:commit('firewall')
diff --git a/package/gluon-node-info/files/lib/gluon/upgrade/500-node-info-system b/package/gluon-node-info/files/lib/gluon/upgrade/500-node-info-system
index a17b94617b45c78028720a35b50484b8de87340d..a70eb28253437e84389333e35bf20babd2f5a884 100755
--- a/package/gluon-node-info/files/lib/gluon/upgrade/500-node-info-system
+++ b/package/gluon-node-info/files/lib/gluon/upgrade/500-node-info-system
@@ -7,5 +7,4 @@ local config = 'gluon-node-info'
 if not uci:get_first(config, 'system') then
   uci:section(config, 'system')
   uci:save(config)
-  uci:commit(config)
 end
diff --git a/package/gluon-node-info/files/lib/gluon/upgrade/510-node-info-role b/package/gluon-node-info/files/lib/gluon/upgrade/510-node-info-role
index 6e54a23463627dd173b6932e243aeaa94c7f64b8..06d42f8e268fe0c09ba4299c8c340c01a9a210b9 100755
--- a/package/gluon-node-info/files/lib/gluon/upgrade/510-node-info-role
+++ b/package/gluon-node-info/files/lib/gluon/upgrade/510-node-info-role
@@ -15,5 +15,4 @@ end
 if not role then
   uci:set(config, uci:get_first(config, 'system'), 'role', default_role)
   uci:save(config)
-  uci:commit(config)
 end
diff --git a/package/gluon-respondd/files/lib/gluon/upgrade/400-respondd-firewall b/package/gluon-respondd/files/lib/gluon/upgrade/400-respondd-firewall
index c507683038dab0924874131137592f35e284d260..a78cfb3d3a8d25f088619dee0debe7debaba7480 100755
--- a/package/gluon-respondd/files/lib/gluon/upgrade/400-respondd-firewall
+++ b/package/gluon-respondd/files/lib/gluon/upgrade/400-respondd-firewall
@@ -29,4 +29,3 @@ uci:section('firewall', 'rule', 'client_respondd',
 )
 
 uci:save('firewall')
-uci:commit('firewall')
diff --git a/package/gluon-setup-mode/files/lib/gluon/upgrade/300-setup-mode b/package/gluon-setup-mode/files/lib/gluon/upgrade/300-setup-mode
index ae59c7aaa23bdcb08d583ae8a2f337531951e51b..481a4fa0ee26c9029dc42e87e39f206d138ab6a9 100755
--- a/package/gluon-setup-mode/files/lib/gluon/upgrade/300-setup-mode
+++ b/package/gluon-setup-mode/files/lib/gluon/upgrade/300-setup-mode
@@ -11,6 +11,5 @@ if site.setup_mode
      local name = c:get_first("gluon-setup-mode", "setup_mode")
      c:set("gluon-setup-mode", name, "configured", 1)
      c:save('gluon-setup-mode')
-     c:commit('gluon-setup-mode')
 end
 
diff --git a/package/gluon-setup-mode/files/lib/gluon/upgrade/310-setup-mode-migrate b/package/gluon-setup-mode/files/lib/gluon/upgrade/310-setup-mode-migrate
index 9d3b9b0aacdb1d8d9bf37153caa87ec58818bd1f..3b5165c4479515ab37f57821702708697532bc6e 100755
--- a/package/gluon-setup-mode/files/lib/gluon/upgrade/310-setup-mode-migrate
+++ b/package/gluon-setup-mode/files/lib/gluon/upgrade/310-setup-mode-migrate
@@ -12,7 +12,6 @@ if old == '1' then
 	c:set('gluon-setup-mode', setup_mode, 'configured', '1')
 
 	c:save('gluon-setup-mode')
-	c:commit('gluon-setup-mode')
 end
 
 os.remove('/etc/config/gluon-config-mode')
diff --git a/package/gluon-status-page-api/files/lib/gluon/upgrade/500-status-page-api b/package/gluon-status-page-api/files/lib/gluon/upgrade/500-status-page-api
index a5000012d11a1d0b652d678838183f1f44fe733d..a11fac9b486d4fe450999dcd7ec72f39a5e843d5 100755
--- a/package/gluon-status-page-api/files/lib/gluon/upgrade/500-status-page-api
+++ b/package/gluon-status-page-api/files/lib/gluon/upgrade/500-status-page-api
@@ -10,6 +10,4 @@ uci batch <<-EOF
 	set uhttpd.main.home=/lib/gluon/status-page/www
 
 	set uhttpd.main.max_requests=32
-
-	commit uhttpd
 EOF