diff --git a/CommonInstaller b/CommonInstaller
index ce592a2..0e0d128 100644
--- a/CommonInstaller
+++ b/CommonInstaller
@@ -760,16 +760,15 @@ install_microg () {
 		if [ "${nanodroid_gmscore}" -eq 1 ]; then
 			ui_print "   ++ Official microG GmsCore"
 			nanodroid_install_apk GmsCore_Official "" GmsCore
-			GSFPROXY=GsfProxy_Official
 		else
 			ui_print "   ++ NanoDroid microG GmsCore"
 			nanodroid_install_apk GmsCore_NanoDroid multilib GmsCore
-			GSFPROXY=GsfProxy_NanoDroid
 		fi
 
 		if [ "${nanodroid_microg}" -ne 2 ]; then
-			nanodroid_install_apk DroidGuard
-			nanodroid_install_apk ${GSFPROXY} "" GsfProxy
+			for app in GsfProxy DroidGuard; do
+				nanodroid_install_apk ${app}
+			done
 		fi
 
 		for app in ${NLPBACKEND}; do
diff --git a/Full/system/priv-app/GsfProxy_NanoDroid/GsfProxy_NanoDroid.apk b/Full/system/priv-app/GsfProxy_NanoDroid/GsfProxy_NanoDroid.apk
deleted file mode 100644
index 31cceb2..0000000
Binary files a/Full/system/priv-app/GsfProxy_NanoDroid/GsfProxy_NanoDroid.apk and /dev/null differ
diff --git a/data/build-package.database b/data/build-package.database
index 1967078..842c105 100644
--- a/data/build-package.database
+++ b/data/build-package.database
@@ -18,7 +18,7 @@ nlx_OMNICLOCK=(https://www.nanolx.org/apk/OmniClock.apk app OmniClock)
 ###
 
 uG_GMSCORE=(microg com.google.android.gms priv-app GmsCore_Official)
-uG_GSFPROXY=(microg com.google.android.gsf priv-app GsfProxy_Official)
+uG_GSFPROXY=(microg com.google.android.gsf priv-app GsfProxy)
 uG_DROIDGUARD=(microg org.microg.gms.droidguard app DroidGuard)
 uG_FAKESTORE=(microg com.android.vending priv-app FakeStore)
 fd_NLPDEJAVU=(fdroid org.fitchfamily.android.dejavu app nlpBackendDejavu)
@@ -178,7 +178,7 @@ files_database=( Full/gsync/K/app/GoogleCalendarSync/GoogleCalendarSync.apk
 	Full/system/priv-app/Phonesky/Phonesky.apk
 	Full/system/priv-app/YalpStore/YalpStore.apk
 	Full/system/priv-app/AuroraStore/AuroraStore.apk
-	Full/system/priv-app/GsfProxy_Official/GsfProxy_Official.apk
+	Full/system/priv-app/GsfProxy/GsfProxy.apk
 	Full/system/priv-app/GmsCore_NanoDroid/GmsCore_NanoDroid.apk
 	Full/system/priv-app/GmsCore_Official/GmsCore_Official.apk
 	BromiteWebView/system/app/BromiteWebView_arm/BromiteWebView_arm.apk