diff --git a/roles/debian/files/keyboard b/roles/debian/files/keyboard
index 2297ce4..c0ce05a 100644
--- a/roles/debian/files/keyboard
+++ b/roles/debian/files/keyboard
@@ -6,6 +6,6 @@
 XKBMODEL="pc105"
 XKBLAYOUT="us,ca"
 XKBVARIANT=",multix"
-XKBOPTIONS="compose:menu,grp:lctrl_lshift_toggle"
+XKBOPTIONS="compose:menu,grp:grp:alt_caps_toggle"
 
 BACKSPACE="guess"
diff --git a/roles/debian/tasks/keyboard.yml b/roles/debian/tasks/keyboard.yml
index 6760207..2203b1f 100644
--- a/roles/debian/tasks/keyboard.yml
+++ b/roles/debian/tasks/keyboard.yml
@@ -4,10 +4,3 @@
   copy:
     src: keyboard
     dest: /etc/default/keyboard
-- name: Enable US layout for the console
-  become: true
-  lineinfile:
-    path: /etc/vconsole.conf
-    regexp: KEYMAP=.*
-    line: KEYMAP=us
-    create: yes