diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index fe6c4b74..f3340745 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -27,11 +27,11 @@ android {
     compileSdk = project.libs.versions.app.build.compileSDKVersion.get().toInt()
 
     defaultConfig {
-        applicationId = libs.versions.app.version.appId.get()
+        applicationId = project.property("APP_ID").toString()
         minSdk = project.libs.versions.app.build.minimumSDK.get().toInt()
         targetSdk = project.libs.versions.app.build.targetSDK.get().toInt()
-        versionName = project.libs.versions.app.version.versionName.get()
-        versionCode = project.libs.versions.app.version.versionCode.get().toInt()
+        versionName = project.property("VERSION_NAME").toString()
+        versionCode = project.property("VERSION_CODE").toString().toInt()
         setProperty("archivesBaseName", "messages-$versionCode")
         ksp {
             arg("room.schemaLocation", "$projectDir/schemas")
@@ -105,7 +105,7 @@ android {
         kotlinOptions.jvmTarget = project.libs.versions.app.build.kotlinJVMTarget.get()
     }
 
-    namespace = libs.versions.app.version.appId.get()
+    namespace = project.property("APP_ID").toString()
 
     lint {
         checkReleaseBuilds = false
diff --git a/gradle.properties b/gradle.properties
index 95e3e292..245faec5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,8 @@
 android.enableJetifier=true
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx8192m
+
+# Versioning
+VERSION_NAME=1.1.7
+VERSION_CODE=10
+APP_ID=org.fossify.messages
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 98d2fd33..d61c3079 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -29,10 +29,6 @@ app-build-kotlinJVMTarget = "17"
 #Helpers
 ez-vcard = "0.11.3"
 shortcut-badger = "1.1.22"
-#versioning
-app-version-appId = "org.fossify.messages"
-app-version-versionCode = "10"
-app-version-versionName = "1.1.7"
 [libraries]
 #AndroidX
 androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "androidx-constraintlayout" }