diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b28873d1..847342f7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -38,11 +38,11 @@ jobs:
       matrix:
         stable: [true]
         crystal:
-          - 1.12.2
-          - 1.13.3
           - 1.14.1
           - 1.15.1
           - 1.16.3
+          - 1.17.1
+          - 1.18.2
         include:
           - crystal: nightly
             stable: false
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3e0d2f7f..383a60ec 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,7 +2,7 @@
 ARG OPENSSL_VERSION='3.5.2'
 ARG OPENSSL_SHA256='c53a47e5e441c930c3928cf7bf6fb00e5d129b630e0aa873b08258656e7345ec'
 
-FROM crystallang/crystal:1.16.3-alpine AS dependabot-crystal
+FROM crystallang/crystal:1.18.2-alpine AS dependabot-crystal
 
 # We compile openssl ourselves due to a memory leak in how crystal interacts
 # with openssl
@@ -61,7 +61,7 @@ RUN --mount=type=cache,target=/root/.cache/crystal if [[ "${release}" == 1 ]] ;
         --link-flags "-lxml2 -llzma"; \
     fi
 
-FROM alpine:3.21
+FROM alpine:3.23
 RUN apk add --no-cache rsvg-convert ttf-opensans tini tzdata
 WORKDIR /invidious
 RUN addgroup -g 1000 -S invidious && \
diff --git a/docker/Dockerfile.arm64 b/docker/Dockerfile.arm64
index b02cc8ce..8508d4fa 100644
--- a/docker/Dockerfile.arm64
+++ b/docker/Dockerfile.arm64
@@ -2,7 +2,7 @@
 ARG OPENSSL_VERSION='3.5.2'
 ARG OPENSSL_SHA256='c53a47e5e441c930c3928cf7bf6fb00e5d129b630e0aa873b08258656e7345ec'
 
-FROM alpine:3.21 AS dependabot-alpine
+FROM alpine:3.23 AS dependabot-alpine
 
 # We compile openssl ourselves due to a memory leak in how crystal interacts
 # with openssl
@@ -21,8 +21,11 @@ RUN tar -xzvf openssl-${OPENSSL_VERSION}.tar.gz
 RUN cd openssl-${OPENSSL_VERSION} && ./Configure --openssldir=/etc/ssl && make -j$(nproc)
 
 FROM dependabot-alpine AS builder
-RUN apk add --no-cache 'crystal=1.14.0-r0' shards sqlite-static yaml-static yaml-dev libxml2-static \
-       zlib-static musl-dev xz-static
+RUN apk add --no-cache 'crystal=1.18.2-r0' shards \
+        sqlite-static yaml-static yaml-dev \
+        pcre2-static gc-static \
+        libxml2-static zlib-static \
+        openssl-libs-static openssl-dev musl-dev xz-static
 
 ARG release
 
@@ -60,7 +63,7 @@ RUN --mount=type=cache,target=/root/.cache/crystal if [[ "${release}" == 1 ]] ;
         --link-flags "-lxml2 -llzma"; \
     fi
 
-FROM alpine:3.21
+FROM alpine:3.23
 RUN apk add --no-cache rsvg-convert ttf-opensans tini tzdata
 WORKDIR /invidious
 RUN addgroup -g 1000 -S invidious && \