diff --git a/app/build.gradle b/app/build.gradle
index 7b4c20a105..24d6ac02cd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -167,11 +167,10 @@ android {
             debuggable true
             def deepLinkSchemeValue = "iceraven-debug"
             buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\""
-            manifestPlaceholders = [
+            manifestPlaceholders.putAll([
                     "sharedUserId": "io.github.forkmaintainers.iceraven.sharedID",
                     "deepLinkScheme": deepLinkSchemeValue,
-                    "targetActivity": targetActivity
-            ]
+            ])
             // Use custom default allowed addon list
             buildConfigField "String", "AMO_COLLECTION_USER", "\"16201230\""
             buildConfigField "String", "AMO_COLLECTION_NAME", "\"What-I-want-on-Fenix\""
@@ -183,11 +182,10 @@ android {
             applicationIdSuffix ".iceraven"
             def deepLinkSchemeValue = "iceraven"
             buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\""
-            manifestPlaceholders = [
+            manifestPlaceholders.putAll([
                     "sharedUserId": "io.github.forkmaintainers.iceraven.sharedID",
                     "deepLinkScheme": deepLinkSchemeValue,
-                    "targetActivity": targetActivity
-            ]
+            ])
             // Use custom default allowed addon list
             buildConfigField "String", "AMO_COLLECTION_USER", "\"16201230\""
             buildConfigField "String", "AMO_COLLECTION_NAME", "\"What-I-want-on-Fenix\""
diff --git a/app/nimbus.fml.yaml b/app/nimbus.fml.yaml
index 112edc1cb1..271d32342e 100644
--- a/app/nimbus.fml.yaml
+++ b/app/nimbus.fml.yaml
@@ -133,7 +133,7 @@ import:
                 max-display-count: 1
             notification-config:
               refresh-interval: 120 # minutes (2 hours)
-  - path: ../../android-components/components/browser/engine-gecko/geckoview.fml.yaml
+  - path: ../android-components/components/browser/engine-gecko/geckoview.fml.yaml
     channel: release
     features:
       pdfjs:
diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/AdjustMetricsService.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/AdjustMetricsService.kt
index c6dfb331a5..453f6a1bb8 100644
--- a/app/src/main/java/org/mozilla/fenix/components/metrics/AdjustMetricsService.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/metrics/AdjustMetricsService.kt
@@ -36,7 +36,6 @@ class AdjustMetricsService(private val application: Application) : MetricsServic
             AdjustConfig.ENVIRONMENT_PRODUCTION,
             true,
         )
-        config.setPreinstallTrackingEnabled(true)
 
         val installationPing = FirstSessionPing(application)
 
diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/InstallReferrerMetricsService.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/InstallReferrerMetricsService.kt
index 70bf89c3f3..3e6415240f 100644
--- a/app/src/main/java/org/mozilla/fenix/components/metrics/InstallReferrerMetricsService.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/metrics/InstallReferrerMetricsService.kt
@@ -8,8 +8,6 @@ import android.content.Context
 import android.net.UrlQuerySanitizer
 import android.os.RemoteException
 import androidx.annotation.VisibleForTesting
-import com.android.installreferrer.api.InstallReferrerClient
-import com.android.installreferrer.api.InstallReferrerStateListener
 import org.mozilla.fenix.GleanMetrics.PlayStoreAttribution
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.utils.Settings
@@ -23,8 +21,6 @@ import java.net.URLDecoder
 class InstallReferrerMetricsService(private val context: Context) : MetricsService {
     override val type = MetricServiceType.Marketing
 
-    private var referrerClient: InstallReferrerClient? = null
-
     override fun start() {
         if (context.settings().utmParamsKnown) {
             return
@@ -32,8 +28,6 @@ class InstallReferrerMetricsService(private val context: Context) : MetricsServi
     }
 
     override fun stop() {
-        referrerClient?.endConnection()
-        referrerClient = null
     }
 
     override fun track(event: Event) = Unit