diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 98fc6ad..4365947 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -4,3 +4,35 @@ services:
     build:
       context: .
       dockerfile: docker/tools.Dockerfile
+
+  bot:
+    build:
+      context: .
+      dockerfile: docker/bot.Dockerfile
+      target: build
+    image: cm-whatsapp-bot:dev
+    container_name: cmbot-bot
+    user: "${HOST_UID:-1000}:${HOST_GID:-1000}"
+    working_dir: /app
+    command: ["pnpm", "--filter", "@cmbot/bot", "dev"]
+    restart: unless-stopped
+    volumes:
+      - .:/app
+      - ./dev-data:/data
+    ports:
+      - "127.0.0.1:8081:8081"
+    environment:
+      NODE_ENV: development
+      DATABASE_URL: ${DATABASE_URL}
+      TELEGRAM_BOT_TOKEN: ${TELEGRAM_BOT_TOKEN}
+      TELEGRAM_OPERATOR_WHITELIST: ${TELEGRAM_OPERATOR_WHITELIST}
+      TELEGRAM_QR_CHAT_ID: ${TELEGRAM_QR_CHAT_ID}
+      DATA_DIR: ${DATA_DIR}
+      SESSIONS_DIR: ${SESSIONS_DIR}
+      MEDIA_DIR: ${MEDIA_DIR}
+      BOT_HEALTH_PORT: ${BOT_HEALTH_PORT}
+      BOT_LOG_LEVEL: ${BOT_LOG_LEVEL}
+    networks:
+      - cmbot
+    depends_on:
+      - tools
diff --git a/docker/bot.Dockerfile b/docker/bot.Dockerfile
new file mode 100644
index 0000000..1c4d0a5
--- /dev/null
+++ b/docker/bot.Dockerfile
@@ -0,0 +1,30 @@
+FROM node:22-alpine AS base
+RUN npm install -g pnpm@9.12.0
+WORKDIR /app
+
+FROM base AS deps
+COPY package.json pnpm-workspace.yaml pnpm-lock.yaml ./
+COPY apps/bot/package.json apps/bot/
+COPY packages/db/package.json packages/db/
+COPY packages/shared/package.json packages/shared/
+RUN pnpm install --frozen-lockfile
+
+FROM base AS build
+COPY --from=deps /app/node_modules /app/node_modules
+COPY --from=deps /app/apps/bot/node_modules /app/apps/bot/node_modules
+COPY --from=deps /app/packages/db/node_modules /app/packages/db/node_modules
+COPY --from=deps /app/packages/shared/node_modules /app/packages/shared/node_modules
+COPY tsconfig.base.json turbo.json ./
+COPY apps/bot apps/bot
+COPY packages/db packages/db
+COPY packages/shared packages/shared
+RUN pnpm --filter @cmbot/shared build && pnpm --filter @cmbot/db build && pnpm --filter @cmbot/bot build
+
+FROM base AS runtime
+ENV NODE_ENV=production
+COPY --from=build /app/node_modules /app/node_modules
+COPY --from=build /app/apps/bot /app/apps/bot
+COPY --from=build /app/packages/db /app/packages/db
+COPY --from=build /app/packages/shared /app/packages/shared
+EXPOSE 8081
+CMD ["node", "apps/bot/dist/index.js"]
diff --git a/docker/web.Dockerfile b/docker/web.Dockerfile
new file mode 100644
index 0000000..ff78c4c
--- /dev/null
+++ b/docker/web.Dockerfile
@@ -0,0 +1,3 @@
+FROM node:22-alpine
+WORKDIR /app
+CMD ["echo", "web service: not yet implemented (see plan 3)"]