diff --git a/meta-luneos/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provide-info/meson.build b/meta-luneos/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info/meson.build
similarity index 98%
rename from meta-luneos/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provide-info/meson.build
rename to meta-luneos/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info/meson.build
index 4d6bdefb21..612381e8d8 100644
--- a/meta-luneos/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provide-info/meson.build
+++ b/meta-luneos/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info/meson.build
@@ -24,6 +24,7 @@ pkgconfig.generate(
   dataonly: true,
 )
 
+if false
 custom_target('build-apns-conf',
   build_by_default: true,
   output: 'apns-conf.xml',
@@ -32,6 +33,7 @@ custom_target('build-apns-conf',
   install: true,
   install_dir: pkgdatadir,
 )
+endif
 
 install_data(
   [sp_xml_db, 'serviceproviders.2.dtd'],
diff --git a/meta-luneos/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bbappend b/meta-luneos/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bbappend
index e4628122f5..fecf7880db 100644
--- a/meta-luneos/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bbappend
+++ b/meta-luneos/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_git.bbappend
@@ -1,11 +1,14 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
+
 #Mer uses their own version of MBPI which has some elements added. So we want to use their version only in case we're using their oFono version. In other cases where we use upstream oFono we want to use the regular MBPI from Yocto.
 
 SRC_URI:halium  = " \
                     git://github.com/sailfishos/mobile-broadband-provider-info.git;protocol=https;branch=master \
-                    file://meson.build \
+                    file://meson.build;subdir=git/${BPN} \
 "
 
-S:halium = "${WORKDIR}/git/${PN}"
+S:halium = "${WORKDIR}/git/${BPN}"
 
 SRCREV:halium = "fe500f1b19e8525d09655a38ac111a0fe127b5f9"
 LIC_FILES_CHKSUM:halium = "file://COPYING;md5=87964579b2a8ece4bc6744d2dc9a8b04"
+
diff --git a/meta-luneos/recipes-connectivity/ofono/ofono-halium_1.29.bb b/meta-luneos/recipes-connectivity/ofono/ofono-halium_1.29.bb
index 1055f77778..485475bed9 100644
--- a/meta-luneos/recipes-connectivity/ofono/ofono-halium_1.29.bb
+++ b/meta-luneos/recipes-connectivity/ofono/ofono-halium_1.29.bb
@@ -12,6 +12,7 @@ COMPATIBLE_MACHINE = "^halium$"
 # This recipe acts as a replacement for the ofono recipe
 PROVIDES += "ofono"
 RPROVIDES:${PN} += "ofono"
+RPROVIDES:${PN}-tests += "ofono-tests"
 
 SRC_URI  = " \
   git://github.com/sailfishos/ofono.git;protocol=https;branch=master \