diff --git a/.forgejo/workflows/build-with-app-image.yaml b/.forgejo/workflows/build-with-app-image.yaml
index aa4903f..041e273 100644
--- a/.forgejo/workflows/build-with-app-image.yaml
+++ b/.forgejo/workflows/build-with-app-image.yaml
@@ -58,7 +58,7 @@ jobs:
           mkdir $HOME/.docker
           echo "{ \"auths\": {} }" > $HOME/.docker/config.json
 
-      - name: Log in to container registry
+      - name: Log in to container registry (with another workaround)
         uses: actions/podman-login@v1
         with:
           registry: ${{ vars.REGISTRY }}
diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml
index 74d96dc..f232619 100644
--- a/.forgejo/workflows/build.yaml
+++ b/.forgejo/workflows/build.yaml
@@ -27,10 +27,9 @@ jobs:
 
       - uses: actions/checkout@v4
 
-      - name: Create venv
-        run: uv venv
-      - name: Install dependencies
-        run: uv sync
+      #- name: Install dependencies
+      #  run: uv sync
+
       - name: Run basic test (bootstrap)
         run: pytest -s tests/basic.py
 
@@ -39,7 +38,7 @@ jobs:
           mkdir $HOME/.docker
           echo "{ \"auths\": {} }" > $HOME/.docker/config.json
 
-      - name: Log in to container registry
+      - name: Log in to container registry (with another workaround)
         uses: actions/podman-login@v1
         with:
           registry: ${{ vars.REGISTRY }}
diff --git a/Containerfile b/Containerfile
index 65aaae1..4a118cd 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,7 +1,4 @@
-FROM localhost/trixie_python
-
-ENV PYTHONPATH $UV_PROJECT_ENVIRONMENT/lib/python3.12/site-packages
-ENV PATH=/app/bin:$PATH
+FROM localhost/treetrail-backend-base
 
 RUN <<EOT
 groupadd -r app
diff --git a/Containerfile.base b/Containerfile.base
index 85bb5fb..ed9c5b4 100644
--- a/Containerfile.base
+++ b/Containerfile.base
@@ -1,3 +1,5 @@
+# Build: podman build -t treetrail-backend-base -f Containerfile.base
+
 FROM localhost/treetrail-backend-deps
 
 ENV PYTHONPATH $UV_PROJECT_ENVIRONMENT/lib/python3.12/site-packages
@@ -5,8 +7,10 @@ ENV PYTHONPATH $UV_PROJECT_ENVIRONMENT/lib/python3.12/site-packages
 COPY . /src
 
 RUN --mount=type=cache,target=/root/.cache \
-  cd /src && uv sync --locked --no-dev --no-editable
-  #uv pip install \
-  #    --python=$UV_PROJECT_ENVIRONMENT \
-  #    --no-deps \
-  #    /src
+  cd /src && \
+  uv sync --locked --no-dev --no-editable
+
+#uv pip install \
+#    --python=$UV_PROJECT_ENVIRONMENT \
+#    --no-deps \
+#    /src
diff --git a/Containerfile.ci b/Containerfile.ci
deleted file mode 100644
index 78b9baa..0000000
--- a/Containerfile.ci
+++ /dev/null
@@ -1,8 +0,0 @@
-# Build: podman build -t localhost/python-ci -f Containerfile.ci 
-FROM localhost/trixie_python
-
-RUN apt-get -y --no-install-recommends install nodejs git python3-pytest && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/listsd/* && \
-    rm -rf /root/.cache
-
diff --git a/Containerfile.deps b/Containerfile.deps
index c1c3165..665020c 100644
--- a/Containerfile.deps
+++ b/Containerfile.deps
@@ -1,6 +1,6 @@
-FROM localhost/trixie_python AS build
+# Build: podman build -t treetrail-backend-deps -f Containerfile.deps
 
-ENV PATH=/app/bin:$PATH
+FROM localhost/trixie_python
 
 COPY ./pyproject.toml ./README.md ./uv.lock /_lock/
 
diff --git a/Containerfile.for_runner b/Containerfile.for_runner
index cdbdc41..71eef99 100644
--- a/Containerfile.for_runner
+++ b/Containerfile.for_runner
@@ -6,7 +6,7 @@ WORKDIR /app
 ENV PYTHONPATH $UV_PROJECT_ENVIRONMENT/lib/python3.12/site-packages
 
 COPY --from=tiptop:5000/treetrail_backend_deps /app /app
-COPY --from=tiptop:5000/treetrail_backend_deps /var/lib/treetrail/ /var/lib/treetrail
+#COPY --from=tiptop:5000/treetrail_backend_deps /var/lib/treetrail/ /var/lib/treetrail
 COPY ./treetrail ./pyproject.toml ./README.md ./
 
 # Instances should override the prod.yaml file
diff --git a/build.yaml b/build.yaml
new file mode 100644
index 0000000..6427ca6
--- /dev/null
+++ b/build.yaml
@@ -0,0 +1,62 @@
+- name: Build containers
+  hosts: localhost
+  gather_facts: false
+  vars:
+    force: false
+    force_rm: false
+    cache: false
+    repository: tiptop:5000
+
+  tasks:
+    #- name: Read conf
+    #  ansible.builtin.include_vars:
+    #    file: prod.yaml
+    #    name: conf
+
+    - name: Using the variables
+      ansible.builtin.debug:
+        var: force_rm
+
+    - name: Build the base image, only with python dependencies
+      containers.podman.podman_image:
+        name: treetrail-backend-deps
+        state: build
+        path: "{{ playbook_dir }}"
+        build:
+          format: oci
+          force_rm: "{{ force_rm }}"
+          cache: "{{ cache }}"
+          file: Containerfile.deps
+        push: true
+        push_args:
+          dest: "{{ repository }}/treetrail-backend-deps"
+
+    - name: Build a backend base container image, with sources in /src
+      containers.podman.podman_image:
+        name: treetrail-backend-base
+        state: build
+        force: "{{ force }}"
+        path: "{{ playbook_dir }}"
+        build:
+          format: oci
+          force_rm: "{{ force_rm }}"
+          cache: "{{ cache }}"
+          file: Containerfile.base
+        push: true
+        push_args:
+          dest: "{{ repository }}/treetrail-backend-base"
+
+    - name: Build the prod container image
+      containers.podman.podman_image:
+        name: treetrail-backend
+        state: build
+        force: "{{ force }}"
+        path: "{{ playbook_dir }}"
+        build:
+          format: oci
+          force_rm: "{{ force_rm }}"
+          cache: "{{ cache }}"
+          file: Containerfile
+        push: true
+        push_args:
+          dest: "{{ repository }}/treetrail-backend"