diff --git a/.gitea/workflows/build_dev.yaml b/.gitea/workflows/build_dev.yaml
new file mode 100644
index 00000000..fc1b35a7
--- /dev/null
+++ b/.gitea/workflows/build_dev.yaml
@@ -0,0 +1,29 @@
+name: Build on push
+run-name: Build on push
+on:
+  push:
+    branches:
+      - dev
+
+jobs:
+  prepare:
+    uses: ./.gitea/workflows/prepare.yaml
+    with:
+      version_suffix: 'dev'
+    secrets: inherit
+
+  core:
+    needs: prepare
+    uses: ./.gitea/workflows/package.yaml
+    defaults:
+      run:
+        working-directory: src/cpl_core
+    secrets: inherit
+
+  query:
+    needs: prepare
+    uses: ./.gitea/workflows/package.yaml
+    defaults:
+      run:
+        working-directory: src/cpl_query
+    secrets: inherit
\ No newline at end of file
diff --git a/.gitea/workflows/core_dev.yaml b/.gitea/workflows/core_dev.yaml
deleted file mode 100644
index 7e468e78..00000000
--- a/.gitea/workflows/core_dev.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: Build on push
-run-name: Build on push
-on:
-  push:
-    branches:
-      - dev
-
-jobs:
-  prepare:
-    uses: ./.gitea/workflows/prepare.yaml
-
-  build:
-    needs: prepare
-    uses: ./.gitea/workflows/package.yaml
\ No newline at end of file
diff --git a/.gitea/workflows/package.yaml b/.gitea/workflows/package.yaml
index d2fd07fc..e802e0f9 100644
--- a/.gitea/workflows/package.yaml
+++ b/.gitea/workflows/package.yaml
@@ -3,11 +3,15 @@ run-name: Build Python Package
 
 on:
   workflow_call:
+    inputs:
+      version_suffix:
+        description: 'Suffix for version (z.B. "dev", "alpha", "beta")'
+        required: false
+        type: string
 
 jobs:
   build:
     runs-on: [ runner ]
-    needs: prepare
     container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
     
     steps:
@@ -23,7 +27,12 @@ jobs:
 
       - name: Set version
         run: |
-          sed -i -E "s/^version = \".*\"/version = \"$(cat version.txt)-dev\"/" pyproject.toml
+          VERSION_SUFFIX="${{ inputs.version_suffix }}"
+          if [ -n "$VERSION_SUFFIX" ]; then
+            sed -i -E "s/^version = \".*\"/version = \"$(cat version.txt)-$VERSION_SUFFIX\"/" pyproject.toml
+          else
+            sed -i -E "s/^version = \".*\"/version = \"$(cat version.txt)\"/" pyproject.toml
+          fi
 
       - name: Install Dependencies
         run: |
@@ -33,15 +42,14 @@ jobs:
         run: |
           python -m build --sdist --wheel --outdir dist
 
-  upload:
-    - name: Login to registry git.sh-edraft.de
-      uses: https://github.com/docker/login-action@v1
-      with:
-        registry: git.sh-edraft.de
-        username: ${{ secrets.CI_USERNAME }}
-        password: ${{ secrets.CI_ACCESS_TOKEN }}
+      - name: Login to registry git.sh-edraft.de
+        uses: https://github.com/docker/login-action@v1
+        with:
+          registry: git.sh-edraft.de
+          username: ${{ secrets.CI_USERNAME }}
+          password: ${{ secrets.CI_ACCESS_TOKEN }}
 
-    - name: Push image
-      run: |
-        pip install twine
-        python -m twine upload --repository-url https://git.sh-edraft.de/api/packages/sh-edraft.de/pypi -u ${{ secrets.CI_USERNAME }} -p ${{ secrets.CI_ACCESS_TOKEN }} ./dist/*
\ No newline at end of file
+      - name: Push image
+        run: |
+          pip install twine
+          python -m twine upload --repository-url https://git.sh-edraft.de/api/packages/sh-edraft.de/pypi -u ${{ secrets.CI_USERNAME }} -p ${{ secrets.CI_ACCESS_TOKEN }} ./dist/*
\ No newline at end of file
diff --git a/.gitea/workflows/prepare.yaml b/.gitea/workflows/prepare.yaml
index bf78435c..0ef54f3a 100644
--- a/.gitea/workflows/prepare.yaml
+++ b/.gitea/workflows/prepare.yaml
@@ -3,9 +3,6 @@ run-name: Prepare Build Version
 
 on:
   workflow_call:
-    outputs:
-      build_version:
-        value: ${{ jobs.prepare.outputs.build_version }}
 
 jobs:
   prepare:
diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml
deleted file mode 100644
index cdd35796..00000000
--- a/.gitea/workflows/publish.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Publish Package
-run-name: Publish Python Package
-
-on:
-  workflow_call:
-
-jobs:
-  upload:
-    runs-on: [ runner ]
-    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
-    steps:
-      - name: Login to registry git.sh-edraft.de
-        uses: https://github.com/docker/login-action@v1
-        with:
-          registry: git.sh-edraft.de
-          username: ${{ secrets.CI_USERNAME }}
-          password: ${{ secrets.CI_ACCESS_TOKEN }}
-
-      - name: Push image
-        run: |
-          pip install twine
-          python -m twine upload --repository-url https://git.sh-edraft.de/api/packages/sh-edraft.de/pypi -u ${{ secrets.CI_USERNAME }} -p ${{ secrets.CI_ACCESS_TOKEN }} ./dist/*
\ No newline at end of file
diff --git a/src/cpl_core/pyproject.toml b/src/cpl_core/pyproject.toml
index f984dc5c..a0b1cbe1 100644
--- a/src/cpl_core/pyproject.toml
+++ b/src/cpl_core/pyproject.toml
@@ -24,6 +24,7 @@ dependencies = { file = ["requirements.txt"] }
 optional-dependencies.dev = { file = ["requirements.dev.txt"] }
 
 [tool.setuptools]
+packages = ["cpl_core"]
 include-package-data = true
 
 [tool.setuptools.packages.find]
diff --git a/src/cpl_query/pyproject.toml b/src/cpl_query/pyproject.toml
new file mode 100644
index 00000000..64ff60ba
--- /dev/null
+++ b/src/cpl_query/pyproject.toml
@@ -0,0 +1,36 @@
+[build-system]
+requires = ["setuptools>=70.1.0", "wheel>=0.43.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "cpl-query"
+version = "2024.7.0"
+description = "CPL query"
+readme = { text = "CPL query package" }
+requires-python = ">=3.12"
+license = { text = "MIT" }
+authors = [
+    { name = "Sven Heidemann", email = "sven.heidemann@sh-edraft.de" }
+]
+keywords = ["cpl", "query", "backend", "shared", "library"]
+
+dynamic = ["dependencies", "optional-dependencies"]
+
+[project.urls]
+Homepage = "https://www.sh-edraft.de"
+
+[tool.setuptools.dynamic]
+dependencies = { file = ["requirements.txt"] }
+optional-dependencies.dev = { file = ["requirements.dev.txt"] }
+
+[tool.setuptools]
+packages = ["cpl_query"]
+include-package-data = true
+
+[tool.setuptools.packages.find]
+include = ["*"]
+exclude = [
+    "*/__pycache__",
+    "*/logs",
+    "*/tests",
+]
diff --git a/src/cpl_query/requirements.txt b/src/cpl_query/requirements.txt
new file mode 100644
index 00000000..e69de29b