diff --git a/common/src/app/common/version.cljc b/common/src/app/common/version.cljc
index e73bd4269..20250bcf6 100644
--- a/common/src/app/common/version.cljc
+++ b/common/src/app/common/version.cljc
@@ -9,7 +9,7 @@
   (:require
    [cuerdas.core :as str]))
 
-(def version-re #"^(([A-Za-z]+)\-?)?((\d+)\.(\d+)\.(\d+))(\-?((alpha|prealpha|beta|rc|dev)(\d+)?))?(\-?(\d+))?(\-?g(\w+))$")
+(def version-re #"^(([A-Za-z]+)\-?)?((\d+)\.(\d+)\.(\d+))(\-?((RC|DEV)(\d+)?))?(\-?(\d+))?(\-?g(\w+))?$")
 
 (defn parse
   [data]
diff --git a/manage.sh b/manage.sh
index 9be90e1d3..aa1580d48 100755
--- a/manage.sh
+++ b/manage.sh
@@ -5,15 +5,12 @@ export DEVENV_IMGNAME="$ORGANIZATION/devenv";
 export DEVENV_PNAME="penpotdev";
 
 export CURRENT_USER_ID=$(id -u);
-export CURRENT_VERSION=$(cat ./version.txt);
 export CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD);
-export CURRENT_HASH=$(git rev-parse --short HEAD);
-export CURRENT_COMMITS=$(git rev-list --count HEAD)
 
 set -e
 
 function print-current-version {
-    echo -n "$CURRENT_VERSION-$CURRENT_COMMITS-g$CURRENT_HASH"
+    echo -n "$(git describe --tags --match "*.*.*")";
 }
 
 function build-devenv {
diff --git a/version.txt b/version.txt
deleted file mode 100644
index ccbccc3dc..000000000
--- a/version.txt
+++ /dev/null
@@ -1 +0,0 @@
-2.2.0