diff --git a/.env b/.env
index 8b3c6fc..30b5044 100644
--- a/.env
+++ b/.env
@@ -107,3 +107,5 @@ BAZARR_EXTERNAL_PORT=6767
 BAZARR_INTERNAL_PORT=6767
 GLUETUN_JAPAN_INTERNAL_PORT=8888
 GLUETUN_JAPAN_EXTERNAL_PORT=8888
+HANDBRAKER_SERVER_INTERNAL_PORT=9999
+HANDBRAKER_SERVER_EXTERNAL_PORT=9997
diff --git a/docker-compose.yml b/docker-compose.yml
index e56217d..9aa091e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,6 +20,7 @@ include:
   - services/enshrouded.yml
   - services/7dtdserver.yml
   - services/gluetun.yml
+  - services/handbrake-server.yml
 
 services:
   caddy:
diff --git a/services/handbrake-server.yml b/services/handbrake-server.yml
new file mode 100644
index 0000000..9458b72
--- /dev/null
+++ b/services/handbrake-server.yml
@@ -0,0 +1,14 @@
+---
+services:
+  handbrake-server:
+    image: ghcr.io/thenickoftime/handbrake-web-server:latest
+    container_name: handbrake-server
+    user: 1000:100 # edit to run as user (uuid:guid) with permissions to access your media. 0:0 to run as root (not recommended).
+    networks:
+        public:
+          ipv4_address: 192.168.240.50
+    ports:
+      - "${HANDBRAKER_SERVER_EXTERNAL_PORT}:${HANDBRAKER_SERVER_INTERNAL_PORT}"
+    volumes:
+      - "${DOCKER_STORAGE_PATH}/handbrake-server/data:/data"
+      - "${STORAGE_PATH}:/video"