diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml
index 0bd4175a2..12e720dc6 100644
--- a/Essentials/src/config.yml
+++ b/Essentials/src/config.yml
@@ -13,6 +13,8 @@
 
 # If you have problems join the Essentials help support channel: http://tiny.cc/EssentialsChat
 
+# Version ${project.version}-b${build.number}
+
 ############################################################
 # +------------------------------------------------------+ #
 # |                 Essentials (Global)                  | #
diff --git a/Essentials/src/items.csv b/Essentials/src/items.csv
index a01931808..59d002a19 100644
--- a/Essentials/src/items.csv
+++ b/Essentials/src/items.csv
@@ -1,4 +1,4 @@
-#version: TeamCity
+#version: ${project.version}-b${build.number}
 #If you change this file, it will not be automatically updated after the next release.
 #item,id,metadata
 stone,1,0
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index a4f910f8f..96aa4c9dd 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -1,5 +1,5 @@
 #X-Generator: crowdin.net
-#version: TeamCity
+#version: ${project.version}-b${build.number}
 # Single quotes have to be doubled: ''
 # Translations start here
 # by:
diff --git a/Essentials/src/messages_cs.properties b/Essentials/src/messages_cs.properties
index 223fc39c0..ad5d0213c 100644
--- a/Essentials/src/messages_cs.properties
+++ b/Essentials/src/messages_cs.properties
@@ -1,5 +1,5 @@
 #X-Generator: crowdin.net
-#version: TeamCity
+#version: ${project.version}-b${build.number}
 # Single quotes have to be doubled: ''
 # Translations start here
 # by:
diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties
index 4ae81281b..79cf4fff1 100644
--- a/Essentials/src/messages_da.properties
+++ b/Essentials/src/messages_da.properties
@@ -1,5 +1,5 @@
 #X-Generator: crowdin.net
-#version: TeamCity
+#version: ${project.version}-b${build.number}
 # Single quotes have to be doubled: ''
 # Translations start here
 # by:
diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties
index 02899985d..0bdeb29b1 100644
--- a/Essentials/src/messages_de.properties
+++ b/Essentials/src/messages_de.properties
@@ -1,6 +1,6 @@
 #X-Generator: crowdin.com
 #X-Generator: crowdin.net
-#version: TeamCity
+#version: ${project.version}-b${build.number}
 # Single quotes have to be doubled: ''
 # Translations start here
 # by:
diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties
index e2b394d03..91ac4fef2 100644
--- a/Essentials/src/messages_en.properties
+++ b/Essentials/src/messages_en.properties
@@ -1,5 +1,5 @@
 #X-Generator: crowdin.net
-#version: TeamCity
+#version: ${project.version}-b${build.number}
 # Single quotes have to be doubled: ''
 # Translations start here
 # by:
diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties
index 299499eb7..f4e33dbc2 100644
--- a/Essentials/src/messages_es.properties
+++ b/Essentials/src/messages_es.properties
@@ -1,5 +1,5 @@
 #X-Generator: crowdin.net
-#version: TeamCity
+#version: ${project.version}-b${build.number}
 # Single quotes have to be doubled: ''
 # Translations start here
 # by:
diff --git a/Essentials/src/messages_et.properties b/Essentials/src/messages_et.properties
index 0cb507e09..b040699fd 100644
--- a/Essentials/src/messages_et.properties
+++ b/Essentials/src/messages_et.properties
@@ -1,5 +1,5 @@
 #X-Generator: crowdin.net
-#version: TeamCity
+#version: ${project.version}-b${build.number}
 # Single quotes have to be doubled: ''
 # Translations start here
 # by:
diff --git a/Essentials/src/messages_fi.properties b/Essentials/src/messages_fi.properties
index 1ec6a9c12..f5005d14a 100644
--- a/Essentials/src/messages_fi.properties
+++ b/Essentials/src/messages_fi.properties
@@ -1,5 +1,5 @@
 #X-Generator: crowdin.net
-#version: TeamCity
+#version: ${project.version}-b${build.number}
 # Single quotes have to be doubled: ''
 # Translations start here
 # by:
diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties
index fc32cb080..2d3f78068 100644
--- a/Essentials/src/messages_fr.properties
+++ b/Essentials/src/messages_fr.properties
@@ -1,6 +1,6 @@
 #X-Generator: crowdin.com
 #X-Generator: crowdin.net
-#version: TeamCity
+#version: ${project.version}-b${build.number}
 # Single quotes have to be doubled: ''
 # Translations start here
 # by:
diff --git a/Essentials/src/messages_hu.properties b/Essentials/src/messages_hu.properties
index 2b9f35ca8..eeadade0c 100644
--- a/Essentials/src/messages_hu.properties
+++ b/Essentials/src/messages_hu.properties
@@ -1,5 +1,5 @@
 #X-Generator: crowdin.net
-#version: TeamCity
+#version: ${project.version}-b${build.number}
 # Single quotes have to be doubled: ''
 # Translations start here
 # by:
diff --git a/Essentials/src/messages_it.properties b/Essentials/src/messages_it.properties
index 14a9edcb5..299362983 100644
--- a/Essentials/src/messages_it.properties
+++ b/Essentials/src/messages_it.properties
@@ -1,5 +1,5 @@
 #X-Generator: crowdin.net
-#version: TeamCity
+#version: ${project.version}-b${build.number}
 # Single quotes have to be doubled: ''
 # Translations start here
 # by:
