diff --git a/.gitea/workflows/container.yml b/.gitea/workflows/container.yml
index fdeec3b..932f216 100644
--- a/.gitea/workflows/container.yml
+++ b/.gitea/workflows/container.yml
@@ -57,3 +57,10 @@ jobs:
           context: jumphost
           push: true
           tags: git.domainforge.de/public/jumphost:latest
+
+      - name: Build and push AoCBot Container
+        uses: docker/build-push-action@v2
+        with:
+          context: aocbot
+          push: true
+          tags: git.domainforge.de/public/aocbot:latest
diff --git a/aocbot/Dockerfile b/aocbot/Dockerfile
new file mode 100644
index 0000000..cdefc95
--- /dev/null
+++ b/aocbot/Dockerfile
@@ -0,0 +1,19 @@
+FROM python:3.12.7-slim-bookworm
+
+RUN apt-get update && \
+    apt-get -y upgrade && \
+    apt-get -y --purge autoremove && \
+    apt-get -y install python3 python3-venv git && \
+    apt-get -y clean && \
+    sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
+    locale-gen && \
+    groupadd -g 1000 aocbot && \
+    useradd -d /opt/aocbot -m -s /bin/bash -u 1000 -g 1000 aocbot && \
+    git clone https://git.domainforge.de/pennywise/aocbot.git /opt/aocbot && \
+    python3 -m venv /opt/venv && \
+    /opt/venv/bin/pip install -r /opt/aocbot/requirements.txt && \
+    chown -R 1000:1000 /opt/aocbot
+
+USER 1000
+
+CMD ["/opt/venv/bin/python3", "/opt/aocbot/aoc_bot.py"]