diff --git a/gui-wm/phosh/Manifest b/gui-wm/phosh/Manifest
index e338fc6..295e21e 100644
--- a/gui-wm/phosh/Manifest
+++ b/gui-wm/phosh/Manifest
@@ -1,4 +1,6 @@
 DIST gmobile-6504fa124438b79a2ad5687ac3ebef6d7a2c0823.tar.gz 21848 BLAKE2B 6a96dd1364e10edc58f30866e967f03957c12e026dac0ce0121647f21a068fb6281c7cf29243336ffd6aa8a52cc22b610c4a1b7fcb3c48d7382283a6926715d4 SHA512 89a496caeba369690c2e91f997a9aeff7379150683382e78df919594f1793aef50478f59fba0985f807d7becca441f8b0653909c8e9f48fcddac1a8d25c6b731
+DIST gmobile-d483537aee4778b114ce5d50c4c8a9f8d58337ed.tar.gz 22257 BLAKE2B b9b884fe58e35ae6f08a3f53734deb8450116dae9bf4e698d793355bb1d3a7ddcd3d519bbb7eb3757e5a35833c5ec2a742a2ba3a6c4e2725864e8d78e17215c3 SHA512 abb6b06c5778bc225abedf8faf24980359255c345be794e59c4da63c80098c26dbd32cf19dc2969fe6555b8748784dfa51fe5399f12892f96ae14fee9c75fa9a
 DIST libcall-ui-7e2f9e2db6515fb9c4650010c2a9ecb9796957e3.tar.gz 165759 BLAKE2B c9eaa0c64c896caf774550dc022c454f7984628af0b8f485259c8b6396d3b102465b75509b17b1a9524d8082fb135468f52c03ab8bed4693b8d06466f858a889 SHA512 d033b9e19bfe5eff168b9673dbaf0855089fa5008d8ab838974315beb4ec17b67fda6a6ea5eee73f6ff106774b587894aadc1a1e1fd6fbfbd4c3b685ba3b967f
 DIST libgnome-volume-control-ae1a34aafce7026b8c0f65a43c9192d756fe1057.tar.gz 45164 BLAKE2B c6807f855e7d4f45b58c7776cd497077b4adf8d577f9af014a8631a054c47374dfe5caa5652be208c6e566bfb8af70a0bb5e164f345b7612cb8786039625a191 SHA512 723334bff55927363dab47ef22c71dcaf94263fe76e49c40f1cbfbd5f86383e68fd4bf2182eb5777dda8e2ede4ee4710e1a7ab1379d3ca40d68f68ff30c62e21
+DIST phosh-v0.24.0.tar.gz 849113 BLAKE2B 70826500bd36c7544a9478200711e4b76aefcee5be129d0c4248d2d9bc77b47dcc347c96e12fd14bf2a12cd0171cfd74f3f52f4bfefd5b4b30ad2de853c2105f SHA512 ad4872903b9bf10b9a5230e2394ffcbf2df1fa1313459627391c672e57c37e52cf3c27c9c6cdda2c68cfb45fef2ce618be042d675daa633051e3514103cd1594
 DIST phosh-v0.25.0.tar.gz 866935 BLAKE2B cd0549db6eebb96d5646a6e0f6aa0793c7b878649324f42ea92310d828d025f084523e30da5af55f1c376e4357878610596befc20adb5254112d308c631d3b95 SHA512 5547fc89920ed55b8b9c59a10df3dc352652517406640149185220f22039b786b974942a5faa3bae7d5b98d994f1906c0ab4b92eab51466942899d559760f155
