diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6d9f5a58..d6e553f8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -49,7 +49,8 @@ jobs:
           - 1.18.2
           - 1.19.2
           - 1.20.3
-          - 1.21.0
+          - 1.21.1
+          - 1.22.0
         include:
           - crystal: nightly
             stable: false
@@ -139,7 +140,7 @@ jobs:
         id: lint_step_install_crystal
         uses: crystal-lang/install-crystal@v1.9.3
         with:
-          crystal: 1.20.3
+          crystal: 1.22.0
 
       - name: Cache Shards
         uses: actions/cache@v6
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 77309c0f..cf974d03 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,7 +2,7 @@
 ARG OPENSSL_VERSION='3.6.5'
 ARG OPENSSL_SHA256='a2157c2830efdec3788939b00c9b0638306d3f0bbb76dc4832ee503bb397df98'
 
-FROM 84codes/crystal:1.21.0-alpine AS dependabot-crystal
+FROM 84codes/crystal:1.22.0-alpine AS dependabot-crystal
 
 # We compile openssl ourselves due to a memory leak in how crystal interacts
 # with openssl