diff --git a/Build/Jenkins/release-neos-ui.sh b/Build/Jenkins/release-neos-ui.sh
index 786d0e4fb3..60005eebf8 100755
--- a/Build/Jenkins/release-neos-ui.sh
+++ b/Build/Jenkins/release-neos-ui.sh
@@ -44,7 +44,7 @@ make install
 # acutal release process
 
 # build
-make build-production
+make build-subpackages
 
 # code quality
 make lint
diff --git a/Build/Jenkins/update-neos-ui-compiled.sh b/Build/Jenkins/update-neos-ui-compiled.sh
index c4b891a1fd..39d9fabe85 100755
--- a/Build/Jenkins/update-neos-ui-compiled.sh
+++ b/Build/Jenkins/update-neos-ui-compiled.sh
@@ -35,7 +35,7 @@ export NODE_OPTIONS="--max-old-space-size=4096"
 
 nvm install && nvm use
 make clean && make setup
-make build-production
+NEOS_UI_VERSION="${GIT_TAG:-${GIT_BRANCH}-dev}" make build-production
 
 rm -Rf tmp_compiled_pkg
 git clone git@github.com:neos/neos-ui-compiled.git tmp_compiled_pkg
diff --git a/Makefile b/Makefile
index a00a4dcea1..ff679ff56b 100644
--- a/Makefile
+++ b/Makefile
@@ -144,7 +144,7 @@ called-with-version:
 ifeq ($(VERSION),)
 	@echo No version information given.
 	@echo Please run this command like this:
-	@echo VERSION=1.0.0 make bump-version
+	@echo VERSION=9.0.0 make ...
 	@false
 endif
 
diff --git a/esbuild.js b/esbuild.js
index afcd34747e..5a77b17f00 100644
--- a/esbuild.js
+++ b/esbuild.js
@@ -2,13 +2,14 @@ const {sep} = require('path')
 const {compileWithCssVariables} = require('./cssVariables');
 const {cssModules} = require('./cssModules');
 const esbuild = require('esbuild');
-const { version } = require('./package.json')
 
 const isProduction = process.argv.includes('--production');
 const isE2ETesting = process.argv.includes('--e2e-testing');
 const isWatch = process.argv.includes('--watch');
 const isAnalyze = process.argv.includes('--analyze');
 
+const NEOS_UI_VERSION = process.env.NEOS_UI_VERSION ?? (isProduction ? 'production-build' : 'dev')
+
 if (isE2ETesting) {
     console.log('Building for E2E testing');
 }
@@ -93,7 +94,7 @@ const options = {
     ],
     define: {
         // we dont declare `global = window` as we want to control everything and notice it, when something is odd
-        NEOS_UI_VERSION: JSON.stringify(isProduction ? `v${version}` : `v${version}-dev`)
+        NEOS_UI_VERSION: JSON.stringify(NEOS_UI_VERSION)
     }
 }