diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap
index 22b6b7a..75f8195 100755
--- a/.config/yadm/bootstrap
+++ b/.config/yadm/bootstrap
@@ -10,7 +10,7 @@ set keyboardconf \
         Option "XkbLayout" "fr,fr,us"
         Option "XkbModel" "pc104"
         Option "XkbVariant" "bepo_afnor,,"
-        Option "XkbOptions" "grp:menu_toggle"
+        Option "XkbOptions" "grp:menu_toggle,caps:ctrl_modifier"
 EndSection'
 
 printf "\n# Set keyboard layout #########################################################\n\n"
diff --git a/org/config/awesome.org b/org/config/awesome.org
index dc63cb4..f6e7d9c 100644
--- a/org/config/awesome.org
+++ b/org/config/awesome.org
@@ -1640,17 +1640,16 @@
   create some  autolaunch. All of  my autolaunched  apps are launch  through the
   shell.
   #+NAME: autostart-table
-  | Command                                             | What it is for                                 |
-  |-----------------------------------------------------+------------------------------------------------|
-  | pkill xfce-polkit; /usr/lib/xfce-polkit/xfce-polkit | Launch or relaunch Polkit                      |
-  | pkill picom; compton --experimental-backends        | Launch or relaunch Picom                       |
-  | xss-lock -- lock                                    | Enable lockscreen after a blank screen         |
-  | nm-applet                                           | Launch NetworkManager applet                   |
-  | numlockx on                                         | Enable numlock                                 |
-  | mpc stop                                            | Stop music                                     |
-  | mpd_discord_richpresence --no-idle --fork           | Launch MPD rich presence for Discord           |
-  | sleep 3 && emacsclient -c -e \"(delete-frame)\"     | Launch blank EmacsClient                       |
-  | setxkbmap -option caps:ctrl_modifier                | Caps lock is evil and takes the Ctrl key space |
+  | Command                                             | What it is for                         |
+  |-----------------------------------------------------+----------------------------------------|
+  | pkill xfce-polkit; /usr/lib/xfce-polkit/xfce-polkit | Launch or relaunch Polkit              |
+  | pkill picom; compton --experimental-backends        | Launch or relaunch Picom               |
+  | xss-lock -- lock                                    | Enable lockscreen after a blank screen |
+  | nm-applet                                           | Launch NetworkManager applet           |
+  | numlockx on                                         | Enable numlock                         |
+  | mpc stop                                            | Stop music                             |
+  | mpd_discord_richpresence --no-idle --fork           | Launch MPD rich presence for Discord   |
+  | sleep 3 && emacsclient -c -e \"(delete-frame)\"     | Launch blank EmacsClient               |
 
   #+NAME: autostart
   #+BEGIN_SRC emacs-lisp :tangle no :exports none :cache yes :var apps=autostart-table
@@ -1661,7 +1660,7 @@
                "\n")
   #+END_SRC
 
-  #+RESULTS[34ee2754183559bee9c86a527d7bcf961a0e93ec]: autostart
+  #+RESULTS[d6e417272b634c3a67185926e08725116dc98810]: autostart
   : awful.spawn.with_shell("pkill xfce-polkit; /usr/lib/xfce-polkit/xfce-polkit")
   : awful.spawn.with_shell("pkill picom; compton --experimental-backends")
   : awful.spawn.with_shell("xss-lock -- lock")
@@ -1670,7 +1669,6 @@
   : awful.spawn.with_shell("mpc stop")
   : awful.spawn.with_shell("mpd_discord_richpresence --no-idle --fork")
   : awful.spawn.with_shell("sleep 3 && emacsclient -c -e \"(delete-frame)\"")
-  : awful.spawn.with_shell("setxkbmap -option caps:ctrl_modifier")
 
   Each of the command gets called with the call of ~awful.spawn.with_shell()~,
   as you can see below.
diff --git a/org/config/installation.org b/org/config/installation.org
index 852e8ac..e499719 100644
--- a/org/config/installation.org
+++ b/org/config/installation.org
@@ -181,7 +181,7 @@
              Option "XkbLayout" "fr,fr,us"
              Option "XkbModel" "pc104"
              Option "XkbVariant" "bepo_afnor,,"
-             Option "XkbOptions" "grp:menu_toggle"
+             Option "XkbOptions" "grp:menu_toggle,caps:ctrl_modifier"
      EndSection'
    #+END_SRC
    So, let’s set it as our keyboard configuration.