diff --git a/app/build.gradle b/app/build.gradle
index 44db9ab7e..8dc0ecc55 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -294,7 +294,7 @@ android {
             buildConfigField "String", "TEST_USERNAME", "\"" + getTestUserName() + "\""
             buildConfigField "String", "TEST_PASSWORD", "\"" + getTestPassword() + "\""
             buildConfigField "String", "DEPICTS_PROPERTY", "\"P180\""
-
+            buildConfigField "String", "MapboxAccessToken", "\"MAPBOX_ACCESS_TOKEN\""
             dimension 'tier'
         }
 
@@ -330,7 +330,7 @@ android {
             buildConfigField "String", "TEST_USERNAME", "\"" + getTestUserName() + "\""
             buildConfigField "String", "TEST_PASSWORD", "\"" + getTestPassword() + "\""
             buildConfigField "String", "DEPICTS_PROPERTY", "\"P245962\""
-
+            buildConfigField "String", "MapboxAccessToken", "\"MAPBOX_ACCESS_TOKEN\""
             dimension 'tier'
         }
     }
diff --git a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
index 7e9834585..f129da0a5 100644
--- a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
+++ b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
@@ -18,7 +18,6 @@ import android.os.Build;
 import android.os.Process;
 import android.util.Log;
 import androidx.annotation.NonNull;
-import androidx.multidex.BuildConfig;
 import androidx.multidex.MultiDexApplication;
 import com.facebook.drawee.backends.pipeline.Fresco;
 import com.facebook.imagepipeline.core.ImagePipeline;
@@ -155,7 +154,7 @@ public class CommonsApplication extends MultiDexApplication {
 
         INSTANCE = this;
         ACRA.init(this);
-        Mapbox.getInstance(this, getString(R.string.mapbox_commons_app_token), WellKnownTileServer.Mapbox);
+        Mapbox.getInstance(this, BuildConfig.MapboxAccessToken, WellKnownTileServer.Mapbox);
 
         ApplicationlessInjection
             .getInstance(this)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cbae97530..9dfc22948 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -215,7 +215,6 @@
   <string name="become_a_tester_title">Become a Beta Tester</string>
   <string name="become_a_tester_description">Opt-in to our beta channel on Google Play and get early access to new features and bug fixes</string>
   <string name="beta_opt_in_link">https://play.google.com/apps/testing/fr.free.nrw.commons</string>
-  <string name="mapbox_commons_app_token">pk.eyJ1Ijoibmljb2xhcy1yYW91bCIsImEiOiJjbG93YnU5ZTEwM3pqMmttbzIxNGVvOGgxIn0.T1o536AcyVpl5Q7eypJEAg</string>
   <string name="_2fa_code">2FA Code</string>
   <string name="logout_verification">Do you really want to logout?</string>
   <string name="mediaimage_failed">Media Image Failed</string>
diff --git a/gradle.properties b/gradle.properties
index 5a74a546c..2ec3a2d1c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -37,4 +37,5 @@ android.enableJetifier=true
 android.jetifier.ignorelist=bcprov-jdk15on
 android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
-android.nonFinalResIds=false
\ No newline at end of file
+android.nonFinalResIds=false
+MAPBOX_ACCESS_TOKEN="pk.eyJ1Ijoibmljb2xhcy1yYW91bCIsImEiOiJjbG93YnU5ZTEwM3pqMmttbzIxNGVvOGgxIn0.T1o536AcyVpl5Q7eypJEAg"
\ No newline at end of file