diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 42cf82b..256e96b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,10 @@ include:
  - remote: 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-definitions.yml'
  - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/34039cd573a2df832d465bc9e4c5f543571f5241/templates/ci-fairy.yml'
 
+variables:
+  GIT_SUBMODULE_STRATEGY: normal
+  GIT_SUBMODULE_DEPTH: 1
+
 stages:
  - build
  - test
diff --git a/meson.build b/meson.build
index 0125d00..0d018cb 100644
--- a/meson.build
+++ b/meson.build
@@ -20,7 +20,7 @@ if get_option('daemon')
                                 'gtk_doc=false',
                                 'tests=false',
                               ])
-  gmobile        = gmobile_subp.get_variable('libgmobile_dep')
+  gmobile        = gmobile_subp.get_variable('gmobile_dep')
   gsound         = dependency('gsound')
   gudev          = dependency('gudev-1.0', version: '>=232')
   json_glib      = dependency('json-glib-1.0')
diff --git a/src/fbd-feedback-manager.c b/src/fbd-feedback-manager.c
index e0788cf..b6681e2 100644
--- a/src/fbd-feedback-manager.c
+++ b/src/fbd-feedback-manager.c
@@ -557,7 +557,7 @@ fbd_feedback_manager_load_theme (FbdFeedbackManager *self)
   g_autofree char *theme_name = NULL;
   const char *theme_file = g_getenv (FEEDBACKD_THEME_VAR);
 
-  compatibles = gm_devicetree_get_compatibles (NULL, &err);
+  compatibles = gm_device_tree_get_compatibles (NULL, &err);
   if (compatibles == NULL && err) {
     g_debug ("Failed to get compatibles: %s", err->message);
     g_clear_error (&err);
diff --git a/subprojects/gmobile b/subprojects/gmobile
index 1039e78..d483537 160000
--- a/subprojects/gmobile
+++ b/subprojects/gmobile
@@ -1 +1 @@
-Subproject commit 1039e7808195d4de367ce2718481641ca8af2427
+Subproject commit d483537aee4778b114ce5d50c4c8a9f8d58337ed