diff --git a/firmware/addons/nuki-bridge.yaml b/firmware/addons/nuki-bridge.yaml
index 74104ef..eda5bc6 100644
--- a/firmware/addons/nuki-bridge.yaml
+++ b/firmware/addons/nuki-bridge.yaml
@@ -154,24 +154,24 @@ lock:
       name: "Nuki Timezone: Offset"
       disabled_by_default: true
       web_server:
-        sorting_group_id: sorting_group_nuki_bridge_settings
-        sorting_weight: -31
+        sorting_group_id: sorting_group_nuki_settings
+        sorting_weight: 5
 
     latitude:
       id: nuki_latitude
       name: "Nuki Latitude"
       disabled_by_default: true
       web_server:
-        sorting_group_id: sorting_group_nuki_bridge_settings
-        sorting_weight: -31
+        sorting_group_id: sorting_group_nuki_settings
+        sorting_weight: 6
 
     longitude:
       id: nuki_longitude
       name: "Nuki Longitude"
       disabled_by_default: true
       web_server:
-        sorting_group_id: sorting_group_nuki_bridge_settings
-        sorting_weight: -31
+        sorting_group_id: sorting_group_nuki_settings
+        sorting_weight: 7
 
     night_mode_enabled:
       id: nuki_night_mode
@@ -179,7 +179,7 @@ lock:
       disabled_by_default: true
       web_server:
         sorting_group_id: sorting_group_nuki_settings
-        sorting_weight: -10
+        sorting_weight: 8
 
     night_mode_auto_lock_enabled:
       id: nuki_night_mode_auto_lock_enabled
@@ -275,7 +275,7 @@ lock:
       disabled_by_default: true
       web_server:
         sorting_group_id: sorting_group_nuki_settings
-        sorting_weight: 3
+        sorting_weight: 4
 
     advertising_mode:
       id: nuki_advertising_mode
@@ -283,7 +283,7 @@ lock:
       disabled_by_default: true
       web_server:
         sorting_group_id: sorting_group_nuki_settings
-        sorting_weight: 3
+        sorting_weight: 9
 
     pairing_mode:
       id: nuki_pairing_mode