diff --git a/app/src/androidTest/java/org/mozilla/fenix/components/FxaServer.kt b/app/src/androidTest/java/org/mozilla/fenix/components/FxaServer.kt
index 412c5a9ee..602ece548 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/components/FxaServer.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/components/FxaServer.kt
@@ -5,6 +5,7 @@
 package org.mozilla.fenix.components
 
 import android.content.Context
+import mozilla.components.service.fxa.ServerConfig.Server
 import mozilla.components.service.fxa.ServerConfig
 
 /**
@@ -20,6 +21,6 @@ object FxaServer {
 
     @Suppress("UNUSED_PARAMETER")
     fun config(context: Context): ServerConfig {
-        return ServerConfig.dev(CLIENT_ID, REDIRECT_URL)
+        return ServerConfig(Server.DEV, CLIENT_ID, REDIRECT_URL)
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/components/FxaServer.kt b/app/src/main/java/org/mozilla/fenix/components/FxaServer.kt
index dd1053e56..78d76342b 100644
--- a/app/src/main/java/org/mozilla/fenix/components/FxaServer.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/FxaServer.kt
@@ -5,6 +5,7 @@ package org.mozilla.fenix.components
 
 import android.content.Context
 import mozilla.components.service.fxa.ServerConfig
+import mozilla.components.service.fxa.ServerConfig.Server
 import org.mozilla.fenix.FeatureFlags
 
 /**
@@ -23,6 +24,6 @@ object FxaServer {
     }
 
     fun config(context: Context): ServerConfig {
-        return ServerConfig.release(CLIENT_ID, redirectUrl(context))
+        return ServerConfig(Server.RELEASE, CLIENT_ID, redirectUrl(context))
     }
 }