diff --git a/Containerfile.aiosmtpd b/Containerfile.aiosmtpd
new file mode 100644
index 0000000..573452b
--- /dev/null
+++ b/Containerfile.aiosmtpd
@@ -0,0 +1,7 @@
+#!/usr/bin/env -S podman build -t code.philo.ydns.eu/philorg/aiosmtpd -f Containerfile.aiosmtpd
+
+FROM python:alpine
+
+RUN --mount=from=ghcr.io/astral-sh/uv,source=/uv,target=/bin/uv uv pip install --system aiosmtpd
+
+ENTRYPOINT ["aiosmtpd", "-n"]
diff --git a/Containerfile.ci b/Containerfile.ci
deleted file mode 100644
index 9cb5f78..0000000
--- a/Containerfile.ci
+++ /dev/null
@@ -1,8 +0,0 @@
-# Build: podman build -t code.philo.ydns.eu/philorg/python-ci -f Containerfile.ci 
-FROM code.philo.ydns.eu/philorg/trixie_python:latest
-
-RUN apt-get -y --no-install-recommends install nodejs git python3-pytest python3-httpx buildah podman curl && \
-  apt-get clean && \
-  rm -rf /var/lib/apt/listsd/* && \
-  rm -rf /root/.cache
-
diff --git a/Containerfile.git b/Containerfile.git
new file mode 100644
index 0000000..aab43af
--- /dev/null
+++ b/Containerfile.git
@@ -0,0 +1,7 @@
+#!/usr/bin/env -S podman build -t code.philo.ydns.eu/philorg/git -f Containerfile.git
+
+FROM docker.io/alpine
+
+RUN apk add --no-cache git
+
+ENTRYPOINT ["git"]
diff --git a/Containerfile.pnpm b/Containerfile.pnpm
new file mode 100644
index 0000000..eb5f48e
--- /dev/null
+++ b/Containerfile.pnpm
@@ -0,0 +1,6 @@
+#!/usr/bin/env -S podman build -t code.philo.ydns.eu/philorg/pnpm -f Containerfile.pnpm
+
+FROM docker.io/node:alpine
+RUN npm install -g pnpm
+ENTRYPOINT [ "pnpm" ]
+CMD [ "i" ]
diff --git a/Containerfile.pnpm-deb b/Containerfile.pnpm-deb
new file mode 100644
index 0000000..3d3b58c
--- /dev/null
+++ b/Containerfile.pnpm-deb
@@ -0,0 +1,6 @@
+#!/usr/bin/env -S podman build -t code.philo.ydns.eu/philorg/pnpm-deb -f Containerfile.pnpm-deb
+
+FROM docker.io/node:slim
+RUN npm install -g pnpm
+ENTRYPOINT [ "pnpm" ]
+CMD [ "i" ]
diff --git a/Containerfile.podman b/Containerfile.podman
new file mode 100644
index 0000000..e7106c2
--- /dev/null
+++ b/Containerfile.podman
@@ -0,0 +1,7 @@
+#!/usr/bin/env -S podman build -t code.philo.ydns.eu/philorg/podman -f Containerfile.podman
+
+FROM node:alpine
+
+RUN apk add --no-cache podman fuse-overlayfs
+
+ENTRYPOINT ["podman"]
diff --git a/Containerfile.podman-geo b/Containerfile.podman-geo
new file mode 100644
index 0000000..a1fd467
--- /dev/null
+++ b/Containerfile.podman-geo
@@ -0,0 +1,4 @@
+#!/usr/bin/env -S podman build -t code.philo.ydns.eu/philorg/podman-geo -f Containerfile.podman-geo
+FROM quay.io/podman/stable:latest
+
+RUN apk add --no-cache proj-util
diff --git a/Containerfile.python-git b/Containerfile.python-git
new file mode 100644
index 0000000..4515067
--- /dev/null
+++ b/Containerfile.python-git
@@ -0,0 +1,5 @@
+#!/usr/bin/env -S podman build -t code.philo.ydns.eu/philorg/python-git -f Containerfile.python-git 
+
+FROM docker.io/python:alpine
+
+RUN apk add --no-cache git
diff --git a/Containerfile.trixie_python b/Containerfile.trixie_python
deleted file mode 100644
index 89d3f07..0000000
--- a/Containerfile.trixie_python
+++ /dev/null
@@ -1,23 +0,0 @@
-# Build: podman build -t code.philo.ydns.eu/philorg/trixie_python -f Containerfile.trixie_python 
-
-FROM docker.io/debian:trixie-slim
-
-RUN <<EOT
-apt-get update -qy
-apt-get install -qyy \
-    -o APT::Install-Recommends=false \
-    -o APT::Install-Suggests=false \
-    ca-certificates \
-    python-is-python3
-apt-get clean
-EOT
-
-COPY --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/uv
-
-ENV UV_LINK_MODE=copy \
-  UV_COMPILE_BYTECODE=1 \
-  UV_PYTHON_DOWNLOADS=never \
-  #UV_PYTHON=python3.12 \
-  UV_PROJECT_ENVIRONMENT=/app \
-  PYTHONPATH=/app/lib/python3.12/site-packages \
-  PATH=/app/bin:$PATH
diff --git a/Containerfile.uv b/Containerfile.uv
new file mode 100644
index 0000000..c26890c
--- /dev/null
+++ b/Containerfile.uv
@@ -0,0 +1,4 @@
+#!/usr/bin/env -S podman build -t code.philo.ydns.eu/philorg/uv -f Containerfile.uv
+FROM ghcr.io/astral-sh/uv:python3.13-alpine
+
+RUN apk add --no-cache git
diff --git a/Containerfile.uv-geo b/Containerfile.uv-geo
new file mode 100644
index 0000000..6fc26fe
--- /dev/null
+++ b/Containerfile.uv-geo
@@ -0,0 +1,5 @@
+#!/usr/bin/env -S podman build -t code.philo.ydns.eu/philorg/uv-geo -f Containerfile.uv-geo
+FROM python:slim
+
+RUN apt-get update && apt-get install -y git
+COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/