diff --git a/.drone.yml b/.drone.yml
index 273241e..0975c16 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -19,9 +19,15 @@ steps:
   image: alpine
   commands:
     - apk update && apk add --no-cache zip
-    # Delete hidden files and dirs (.git, .drone.yml)
-    - rm -rf .git
-    - rm -f .drone.yml
+    # Delete unneeded files/dirs
+    - rm -rf sources/.git
+    - rm -rf sources/.drone.yml
+    # Set Version and AddonVersion
+    - export VERSION=$DRONE_TAG
+    - export ADDON_VERSION=$(echo $DRONE_TAG | sef 's/\.//g')
+    - sed -i "s/%VERSION%/$VERSION/g" sources/AchievementInfoCommon.lua
+    - sed -i "s/%VERSION%/$VERSION/g" sources/AchievementInfo.txt
+    - sed -i "s/%ADDON_VERSION%/$ADDON_VERSION/g" sources/AchievementInfo.txt
     # Rename and zip
     - mv sources AchievementInfo
     - zip -r "AchievementInfo-$DRONE_TAG.zip" ./AchievementInfo
diff --git a/AchievementInfo.txt b/AchievementInfo.txt
index f457485..c541203 100644
--- a/AchievementInfo.txt
+++ b/AchievementInfo.txt
@@ -1,7 +1,7 @@
 ## Title: AchievementInfo
 ## Description: Displays progress updates for achievements in the chat. You can display update-details like 'Slay 25/100 Monsters' if interested. |cFF0000Important:|r The messages appear only when an achievement is updated. This is no permanent tracking tool.
-## AddOnVersion 223
-## Version: 2.23
+## AddOnVersion %ADDON_VERSION%
+## Version: %VERSION%
 ## Author: |c87B7CCAsto|r, @Astarax
 ## Contact: mail@coded-with-heart.com
 
diff --git a/AchievementInfoCommon.lua b/AchievementInfoCommon.lua
index e180336..9f9d3c2 100644
--- a/AchievementInfoCommon.lua
+++ b/AchievementInfoCommon.lua
@@ -8,7 +8,7 @@
 AchievementInfo             = {}
 AchievementInfo.name        = "AchievementInfo"
 AchievementInfo.author      = "Asto, @Astarax"
-AchievementInfo.version     = 2.23
+AchievementInfo.version     = %VERSION%
 AchievementInfo.savedVars   = nil
 AchievementInfo.LangStore   = {}