diff --git a/setup.py b/setup.py
index 2beab12d939d93063e2be7e9d9c59c83ee940848..9dde22e091fb7ea2e859c9aee9748e2d8b66c6fd 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,6 @@ import subprocess
 import os
 import requests
 import semver
-
         
 vers = requests.get(f"{os.environ.get('NETDB_SCHEME', 'https')}://{os.environ.get('NETDB_ENDPOINT')}").json()[0]
 largest_ver = None
@@ -13,10 +12,14 @@ for v in vers:
     if largest_ver is None or largest_ver < sem_v:
         largest_ver = sem_v 
 
+def get_gen_version():
+    ver = subprocess.run(["pip freeze | grep net_api_generator"], shell=True, text=True, check=True, capture_output=True).stdout
+    return ver.split('@')[-1][:12]
+
 class APIGenBuild(build_py):
     def run(self):
         build_versions = [f'{v["major"]}.{v["minor"]}' for v in vers]
-        default_version = f'{largest_ver.major}.0'
+        default_version = f'{largest_ver.major}.{largest_ver.minor}'
         environ = os.environ.copy()
         for version in build_versions:
             target_dir = os.path.join(self.build_lib, 'netdb_client', f"api{version.replace('.', '')}")
@@ -30,7 +33,7 @@ class APIGenBuild(build_py):
 
 setup(
     name='netdb_client',
-    version=f'{str(largest_ver)}{".dev1" if os.environ.get("CI_COMMIT_BRANCH", "local") == "devel" else ""}+{os.environ.get("CI_COMMIT_BRANCH", "local")}.{os.environ.get("CI_COMMIT_SHORT_SHA", "HEAD")}',
+    version=f'{str(largest_ver)}{".dev1" if os.environ.get("CI_COMMIT_BRANCH", "local") == "devel" else ""}+{os.environ.get("CI_COMMIT_BRANCH", "local")}.{os.environ.get("CI_COMMIT_SHORT_SHA", "HEAD")}.{get_gen_version()}',
     author='NETVS-Team <netvs@scc.kit.edu>',
     description='This is a meta package to install the automatically generated NET-API definitions for the currently supported API versions.',
     url='https://git.scc.kit.edu/scc-net/net-suite/netdb-client-lib',