diff --git a/torbrowser/.env b/torbrowser/.env
new file mode 100644
index 0000000..8865e86
--- /dev/null
+++ b/torbrowser/.env
@@ -0,0 +1,8 @@
+# MyVNC Tor Browser service
+MYVNC_TORBROWSER_PORT=
+MYVNC_TORBROWSER_VNCPASS=
+
+MYVNC_TORBROWSER_CUSTOM_TITLE=
+MYVNC_TORBROWSER_PROXYPATH=
+
+MYVNC_TORBROWSER_VNCSHARING=
diff --git a/torbrowser/20-torbrowser.sh b/torbrowser/20-torbrowser.sh
new file mode 100755
index 0000000..da5300d
--- /dev/null
+++ b/torbrowser/20-torbrowser.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+# i3/torbrowser startup
+install /dev/stdin ~/.config/i3/startapp.sh <<- startup
+#!/usr/bin/env bash
+# Run torbrowser
+while true
+do
+    /usr/bin/torbrowser-launcher
+done
+startup
diff --git a/torbrowser/Dockerfile b/torbrowser/Dockerfile
new file mode 100644
index 0000000..0a02cb8
--- /dev/null
+++ b/torbrowser/Dockerfile
@@ -0,0 +1,21 @@
+# syntax = docker/dockerfile:1
+FROM myvnc/arch/base:i3
+USER root
+
+# Build ARG: use "root" for debugging
+ARG debug
+ 
+# Install packages
+RUN --mount=type=cache,sharing=locked,target=/var/cache/pacman \
+    pacman -Syu --ask 4 --needed \
+    torbrowser-launcher \
+    && pacman -Scc --ask 4
+
+# Tigervnc
+COPY *.sh /app/init.d/
+
+# Default environment
+USER ${debug:-user}
+
+# Install torbrowser
+RUN /usr/bin/torbrowser-launcher
diff --git a/torbrowser/docker-compose.yaml b/torbrowser/docker-compose.yaml
new file mode 100644
index 0000000..224263a
--- /dev/null
+++ b/torbrowser/docker-compose.yaml
@@ -0,0 +1,24 @@
+services:
+  torbrowser:
+    image: myvnc/arch/torbrowser
+    container_name: torbrowser
+    restart: unless-stopped
+    build: .
+    # shm_size: 2gb
+    # security_opt:
+    #   - seccomp:unconfined
+    ports:
+      - ${MYVNC_TORBROWSER_PORT}:6900
+    environment:
+      MYVNC_VNCPASS: ${MYVNC_TORBROWSER_VNCPASS}
+
+      MYVNC_CUSTOM_TITLE: ${MYVNC_TORBROWSER_CUSTOM_TITLE}
+      MYVNC_PROXYPATH: ${MYVNC_TORBROWSER_PROXYPATH}
+
+      MYVNC_VNCSHARING: ${MYVNC_TORBROWSER_VNCSHARING}
+    networks:
+      - torbrowser
+
+networks:
+  torbrowser:
+    external: false
diff --git a/torbrowser/up b/torbrowser/up
new file mode 100755
index 0000000..fac9971
--- /dev/null
+++ b/torbrowser/up
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+# Docker build
+# Optional buildtag
+# DOCKER_BUILDKIT=1 \
+# docker build . \
+#     --build-arg debug=${debug:-""} \
+#     --tag ${buildtag:-myvnc/novnc}
+# Grab options
+while [ ${1} ]
+do
+    case ${1} in
+        -b | --build | b | build )
+            build="--build"
+            ;;
+        -d | --detach | d | detach )
+            detach="--detach"
+            ;;
+        bd | db )
+            build="--build"
+            detach="--detach"
+            ;;
+    esac
+    shift
+done
+
+# Compose up
+docker compose up ${build} ${detach}