diff --git a/.forgejo/workflows/test_and_build.yaml b/.forgejo/workflows/test_and_build.yaml
index 21ff1f2..ef91b7c 100644
--- a/.forgejo/workflows/test_and_build.yaml
+++ b/.forgejo/workflows/test_and_build.yaml
@@ -72,6 +72,16 @@ jobs:
           VERSION: ${{ steps.version.outputs.version }}
         run: sed "s/0.0.0/${VERSION}/" -i pyproject.toml
 
+      - name: Build python package
+        if: fromJSON(steps.builder.outputs.run)
+        run: uv build --wheel
+
+      - name: Publish Python package (home)
+        if: fromJSON(steps.builder.outputs.run)
+        env:
+          LOCAL_PYPI_TOKEN: ${{ secrets.LOCAL_PYPI_TOKEN }}
+        run: uv publish --publish-url https://code.philo.ydns.eu/api/packages/philorg/pypi --token $LOCAL_PYPI_TOKEN
+
       - name: Workaround for bug of podman-login
         if: fromJSON(steps.builder.outputs.run)
         run: |
@@ -107,18 +117,3 @@ jobs:
           registry: "docker://${{ vars.REGISTRY }}/${{ vars.ORGANISATION }}"
           image: treetrail-backend
           tags: ${{ steps.version.outputs.version }}
-
-      - name: Install uv
-        uses: astral-sh/setup-uv@4
-        with:
-          version: "0.5.5"
-
-      - name: Build python package
-        if: fromJSON(steps.builder.outputs.run)
-        run: uv build --wheel
-
-      - name: Publish Python package (home)
-        if: fromJSON(steps.builder.outputs.run)
-        env:
-          LOCAL_PYPI_TOKEN: ${{ secrets.LOCAL_PYPI_TOKEN }}
-        run: uv publish --publish-url https://code.philo.ydns.eu/api/packages/philorg/pypi --token $LOCAL_PYPI_TOKEN
diff --git a/Containerfile.database b/Containerfile.database
deleted file mode 100644
index 5145954..0000000
--- a/Containerfile.database
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM docker.io/postgis/postgis:17-3.5-alpine
-
-ENV POSTGRES_USER treetrail
-ENV POSTGRES_PASSWORD treetrail
diff --git a/build.yaml b/build.yaml
index 600f96a..92eaf0d 100644
--- a/build.yaml
+++ b/build.yaml
@@ -13,37 +13,17 @@
     #    file: prod.yaml
     #    name: conf
 
-    - name: Build the database image
-      tags: db
-      containers.podman.podman_image:
-        name: treetrail-database
-        state: build
-        path: "{{ playbook_dir }}"
-        build:
-          format: oci
-          force_rm: "{{ force_rm }}"
-          cache: "{{ cache }}"
-          file: Containerfile.database
-        push: true
-        push_args:
-          dest: "{{ repository }}/{{ organisation }}"
-
     - name: Using the variables
       ansible.builtin.debug:
         var: force_rm
 
     - name: Get the version from git
-      tags:
-        - ci
-        - deps
-        - backend
       command: git describe --dirty --tags
       register: version
       args:
         chdir: "{{ playbook_dir }}"
 
     - name: Build the base CI image
-      tags: ci
       containers.podman.podman_image:
         name: treetrail-backend-ci
         tag: "{{ version.stdout }}"
@@ -56,10 +36,9 @@
           file: Containerfile.ci
         push: true
         push_args:
-          dest: "{{ repository }}/{{ organisation }}"
+          dest: "{{ repository }}/{{ organisation }}/treetrail-backend-ci"
 
     - name: Build the base image, only with python dependencies
-      tags: deps
       containers.podman.podman_image:
         name: treetrail-backend-deps
         tag: "{{ version.stdout }}"
@@ -75,7 +54,6 @@
           dest: "{{ repository }}/{{ organisation }}"
 
     - name: Build the backend container image
-      tags: backend
       containers.podman.podman_image:
         name: treetrail-backend
         tag: "{{ version.stdout }}"