diff --git a/package/gluon-config-mode-core/files/lib/gluon/web/view/gluon/config-mode/reboot.html b/package/gluon-config-mode-core/files/lib/gluon/web/view/config-mode/reboot.html
similarity index 100%
rename from package/gluon-config-mode-core/files/lib/gluon/web/view/gluon/config-mode/reboot.html
rename to package/gluon-config-mode-core/files/lib/gluon/web/view/config-mode/reboot.html
diff --git a/package/gluon-config-mode-core/files/lib/gluon/web/view/gluon/config-mode/welcome.html b/package/gluon-config-mode-core/files/lib/gluon/web/view/config-mode/welcome.html
similarity index 100%
rename from package/gluon-config-mode-core/files/lib/gluon/web/view/gluon/config-mode/welcome.html
rename to package/gluon-config-mode-core/files/lib/gluon/web/view/config-mode/welcome.html
diff --git a/package/gluon-config-mode-core/luasrc/lib/gluon/web/model/gluon-config-mode/wizard.lua b/package/gluon-config-mode-core/luasrc/lib/gluon/web/model/gluon-config-mode/wizard.lua
index 888a7615..2afceb31 100644
--- a/package/gluon-config-mode-core/luasrc/lib/gluon/web/model/gluon-config-mode/wizard.lua
+++ b/package/gluon-config-mode-core/luasrc/lib/gluon/web/model/gluon-config-mode/wizard.lua
@@ -25,7 +25,7 @@ f.submit = translate('Save & restart')
 f.reset = false
 
 local s = f:section(Section)
-s.template = "gluon/config-mode/welcome"
+s.template = "config-mode/welcome"
 s.package = "gluon-config-mode-core"
 
 local commit = {'gluon-setup-mode'}
@@ -57,7 +57,7 @@ function f:write()
 		r()
 	end
 
-	f.template = "gluon/config-mode/reboot"
+	f.template = "config-mode/reboot"
 	f.package = "gluon-config-mode-core"
 	f.hidenav = true