diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 02ea00f..965addb 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -25,18 +25,21 @@ jobs:
       - name: Build base image
         run: docker compose build base
 
-      - name: Build base-dependent images
+      - name: Build base dependent images
         run: docker compose build mdbook shell-*
 
       - name: Build shell-* dependent image
         run: docker compose build shell
 
+      - name: Build shell dependent image
+        run: docker compose build vhs
+
       - name: Upload the images
         run: |
           tag=latest
           [[ "$GITHUB_REF" =~ ^refs/tags/ ]] && tag="${GITHUB_REF/refs\/tags\//}"
           docker image tag ghcr.io/carapace-sh/base             ghcr.io/carapace-sh/base:${tag}
-          docker image tag ghcr.io/carapace-sh/mdbook            ghcr.io/carapace-sh/mdbook:${tag}
+          docker image tag ghcr.io/carapace-sh/mdbook           ghcr.io/carapace-sh/mdbook:${tag}
           docker image tag ghcr.io/carapace-sh/shell-bash-ble   ghcr.io/carapace-sh/shell-bash-ble:${tag}
           docker image tag ghcr.io/carapace-sh/shell-elvish     ghcr.io/carapace-sh/shell-elvish:${tag}
           docker image tag ghcr.io/carapace-sh/shell-fish       ghcr.io/carapace-sh/shell-fish:${tag}
@@ -46,6 +49,7 @@ jobs:
           docker image tag ghcr.io/carapace-sh/shell-xonsh      ghcr.io/carapace-sh/shell-xonsh:${tag}
           docker image tag ghcr.io/carapace-sh/shell-zsh        ghcr.io/carapace-sh/shell-zsh:${tag}
           docker image tag ghcr.io/carapace-sh/shell            ghcr.io/carapace-sh/shell:${tag}
+          docker image tag ghcr.io/carapace-sh/vhs              ghcr.io/carapace-sh/vhs:${tag}
 
           docker image push ghcr.io/carapace-sh/base:${tag}
           docker image push ghcr.io/carapace-sh/mdbook:${tag}
@@ -58,3 +62,4 @@ jobs:
           docker image push ghcr.io/carapace-sh/shell-xonsh:${tag}
           docker image push ghcr.io/carapace-sh/shell-zsh:${tag}
           docker image push ghcr.io/carapace-sh/shell:${tag}
+          docker image push ghcr.io/carapace-sh/vhs:${tag}
diff --git a/compose.yaml b/compose.yaml
index 714a43d..c541357 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -43,3 +43,7 @@ services:
   shell:
     build: shell
     image: ghcr.io/carapace-sh/shell
+
+  vhs:
+    build: vhs
+    image: ghcr.io/carapace-sh/vhs
diff --git a/vhs/Dockerfile b/vhs/Dockerfile
new file mode 100644
index 0000000..3afbed2
--- /dev/null
+++ b/vhs/Dockerfile
@@ -0,0 +1,9 @@
+FROM ghcr.io/carapace-sh/shell
+
+RUN apt-get update && apt-get install -y chromium ffmpeg fonts-jetbrains-mono git
+
+RUN git clone https://github.com/rsteube/vhs --depth 1 \
+ && cd vhs \
+ && GOBIN=/usr/local/bin/ go install
+
+ENV VHS_NO_SANDBOX 1