diff --git a/CMakeModules/prepare_version_tag.cmake b/CMakeModules/prepare_version_tag.cmake
index 1a1517517eeb6f1a02b3d17c2774244c1067bb5e..3a862a5c18304eae36cf6ec0287ee90b6ff2718c 100644
--- a/CMakeModules/prepare_version_tag.cmake
+++ b/CMakeModules/prepare_version_tag.cmake
@@ -23,11 +23,15 @@ if (${BRANCH} STREQUAL "master")
     SET (ASAPO_VERSION ${ASAPO_TAG})
     SET (ASAPO_VERSION_COMMIT "")
     SET (ASAPO_VERSION_DOCKER_SUFFIX "")
+    SET (PYTHON_ASAPO_VERSION ${ASAPO_VERSION})
 else()
     SET (ASAPO_VERSION ${BRANCH})
     SET (ASAPO_VERSION_COMMIT ", build ${ASAPO_VERSION_COMMIT}")
     SET (ASAPO_VERSION_DOCKER_SUFFIX "-dev")
+    SET (PYTHON_ASAPO_VERSION 1.0.${ASAPO_VERSION})
+
 endif()
 
 message("Asapo Version: " ${ASAPO_VERSION})
+message("Python Asapo Version: " ${PYTHON_ASAPO_VERSION})
 message("Asapo commit: " ${ASAPO_VERSION_COMMIT})
diff --git a/consumer/api/python/asapo_consumer.pyx.in b/consumer/api/python/asapo_consumer.pyx.in
index 2b4978a8050742e9921e2c457b1e6f1ec44cb53e..679b699ccc1b597c14a1bf9dd91799f6ef9e240f 100644
--- a/consumer/api/python/asapo_consumer.pyx.in
+++ b/consumer/api/python/asapo_consumer.pyx.in
@@ -290,4 +290,4 @@ def create_server_broker(server_name,source_path,has_filesystem,beamtime_id,stre
     return factory.create_server_broker(_bytes(server_name),_bytes(source_path),has_filesystem, _bytes(beamtime_id),_bytes(stream),_bytes(token),timeout_ms)
 
 
-__version__ = "@ASAPO_VERSION@@ASAPO_VERSION_COMMIT@"
+__version__ = "@PYTHON_ASAPO_VERSION@@ASAPO_VERSION_COMMIT@"
diff --git a/consumer/api/python/binary_dist_windows/setup.py.in b/consumer/api/python/binary_dist_windows/setup.py.in
index f36079e2d70a30c344abb2daa11779230ca9e32a..d142f2f212f8790dd4e8cff707bcad001d928268 100644
--- a/consumer/api/python/binary_dist_windows/setup.py.in
+++ b/consumer/api/python/binary_dist_windows/setup.py.in
@@ -2,7 +2,7 @@ import setuptools
 
 setuptools.setup(
       name ="asapo_consumer",
-      version = "@ASAPO_VERSION@",
+      version = "@PYTHON_ASAPO_VERSION@",
       install_requires=['numpy'],
       include_package_data=True,
       packages=['asapo_consumer'],
diff --git a/consumer/api/python/source_dist_linux/setup.py.in b/consumer/api/python/source_dist_linux/setup.py.in
index f669a88b0a70c074ef95bb7ca7a20269936b334f..a171722aba0b394c126e6469cb7155adb19497e8 100644
--- a/consumer/api/python/source_dist_linux/setup.py.in
+++ b/consumer/api/python/source_dist_linux/setup.py.in
@@ -14,7 +14,7 @@ ext_modules = [
 setup(
       name ="asapo_consumer",
       ext_modules = ext_modules,
-      version = "@ASAPO_VERSION@",
+      version = "@PYTHON_ASAPO_VERSION@",
       setup_requires=["numpy"],
       install_requires=["numpy"]
       )
diff --git a/producer/api/python/asapo_producer.pyx.in b/producer/api/python/asapo_producer.pyx.in
index 7f28a27ec83901b6dc0c6fab9cef933efb69cf5e..38597a5547752b0e7694766b185a81931cac70a9 100644
--- a/producer/api/python/asapo_producer.pyx.in
+++ b/producer/api/python/asapo_producer.pyx.in
@@ -314,4 +314,4 @@ def create_producer(endpoint,beamtime_id,beamline,stream,token,nthreads,timeout_
     return PyProducer.__create_producer(_bytes(endpoint),_bytes(beamtime_id),_bytes(beamline),_bytes(stream),_bytes(token),nthreads,timeout_sec)
 
 
-__version__ = "@ASAPO_VERSION@@ASAPO_VERSION_COMMIT@"
+__version__ = "@PYTHON_ASAPO_VERSION@@ASAPO_VERSION_COMMIT@"
diff --git a/producer/api/python/binary_dist_windows/setup.py.in b/producer/api/python/binary_dist_windows/setup.py.in
index c606b81121a5dd828a0c29253e7d43e2e81b5b72..49769067d8ebabb998ebdff1b70d563d10b8c2e2 100644
--- a/producer/api/python/binary_dist_windows/setup.py.in
+++ b/producer/api/python/binary_dist_windows/setup.py.in
@@ -2,7 +2,7 @@ import setuptools
 
 setuptools.setup(
       name ="asapo_producer",
-      version = "@ASAPO_VERSION@",
+      version = "@PYTHON_ASAPO_VERSION@",
       install_requires=['numpy'],
       include_package_data=True,
       packages=['asapo_producer'],
diff --git a/producer/api/python/source_dist_linux/setup.py.in b/producer/api/python/source_dist_linux/setup.py.in
index d1f1987802410e8fdabd7463946d391e13446a89..b7b2f668176139cb2340e154644492fadc258f55 100644
--- a/producer/api/python/source_dist_linux/setup.py.in
+++ b/producer/api/python/source_dist_linux/setup.py.in
@@ -14,7 +14,7 @@ ext_modules = [
 setup(
       name ="asapo_producer",
       ext_modules = ext_modules,
-      version = "@ASAPO_VERSION@",
+      version = "@PYTHON_ASAPO_VERSION@",
       setup_requires=["numpy","cython>=0.28"],
       install_requires=["numpy","cython>=0.28"]
       )