diff --git a/.config/sway/config.d/default b/.config/sway/config.d/default
index c83e462..b2272d6 100644
--- a/.config/sway/config.d/default
+++ b/.config/sway/config.d/default
@@ -79,53 +79,34 @@ set $lock swaylock -C ~/.config/swaylock/config
 #
 # Workspaces:
 #
-  # Switch to workspace
-    bindcode $mod+10 workspace number 1
-    bindcode $mod+11 workspace number 2
-    bindcode $mod+12 workspace number 3
-    bindcode $mod+13 workspace number 4
-    bindcode $mod+14 workspace number 5
-    bindcode $mod+15 workspace number 6
-    bindcode $mod+16 workspace number 7
-    bindcode $mod+17 workspace number 8
-    bindcode $mod+18 workspace number 9
-    bindcode $mod+19 workspace number 10
-
-    # Move focused container to workspace
-    bindcode $mod+Shift+10 move container to workspace number 1
-    bindcode $mod+Shift+11 move container to workspace number 2
-    bindcode $mod+Shift+12 move container to workspace number 3
-    bindcode $mod+Shift+13 move container to workspace number 4
-    bindcode $mod+Shift+14 move container to workspace number 5
-    bindcode $mod+Shift+15 move container to workspace number 6
-    bindcode $mod+Shift+16 move container to workspace number 7
-    bindcode $mod+Shift+17 move container to workspace number 8
-    bindcode $mod+Shift+18 move container to workspace number 9
-    bindcode $mod+Shift+19 move container to workspace number 10
-    # Switch to workspace
-    # Normal us keyboard works, on other type of keyboard binsym dont work as expected.
-    #
-    # bindsym $mod+1 workspace number 1
-   # bindsym $mod+2 workspace number 2
-   # bindsym $mod+3 workspace number 3
-   # bindsym $mod+4 workspace number 4
-   # bindsym $mod+5 workspace number 5
-   # bindsym $mod+6 workspace number 6
-   # bindsym $mod+7 workspace number 7
-   # bindsym $mod+8 workspace number 8
-   # bindsym $mod+9 workspace number 9
-   # bindsym $mod+0 workspace number 10
-   # # Move focused container to workspace
-   # bindsym $mod+Shift+1 move container to workspace number 1
-   # bindsym $mod+Shift+2 move container to workspace number 2
-   # bindsym $mod+Shift+3 move container to workspace number 3
-   # bindsym $mod+Shift+4 move container to workspace number 4
-   # bindsym $mod+Shift+5 move container to workspace number 5
-   # bindsym $mod+Shift+6 move container to workspace number 6
-   # bindsym $mod+Shift+7 move container to workspace number 7
-   # bindsym $mod+Shift+8 move container to workspace number 8
-   # bindsym $mod+Shift+9 move container to workspace number 9
-   # bindsym $mod+Shift+0 move container to workspace number 10
+    # Workspace bindings are using bindcode instead of bindsym for better Azerty compatibility.
+    # https://github.com/EndeavourOS-Community-Editions/sway/pull/81
+    # Use wev to find keycodes for setting up other bindings this way.
+    
+    bindcode {
+        # Switch to workspace
+        $mod+10 workspace number 1
+        $mod+11 workspace number 2
+        $mod+12 workspace number 3
+        $mod+13 workspace number 4
+        $mod+14 workspace number 5
+        $mod+15 workspace number 6
+        $mod+16 workspace number 7
+        $mod+17 workspace number 8
+        $mod+18 workspace number 9
+        $mod+19 workspace number 10
+        # Move focused container to workspace
+        $mod+Shift+10 move container to workspace number 1
+        $mod+Shift+11 move container to workspace number 2
+        $mod+Shift+12 move container to workspace number 3
+        $mod+Shift+13 move container to workspace number 4
+        $mod+Shift+14 move container to workspace number 5
+        $mod+Shift+15 move container to workspace number 6
+        $mod+Shift+16 move container to workspace number 7
+        $mod+Shift+17 move container to workspace number 8
+        $mod+Shift+18 move container to workspace number 9
+        $mod+Shift+19 move container to workspace number 10
+    }
     # Note: workspaces can have any name you want, not just numbers.
     # We just use 1-10 as the default.