diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fc0e80965..dbf103dd6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Install Crystal
         uses: oprypin/install-crystal@v1.2.4
         with:
-          crystal: 0.35.1
+          crystal: 0.36.0
       
       - name: Cache Shards
         uses: actions/cache@v2
diff --git a/docker/Dockerfile b/docker/Dockerfile
index ce4cc7658..65b2b68e7 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM crystallang/crystal:0.35.1-alpine AS builder
+FROM crystallang/crystal:0.36.0-alpine AS builder
 RUN apk add --no-cache curl sqlite-static
 WORKDIR /invidious
 COPY ./shard.yml ./shard.yml
diff --git a/shard.yml b/shard.yml
index e0fa1d251..1f89b4687 100644
--- a/shard.yml
+++ b/shard.yml
@@ -29,6 +29,6 @@ dependencies:
     github: iv-org/lsquic.cr
     version: ~> 2.18.1-1
 
-crystal: 0.35.1
+crystal: 0.36.0
 
 license: AGPLv3