diff --git a/.drone.yml b/.drone.yml
index bb82576..025f7ce 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4,7 +4,7 @@ name: check
 
 services:
   - name: postgres
-    image: docker.io/library/postgres:17.2
+    image: docker.io/library/postgres:17.5
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
@@ -35,7 +35,7 @@ steps:
       - mix credo
 
   - name: wait_for_postgres
-    image: docker.io/library/postgres:17.2
+    image: docker.io/library/postgres:17.5
     commands:
       # Wait for postgres to become available
       - |
@@ -81,7 +81,7 @@ environment:
 
 steps:
   - name: renovate
-    image: renovate/renovate:39.264
+    image: renovate/renovate:40.22
     environment:
       RENOVATE_CONFIG_FILE: "renovate_backend_config.js"
       RENOVATE_TOKEN:
diff --git a/Dockerfile b/Dockerfile
index 60e0c6b..5503e2e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,12 +11,8 @@
 #   - https://pkgs.org/ - resource for finding needed packages
 #   - Ex: hexpm/elixir:1.18.3-erlang-27.3-debian-bullseye-20250317-slim
 #
-ARG ELIXIR_VERSION=1.18.3
-ARG OTP_VERSION=27.3
-ARG DEBIAN_VERSION=bullseye-20250317-slim
-
-ARG BUILDER_IMAGE="hexpm/elixir:${ELIXIR_VERSION}-erlang-${OTP_VERSION}-debian-${DEBIAN_VERSION}"
-ARG RUNNER_IMAGE="debian:${DEBIAN_VERSION}"
+ARG BUILDER_IMAGE="hexpm/elixir:1.18.3-erlang-27.3-debian-bullseye-20250317-slim"
+ARG RUNNER_IMAGE="debian:bullseye-20250317-slim"
 
 FROM ${BUILDER_IMAGE} as builder
 
diff --git a/renovate.json b/renovate.json
index 3b89620..7e12828 100644
--- a/renovate.json
+++ b/renovate.json
@@ -13,11 +13,12 @@
     {
       "groupName": "postgres",
       "description": "Group updates to postgres across drone ci, docker-compose.yml and other files",
-      "matchDepNames": ["postgres"]
+      "matchPackageNames": ["postgres", "docker.io/library/postgres"],
+      "matchDatasources": ["docker"]
     },
     {
-      "matchFileNames": [".tool-versions"],
-      "matchPackageNames": ["elixir"],
+      "matchFileNames": [".tool-versions", "Dockerfile"],
+      "matchCurrentValue": "**-otp-**",
       "enabled": false
     }
   ]