diff --git a/Cargo.lock b/Cargo.lock
index 6ab00b76..fc5e7e8b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -635,7 +635,7 @@ dependencies = [
 
 [[package]]
 name = "backend"
-version = "4.0.0-test.13"
+version = "4.0.0-test.14"
 dependencies = [
  "aes-kw",
  "anyhow",
@@ -879,7 +879,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chirpstack"
-version = "4.0.0-test.13"
+version = "4.0.0-test.14"
 dependencies = [
  "aes 0.7.5",
  "anyhow",
@@ -958,7 +958,7 @@ dependencies = [
 
 [[package]]
 name = "chirpstack_api"
-version = "4.0.0-test.13"
+version = "4.0.0-test.14"
 dependencies = [
  "hex",
  "pbjson",
@@ -2212,7 +2212,7 @@ dependencies = [
 
 [[package]]
 name = "lrwn"
-version = "4.0.0-test.13"
+version = "4.0.0-test.14"
 dependencies = [
  "aes 0.7.5",
  "anyhow",
diff --git a/Makefile b/Makefile
index 814b4eab..08197f7d 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,11 @@ version:
 	sed -i 's/"version.*/"version": "$(VERSION)",/g' ./api/js/package.json
 	sed -i 's/version.*/version = "$(VERSION)",/g' ./api/python/src/setup.py
 	sed -i 's/^version.*/version = "$(VERSION)"/g' ./api/rust/Cargo.toml
+	make test
+	git add .
+	git commit -v -m "Bump version to $(VERSION)"
+	git tag -a v$(VERSION) -m "v$(VERSION)"
+	git tag -a api/go/v$(VERSION) -m "api/go/v$(VERSION)"
 
 api: version
 	cd api && make
diff --git a/api/grpc-web/package.json b/api/grpc-web/package.json
index 29a22470..7cf922ff 100644
--- a/api/grpc-web/package.json
+++ b/api/grpc-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chirpstack/chirpstack-api-grpc-web",
-  "version": "4.0.0-test.13",
+  "version": "4.0.0-test.14",
   "description": "Chirpstack gRPC-web API",
   "license": "MIT",
   "devDependencies": {
diff --git a/api/js/package.json b/api/js/package.json
index 89de17e2..dde2007f 100644
--- a/api/js/package.json
+++ b/api/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chirpstack/chirpstack-api",
-  "version": "4.0.0-test.13",
+  "version": "4.0.0-test.14",
   "description": "Chirpstack JS and TS API",
   "license": "MIT",
   "devDependencies": {
diff --git a/api/python/src/setup.py b/api/python/src/setup.py
index 8c799786..f65631b6 100644
--- a/api/python/src/setup.py
+++ b/api/python/src/setup.py
@@ -18,7 +18,7 @@ CLASSIFIERS = [
 
 setup(
     name='chirpstack-api',
-    version = "4.0.0-test.13",
+    version = "4.0.0-test.14",
     url='https://github.com/brocaar/chirpstack-api',
     author='Orne Brocaar',
     author_email='info@brocaar.com',
diff --git a/api/rust/Cargo.toml b/api/rust/Cargo.toml
index 5b386030..bebfddd9 100644
--- a/api/rust/Cargo.toml
+++ b/api/rust/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "chirpstack_api"
 description = "ChirpStack Protobuf / gRPC API definitions."
-version = "4.0.0-test.13"
+version = "4.0.0-test.14"
 authors = ["Orne Brocaar <info@brocaar.com>"]
 license = "MIT"
 homepage = "https://www.chirpstack.io"
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 47577448..5c5f13d1 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "backend"
-version = "4.0.0-test.13"
+version = "4.0.0-test.14"
 authors = ["Orne Brocaar <info@brocaar.com>"]
 edition = "2018"
 publish = false
diff --git a/chirpstack/Cargo.toml b/chirpstack/Cargo.toml
index 588ea866..4e47f18f 100644
--- a/chirpstack/Cargo.toml
+++ b/chirpstack/Cargo.toml
@@ -3,7 +3,7 @@ name = "chirpstack"
 description = "ChirpStack is an open-source LoRaWAN(TM) Network Server"
 repository = "https://github.com/chirpstack/chirpstack"
 homepage="https://www.chirpstack.io/"
-version = "4.0.0-test.13"
+version = "4.0.0-test.14"
 authors = ["Orne Brocaar <info@brocaar.com>"]
 edition = "2021"
 publish = false
diff --git a/lrwn/Cargo.toml b/lrwn/Cargo.toml
index 8ddf41c5..867f0a18 100644
--- a/lrwn/Cargo.toml
+++ b/lrwn/Cargo.toml
@@ -3,7 +3,7 @@ name = "lrwn"
 description = "Library for encoding / decoding LoRaWAN frames."
 homepage = "https://www.chirpstack.io"
 license = "MIT"
-version = "4.0.0-test.13"
+version = "4.0.0-test.14"
 authors = ["Orne Brocaar <info@brocaar.com>"]
 edition = "2018"
 repository = "https://github.com/chirpstack/chirpstack"
diff --git a/ui/package.json b/ui/package.json
index f476dc72..cef9aa17 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chirpstack-ui",
-  "version": "4.0.0-test.13",
+  "version": "4.0.0-test.14",
   "private": true,
   "dependencies": {
     "@ant-design/colors": "^6.0.0",