diff --git a/.gitignore b/.gitignore
index 505f5f7..0a1c927 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ debian/libfeedback-0.0-0/
 debian/libfeedback-dev.substvars
 debian/libfeedback-dev/
 debian/tmp/
+subprojects/gmobile/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 256e96b..42cf82b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,10 +2,6 @@ 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/.gitmodules b/.gitmodules
index fae72b7..fe9e9c5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "subprojects/gmobile"]
 	path = subprojects/gmobile
-	url = https://gitlab.gnome.org/guidog/gmobile.git
+	url = https://gitlab.gnome.org/World/Phosh/gmobile.git
diff --git a/subprojects/gmobile b/subprojects/gmobile
deleted file mode 160000
index d483537..0000000
--- a/subprojects/gmobile
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d483537aee4778b114ce5d50c4c8a9f8d58337ed
diff --git a/subprojects/gmobile.wrap b/subprojects/gmobile.wrap
new file mode 100644
index 0000000..85901c3
--- /dev/null
+++ b/subprojects/gmobile.wrap
@@ -0,0 +1,5 @@
+[wrap-git]
+directory=gmobile
+url=https://gitlab.gnome.org/World/Phosh/gmobile.git
+revision=v0.0.4
+depth=1