diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca808fb..9749234 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Changed
 - Bumped dependencies
+- Add tini to Docker image to reap zombie processes
 
 ## [2.0.2] - 2022-05-14
 ### Changed
diff --git a/Dockerfile b/Dockerfile
index 8f88a35..51c8a28 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM node:16.13.0 AS base
 
 # Install ffmpeg
 RUN apt-get update && \
-    apt-get install -y ffmpeg && \
+    apt-get install -y ffmpeg tini && \
     rm -rf /var/lib/apt/lists/*
 
 # Install dependencies
@@ -34,4 +34,5 @@ ENV NODE_ENV production
 ENV COMMIT_HASH $COMMIT_HASH
 ENV BUILD_DATE $BUILD_DATE
 
-CMD ["yarn", "start"]
+CMD ["tini", "--", "yarn", "start"]
+