diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 29ebc6e..86ab32f 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -2,7 +2,10 @@ version: 2
 
 updates:
   - package-ecosystem: "docker"
-    directory: "/"
+    directories:
+      - "/"
+      - "/17"
+      - "/18"
     schedule:
       interval: "daily"
     open-pull-requests-limit: 5
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index cf40ead..b436bb3 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -14,6 +14,9 @@ permissions: read-all
 jobs:
   docker:
     runs-on: ubuntu-26.04
+    strategy:
+      matrix:
+        version: [17, 18]
 
     steps:
       - uses: actions/checkout@v7
@@ -24,8 +27,9 @@ jobs:
 
           docker compose --version
 
-      - name: Build kiwitcms/postgres
+      - name: Build kiwitcms/postgres:${{ matrix.version }}
+        working-directory: ${{ matrix.version }}
         run: |
-          docker build -t kiwitcms/postgres .
+          docker build -t kiwitcms/postgres:${{ matrix.version }} .
 
-          docker images --digests
+          docker images
diff --git a/Dockerfile b/17/Dockerfile
similarity index 100%
rename from Dockerfile
rename to 17/Dockerfile
diff --git a/18/Dockerfile b/18/Dockerfile
new file mode 100644
index 0000000..978c383
--- /dev/null
+++ b/18/Dockerfile
@@ -0,0 +1,11 @@
+FROM postgres:18@sha256:4aabea78cf39b90e834caf3af7d602a18565f6fe2508705c8d01aa63245c2e20
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends ca-certificates curl gnupg \
+    && curl -sSL https://keys.datadoghq.com/DATADOG_APT_KEY_CURRENT.public | gpg --dearmor --output /usr/share/keyrings/datadog-archive-keyring.gpg \
+    && echo "deb [signed-by=/usr/share/keyrings/datadog-archive-keyring.gpg] https://apt.datadoghq.com/ stable 7" > /etc/apt/sources.list.d/datadog.list \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends datadog-agent datadog-signing-keys \
+    && rm -rf /var/lib/apt/lists/*