diff --git a/Essentials/src/messages_ko.properties b/Essentials/src/messages_ko.properties
index ca3fed1a1..4434564a8 100644
--- a/Essentials/src/messages_ko.properties
+++ b/Essentials/src/messages_ko.properties
@@ -1,5 +1,5 @@
 #X-Generator: crowdin.net
-#version: TeamCity
+#version: ${project.version}-b${build.number}
 # Single quotes have to be doubled: ''
 # Translations start here
 # by:
diff --git a/Essentials/src/messages_lt.properties b/Essentials/src/messages_lt.properties
index bccff035a..743db13b5 100644
--- a/Essentials/src/messages_lt.properties
+++ b/Essentials/src/messages_lt.properties
@@ -1,5 +1,5 @@
 #X-Generator: crowdin.net
-#version: TeamCity
+#version: ${project.version}-b${build.number}
 # Single quotes have to be doubled: ''
 # Translations start here
 # by:
diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties
index 73f755f77..a4012d78d 100644
--- a/Essentials/src/messages_nl.properties
+++ b/Essentials/src/messages_nl.properties
@@ -1,5 +1,5 @@
 #X-Generator: crowdin.net
-#version: TeamCity
+#version: ${project.version}-b${build.number}
 # Single quotes have to be doubled: ''
 # Translations start here
 # by:
diff --git a/Essentials/src/messages_pl.properties b/Essentials/src/messages_pl.properties
index 5ddad6d86..8281382ca 100644
--- a/Essentials/src/messages_pl.properties
+++ b/Essentials/src/messages_pl.properties
@@ -1,5 +1,5 @@
 #X-Generator: crowdin.net
-#version: TeamCity
+#version: ${project.version}-b${build.number}
 # Single quotes have to be doubled: ''
 # Translations start here
 # by:
diff --git a/Essentials/src/messages_pt.properties b/Essentials/src/messages_pt.properties
index 8b6875e41..94e8a70f5 100644
--- a/Essentials/src/messages_pt.properties
+++ b/Essentials/src/messages_pt.properties
@@ -1,5 +1,5 @@
 #X-Generator: crowdin.net
-#version: TeamCity
+#version: ${project.version}-b${build.number}
 # Single quotes have to be doubled: ''
 # Translations start here
 # by: guipenedo
diff --git a/Essentials/src/messages_pt_BR.properties b/Essentials/src/messages_pt_BR.properties
index 050c2ef34..bb4fbdd84 100644
--- a/Essentials/src/messages_pt_BR.properties
+++ b/Essentials/src/messages_pt_BR.properties
@@ -1,5 +1,5 @@
 #X-Generator: crowdin.net
-#version: TeamCity
+#version: ${project.version}-b${build.number}
 # Single quotes have to be doubled: ''
 # Translations start here
 # by: nathampa0909
diff --git a/Essentials/src/messages_ro.properties b/Essentials/src/messages_ro.properties
index 96eb1d421..a9ddadc10 100644
--- a/Essentials/src/messages_ro.properties
+++ b/Essentials/src/messages_ro.properties
@@ -1,5 +1,5 @@
 #X-Generator: crowdin.net
-#version: TeamCity
+#version: ${project.version}-b${build.number}
 # Single quotes have to be doubled: ''
 # Translations start here
 # by:
diff --git a/Essentials/src/messages_ru.properties b/Essentials/src/messages_ru.properties
index 0a9f619ab..451accdc0 100644
--- a/Essentials/src/messages_ru.properties
+++ b/Essentials/src/messages_ru.properties
@@ -1,5 +1,5 @@
 #X-Generator: crowdin.net
-#version: TeamCity
+#version: ${project.version}-b${build.number}
 # Single quotes have to be doubled: ''
 # Translations start here
 # by:
diff --git a/Essentials/src/messages_sv.properties b/Essentials/src/messages_sv.properties
index 2bc0ce581..da81ad77a 100644
--- a/Essentials/src/messages_sv.properties
+++ b/Essentials/src/messages_sv.properties
@@ -1,5 +1,5 @@
 #X-Generator: crowdin.net
-#version: TeamCity
+#version: ${project.version}-b${build.number}
 # Single quotes have to be doubled: ''
 # Translations start here
 # by:
diff --git a/Essentials/src/messages_tr.properties b/Essentials/src/messages_tr.properties
index af96bcdfc..d63635a03 100644
--- a/Essentials/src/messages_tr.properties
+++ b/Essentials/src/messages_tr.properties
@@ -1,5 +1,5 @@
 #X-Generator: crowdin.net
-#version: TeamCity
+#version: ${project.version}-b${build.number}
 # Single quotes have to be doubled: ''
 # Translations start here
 # by:
diff --git a/Essentials/src/messages_zh_HK.properties b/Essentials/src/messages_zh_HK.properties
index 0e45e1df5..0f726cdb2 100644
--- a/Essentials/src/messages_zh_HK.properties
+++ b/Essentials/src/messages_zh_HK.properties
@@ -1,5 +1,5 @@
 #X-Generator: crowdin.net
-#version: TeamCity
+#version: ${project.version}-b${build.number}
 # Single quotes have to be doubled: ''
 # Translations start here
 # by:
diff --git a/Essentials/src/messages_zh_TW.properties b/Essentials/src/messages_zh_TW.properties
index e046ce2a2..aea36d990 100644
--- a/Essentials/src/messages_zh_TW.properties
+++ b/Essentials/src/messages_zh_TW.properties
@@ -1,5 +1,5 @@
 #X-Generator: crowdin.net
-#version: TeamCity
+#version: ${project.version}-b${build.number}
 # Single quotes have to be doubled: ''
 # Translations start here
 # by: