diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index dd60a7f..744f7d1 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -82,6 +82,12 @@ tasks.register("generateManifest") {
         val gson = groovy.json.JsonBuilder(manifest).toPrettyString()
         manifestFile.writeText(gson)
         println("Generated manifest.json with version ${android.defaultConfig.versionName} (${android.defaultConfig.versionCode})")
+
+        val androidManifestFile = file("$projectDir/src/main/AndroidManifest.xml")
+        var androidManifestContent = androidManifestFile.readText()
+        androidManifestContent = androidManifestContent.replace("\$BASE_URL\$", baseUrl)
+        androidManifestFile.writeText(androidManifestContent)
+        println("Replaced \$BASE_URL$ in AndroidManifest.xml")
     }
 }
 
@@ -104,4 +110,5 @@ dependencies {
     implementation(libs.androidx.cardview)
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.mapbox.sdk.turf)
-}
\ No newline at end of file
+}
+
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e1c8813..bebd6e1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -42,7 +42,7 @@
         <!-- Provide Karoo System with information about delivery of your app -->
         <meta-data
             android:name="io.hammerhead.karooext.MANIFEST_URL"
-            android:value="https://github.com/timklge/karoo-powerbar/releases/latest/download/manifest.json" />
+            android:value="$BASE_URL$/manifest.json" />
     </application>