diff --git a/app/build.gradle b/app/build.gradle
index 1f1926a23..f6e6347e0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@
 buildscript {
     repositories {
         maven {
-            url "https://snapshots.maven.mozilla.org/maven2"
+            url "https://nightly.maven.mozilla.org/maven2"
         }
         maven {
             url "https://maven.mozilla.org/maven2"
diff --git a/app/src/main/java/org/mozilla/fenix/components/Core.kt b/app/src/main/java/org/mozilla/fenix/components/Core.kt
index 2d03bf4c8..8a6d8fb67 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Core.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Core.kt
@@ -89,7 +89,7 @@ class Core(private val context: Context) {
         )
     }
 
-    val sessionStorage: SessionStorage by lazy {
+    private val sessionStorage: SessionStorage by lazy {
         SessionStorage(context, engine = engine)
     }
 
diff --git a/build.gradle b/build.gradle
index 6bf1fd9c4..2d4376938 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,7 @@ allprojects {
     repositories {
         google()
         maven {
-            url "https://snapshots.maven.mozilla.org/maven2"
+            url "https://nightly.maven.mozilla.org/maven2"
         }
         maven {
             url "https://maven.mozilla.org/maven2"
diff --git a/buildSrc/src/main/java/AndroidComponents.kt b/buildSrc/src/main/java/AndroidComponents.kt
new file mode 100644
index 000000000..1b299697d
--- /dev/null
+++ b/buildSrc/src/main/java/AndroidComponents.kt
@@ -0,0 +1,8 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+object AndroidComponents {
+    const val VERSION = "37.0.20200316130158"
+}
+
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index 81ec2f2b7..eee35b1d4 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -33,7 +33,7 @@ object Versions {
     const val google_material = "1.1.0"
     const val google_flexbox = "2.0.1"
 
-    const val mozilla_android_components = "37.0.0-SNAPSHOT"
+    const val mozilla_android_components = AndroidComponents.VERSION
 
     const val adjust = "4.18.3"
     const val installreferrer = "1.0"