diff --git a/roles/sway/templates/by_host/osz/config.j2 b/roles/sway/templates/by_host/osz/config.j2
index bbaf573..c7b6638 100644
--- a/roles/sway/templates/by_host/osz/config.j2
+++ b/roles/sway/templates/by_host/osz/config.j2
@@ -26,8 +26,8 @@ workspace $tag1 output $screen
 workspace $tag2 output $screen
 workspace $tag3 output $screen
 workspace $tag4 output $laptop
-workspace $tag5 output $laptop
-workspace $tag6 output $screen
+workspace $tag5 output $screen
+workspace $tag6 output $laptop
 workspace $tag7 output $laptop
 workspace $tag8 output $laptop
 workspace $tag9 output $laptop
diff --git a/roles/sway/templates/config.j2 b/roles/sway/templates/config.j2
index 637343b..0aca19f 100644
--- a/roles/sway/templates/config.j2
+++ b/roles/sway/templates/config.j2
@@ -99,10 +99,10 @@ workspace_auto_back_and_forth yes
 # set workspace names
 set $tag1 "1:"
 set $tag2 "2:"
-set $tag3 "3:"
+set $tag3 "3:"
 set $tag4 "4:"
-set $tag5 "5:"
-set $tag6 "6:"
+set $tag5 "5:"
+set $tag6 "6:"
 set $tag7 "7:"
 set $tag8 "8:"
 set $tag9 "9:"
@@ -166,15 +166,15 @@ for_window [title="Images de Variety"] floating enable, border pixel 1, move lef
 for_window [app_id="zenity"] floating enable
 
 # assign and focus xwayland
-assign [class="Spotify"] $tag5
+assign [class="Spotify"] $tag6
 for_window [class="Spotify"] focus
-assign [class="code-oss"] $tag6
+assign [class="code-oss"] $tag8
 for_window [class="code-oss"] focus
 assign [class="gimp"] $tag8
 for_window [class="gimp"] focus
 
 # assign and focus wayland
-assign [app_id="evolution"] $tag6
+assign [app_id="evolution"] $tag3
 for_window [app_id="evolution"] focus
 assign [app_id="virt-manager"] $tag8
 for_window [app_id="virt-manager"] focus
@@ -182,8 +182,6 @@ assign [app_id="zim"] $tag8
 for_window [app_id="zim"] focus
 assign [app_id="transmission-gtk"] $tag9
 for_window [app_id="transmission-gtk"] focus
-assign [app_id="connman-gtk"] $tag10
-for_window [app_id="connman-gtk"] focus
 assign [app_id="pavucontrol"] $tag10
 for_window [app_id="pavucontrol"] focus