diff --git a/.gitmodules b/.gitmodules
index 35e9a63..6fd7ee0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,3 +28,15 @@
 [submodule "roles/python3"]
 	path = roles/python3
 	url = https://codeberg.org/ansible/python3.git
+[submodule "roles/boot-grub"]
+	path = roles/boot-grub
+	url = https://codeberg.org/ansible/boot-grub.git
+[submodule "roles/qbittorrent"]
+	path = roles/qbittorrent
+	url = https://codeberg.org/ansible/qbittorrent.git
+[submodule "roles/flatpak-remote"]
+	path = roles/flatpak-remote
+	url = https://codeberg.org/ansible/flatpak-remote.git
+[submodule "roles/fonts"]
+	path = roles/fonts
+	url = https://codeberg.org/ansible/fonts.git
diff --git a/local.yml b/local.yml
index 1143021..c7779c3 100644
--- a/local.yml
+++ b/local.yml
@@ -36,15 +36,15 @@
     - { role: desktop-environment,    become: true, tags: [ desktop-environment ] }
     # https://codeberg.org/ansible/i3wm
     - { role: i3wm,                   become: true, tags: [ i3wm ] }
-    ## configuration, settings, profiles
-    # dotkeys requires at least one existing provisioned desktop, so not suitable in this context
-    # - { role: dotkeys,                              tags: [ dotkeys ] }
-    # hid is not among public roles
-    # - { role: hid,                                  tags: [ hid ] }
-    # - { role: eduprint-uu,                          tags: [ eduprint-uu ] }
-    # - { role: eduroam-uu,                           tags: [ eduroam-uu ] }
+    # https://codeberg.org/ansible/boot-grub
+    - { role: boot-grub,              become: true, tags: [ boot-grub ] }
+    # https://codeberg.org/ansible/flatpak-remote
+    - { role: flatpak-remote,         become: true, tags: [ flatpak-remote ] }
+    # https://codeberg.org/ansible/fonts
+    - { role: fonts,                  become: true, tags: [ fonts ] }
     #### software
-    # - { role: qbittorrent,            become: true, tags: [ qbittorrent ] }
+    # https://codeberg.org/ansible/qbittorrent
+    - { role: qbittorrent,            become: true, tags: [ qbittorrent ] }
 
   post_tasks:
     - name: Log the current commit of '{{ ansible_play_name }}' playbook
@@ -70,10 +70,6 @@
       changed_when: true
       tags: always
 
-
-#     - { role: boot-grub,              become: true, tags: [ boot-grub ] }
-#     - { role: flatpak-remote,         become: true, tags: [ flatpak-remote ] }
-#     - { role: fonts,                  become: true, tags: [ fonts ] }
 #     - { role: cups,                   become: true, tags: [ cups ] }
 #     - { role: pulseaudio,             become: true, tags: [ pulseaudio ] }
 #     - { role: samba,                  become: true, tags: [ samba ] }
diff --git a/roles/boot-grub b/roles/boot-grub
new file mode 160000
index 0000000..97281f2
--- /dev/null
+++ b/roles/boot-grub
@@ -0,0 +1 @@
+Subproject commit 97281f24aeb30c46cdadc8e29a100a801f98efb2
diff --git a/roles/flatpak-remote b/roles/flatpak-remote
new file mode 160000
index 0000000..597b221
--- /dev/null
+++ b/roles/flatpak-remote
@@ -0,0 +1 @@
+Subproject commit 597b221aeea922d5190a360480298efa118f1a2f
diff --git a/roles/fonts b/roles/fonts
new file mode 160000
index 0000000..57e51b1
--- /dev/null
+++ b/roles/fonts
@@ -0,0 +1 @@
+Subproject commit 57e51b1d5f785a8aab7872246705f445b5d60642
diff --git a/roles/qbittorrent b/roles/qbittorrent
new file mode 160000
index 0000000..b020442
--- /dev/null
+++ b/roles/qbittorrent
@@ -0,0 +1 @@
+Subproject commit b020442470e44df8bc93374d241b57b97ca06960