diff --git a/gui-wm/phosh/phosh-0.24.0.ebuild b/gui-wm/phosh/phosh-0.24.0.ebuild
new file mode 100644
index 0000000..29efa29
--- /dev/null
+++ b/gui-wm/phosh/phosh-0.24.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop gnome2-utils meson pam readme.gentoo-r1 systemd xdg
+
+MY_P="${PN}-v${PV}"
+LVC_COMMIT="ae1a34aafce7026b8c0f65a43c9192d756fe1057"
+LCU_COMMIT="7e2f9e2db6515fb9c4650010c2a9ecb9796957e3"
+GMO_COMMIT="6504fa124438b79a2ad5687ac3ebef6d7a2c0823"
+
+DESCRIPTION="A pure Wayland shell prototype for GNOME on mobile devices"
+HOMEPAGE="https://gitlab.gnome.org/World/Phosh/phosh/"
+SRC_URI="
+	https://gitlab.gnome.org/World/Phosh/phosh/-/archive/v${PV}/${MY_P}.tar.gz
+	https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/${LVC_COMMIT}/libgnome-volume-control-${LVC_COMMIT}.tar.gz
+	https://gitlab.gnome.org/World/Phosh/libcall-ui/-/archive/${LCU_COMMIT}/libcall-ui-${LCU_COMMIT}.tar.gz
+	https://gitlab.gnome.org/guidog/gmobile/-/archive/${GMO_COMMIT}/gmobile-${GMO_COMMIT}.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+KEYWORDS="~amd64 ~arm64"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+systemd"
+
+DEPEND="
+	app-crypt/gcr
+	dev-libs/feedbackd
+	media-sound/pulseaudio
+	>=gui-libs/libhandy-1.1.90
+	net-misc/networkmanager
+	gnome-base/gnome-control-center
+	gnome-base/gnome-desktop
+	gnome-base/gnome-session
+	x11-themes/gnome-backgrounds
+	gnome-base/gnome-keyring
+	gnome-base/gnome-shell
+	x11-wm/phoc
+	sys-apps/systemd
+	sys-power/upower
+	app-misc/geoclue
+        net-libs/libnma
+        media-sound/callaudiod
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-util/ctags
+	dev-util/meson
+"
+
+src_prepare() {
+	default
+	rm -r "${S}"/subprojects/gvc || die
+	mv "${WORKDIR}"/libgnome-volume-control-"${LVC_COMMIT}" "${S}"/subprojects/gvc || die
+	rm -r "${S}"/subprojects/libcall-ui || die
+	mv "${WORKDIR}"/libcall-ui-"${LCU_COMMIT}" "${S}"/subprojects/libcall-ui || die
+	rm -r "${S}"/subprojects/gmobile || die
+	mv "${WORKDIR}"/gmobile-"${GMO_COMMIT}" "${S}"/subprojects/gmobile || die
+	
+	#Phosh patches
+	eapply "${FILESDIR}"/0001-system-prompt-allow-blank-passwords.patch
+	eapply "${FILESDIR}"/0003-fix-locale-issue-in-service-file.patch
+	eapply "${FILESDIR}"/977.patch
+	eapply "${FILESDIR}"/1008.patch
+
+}
+
+src_configure() {
+	local emesonargs=(	
+	-Dsystemd=true
+	-Dtests=false
+	-Dphoc_tests=disabled
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	default
+	meson_src_install
+	newpamd "${FILESDIR}"/pam_phosh 'phosh'
+	systemd_newunit "${FILESDIR}"/phosh.service 'phosh.service'
+	domenu "${FILESDIR}"/sm.puri.OSK0.desktop
+	dobin "${FILESDIR}"/osk-wayland
+
+	DOC_CONTENTS="To amend the existing password policy please see the man 5 passwdqc.conf
+				page and then edit the /etc/security/passwdqc.conf file to change enforce=none
+				to allow use digit only password as phosh only support passcode for now"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gui-wm/phosh/phosh-0.25.0.ebuild b/gui-wm/phosh/phosh-0.25.0.ebuild
index 29efa29..4b59b6a 100755
--- a/gui-wm/phosh/phosh-0.25.0.ebuild
+++ b/gui-wm/phosh/phosh-0.25.0.ebuild
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils meson pam readme.gentoo-r1 systemd xdg
 MY_P="${PN}-v${PV}"
 LVC_COMMIT="ae1a34aafce7026b8c0f65a43c9192d756fe1057"
 LCU_COMMIT="7e2f9e2db6515fb9c4650010c2a9ecb9796957e3"
-GMO_COMMIT="6504fa124438b79a2ad5687ac3ebef6d7a2c0823"
+GMO_COMMIT="d483537aee4778b114ce5d50c4c8a9f8d58337ed"
 
 DESCRIPTION="A pure Wayland shell prototype for GNOME on mobile devices"
 HOMEPAGE="https://gitlab.gnome.org/World/Phosh/phosh/"