diff --git a/roles/base/tasks/system.yml b/roles/base/tasks/system.yml
index 298f213..f81abe3 100644
--- a/roles/base/tasks/system.yml
+++ b/roles/base/tasks/system.yml
@@ -10,17 +10,3 @@
   with_items:
     - '^auto eth0'
     - '^iface eth0'
-
-- name: Correcting keyboard layout
-  copy:
-    src: org.freedesktop.ibus.general.gschema.override
-    dest: /usr/share/glib-2.0/schemas/org.freedesktop.ibus.general.gschema.override
-  tags:
-    - keyboard-layout
-
-- name: Recompiling glib2 schemas
-  shell: glib-compile-schemas --strict /usr/share/glib-2.0/schemas/
-  sudo: yes
-  tags:
-    - keyboard-layout
-
diff --git a/roles/base/files/org.freedesktop.ibus.general.gschema.override b/roles/domain/files/org.freedesktop.ibus.general.gschema.override
similarity index 100%
rename from roles/base/files/org.freedesktop.ibus.general.gschema.override
rename to roles/domain/files/org.freedesktop.ibus.general.gschema.override
diff --git a/roles/domain/tasks/glib2.yml b/roles/domain/tasks/glib2.yml
index 38ea248..62b9521 100644
--- a/roles/domain/tasks/glib2.yml
+++ b/roles/domain/tasks/glib2.yml
@@ -15,7 +15,14 @@
     backup: yes
   register: cfg_glib_mounted
 
+- name: Fixing keyboard layout
+  copy:
+    src: org.freedesktop.ibus.general.gschema.override
+    dest: /usr/share/glib-2.0/schemas/org.freedesktop.ibus.general.schema.override
+    backup: yes
+  register: cfg_keyb_layout
+
 - name: Recompiling glib2 schemas
   shell: glib-compile-schemas --strict /usr/share/glib-2.0/schemas/
   sudo: yes
-  when: cfg_glib_users|changed or cfg_glib_mounted|changed
+  when: cfg_glib_users|changed or cfg_glib_mounted|changed or cfg_keyb_layout|changed