diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index d993ec0..060933a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -66,6 +66,11 @@ android {
         }
     }
 
+    defaultConfig {
+        buildConfigField("String", "TIME_FORMAT", "\"$timeFormat\"")
+        buildConfigField("Long", "TIMESTAMP", "${timestamp}L")
+    }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
@@ -166,7 +171,13 @@ room {
     schemaDirectory("$projectDir/schemas")
 }
 
-val gitBuildNumber: Int
+private val timeFormat: String
+    get() = "dd/MM/yyyy HH:mm:ss"
+
+private val timestamp: Long
+    get() = System.currentTimeMillis()
+
+private val gitBuildNumber: Int
     get() {
         val stdout = org.apache.commons.io.output.ByteArrayOutputStream()
         rootProject.exec {
diff --git a/app/src/main/java/com/pixelized/rplexicon/data/parser/TimeUpdateParser.kt b/app/src/main/java/com/pixelized/rplexicon/data/parser/TimeUpdateParser.kt
index 7dc7791..c02756f 100644
--- a/app/src/main/java/com/pixelized/rplexicon/data/parser/TimeUpdateParser.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/data/parser/TimeUpdateParser.kt
@@ -1,11 +1,12 @@
 package com.pixelized.rplexicon.data.parser
 
+import com.pixelized.rplexicon.BuildConfig
 import java.text.SimpleDateFormat
 import java.util.Locale
 import javax.inject.Inject
 
 class TimeUpdateParser @Inject constructor() {
-    private val formatter = SimpleDateFormat("dd/MM/yyyy HH:mm:ss", Locale.FRANCE)
+    private val formatter = SimpleDateFormat(BuildConfig.TIME_FORMAT, Locale.FRANCE)
 
     fun parser(value: String?): Long? {
         return value?.let { formatter.parse(it) }?.time
diff --git a/app/src/main/java/com/pixelized/rplexicon/data/repository/lexicon/LexiconRepository.kt b/app/src/main/java/com/pixelized/rplexicon/data/repository/lexicon/LexiconRepository.kt
index 9195968..833e6aa 100644
--- a/app/src/main/java/com/pixelized/rplexicon/data/repository/lexicon/LexiconRepository.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/data/repository/lexicon/LexiconRepository.kt
@@ -1,5 +1,6 @@
 package com.pixelized.rplexicon.data.repository.lexicon
 
+import com.pixelized.rplexicon.BuildConfig
 import com.pixelized.rplexicon.data.database.CompanionDatabase
 import com.pixelized.rplexicon.data.database.lexicon.LexiconReadTimestampDbo
 import com.pixelized.rplexicon.data.model.Lexicon
@@ -68,7 +69,7 @@ class LexiconRepository @Inject constructor(
             database.lexiconDao().also { dao ->
                 data.forEach {
                     val row = dao.update(item = it)
-                    if (row == 0) dao.insert(item = it with System.currentTimeMillis())
+                    if (row == 0) dao.insert(item = it with BuildConfig.TIMESTAMP)
                 }
             }
 
diff --git a/app/src/main/java/com/pixelized/rplexicon/data/repository/lexicon/LocationRepository.kt b/app/src/main/java/com/pixelized/rplexicon/data/repository/lexicon/LocationRepository.kt
index 39f768f..af16856 100644
--- a/app/src/main/java/com/pixelized/rplexicon/data/repository/lexicon/LocationRepository.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/data/repository/lexicon/LocationRepository.kt
@@ -1,5 +1,6 @@
 package com.pixelized.rplexicon.data.repository.lexicon
 
+import com.pixelized.rplexicon.BuildConfig
 import com.pixelized.rplexicon.data.database.CompanionDatabase
 import com.pixelized.rplexicon.data.database.location.LocationReadTimestampDbo
 import com.pixelized.rplexicon.data.model.Location
@@ -75,7 +76,7 @@ class LocationRepository @Inject constructor(
                 val mapDao = database.locationDao()
                 mapParser.parse(map).forEach { item ->
                     val row = mapDao.update(item)
-                    if (row == 0) mapDao.insert(item with System.currentTimeMillis())
+                    if (row == 0) mapDao.insert(item with BuildConfig.TIMESTAMP)
                 }
 
                 val worldDao = database.worldDao()
diff --git a/app/src/main/java/com/pixelized/rplexicon/data/repository/lexicon/QuestRepository.kt b/app/src/main/java/com/pixelized/rplexicon/data/repository/lexicon/QuestRepository.kt
index f9a0a05..dcfbd9f 100644
--- a/app/src/main/java/com/pixelized/rplexicon/data/repository/lexicon/QuestRepository.kt
+++ b/app/src/main/java/com/pixelized/rplexicon/data/repository/lexicon/QuestRepository.kt
@@ -1,5 +1,6 @@
 package com.pixelized.rplexicon.data.repository.lexicon
 
+import com.pixelized.rplexicon.BuildConfig
 import com.pixelized.rplexicon.data.database.CompanionDatabase
 import com.pixelized.rplexicon.data.database.quest.QuestsReadTimestampDbo
 import com.pixelized.rplexicon.data.model.Quest
@@ -68,7 +69,7 @@ class QuestRepository @Inject constructor(
             val dao = database.questsDao()
             quests.forEach {
                 val row = dao.update(item = it)
-                if (row == 0) dao.insert(item = it with System.currentTimeMillis())
+                if (row == 0) dao.insert(item = it with BuildConfig.TIMESTAMP)
             }
 
             lastSuccessFullUpdate = Update.currentTime()