diff --git a/.gitlab/ci/custom.images.yml b/.gitlab/ci/custom.images.yml
index 50ea18f..0eaf913 100644
--- a/.gitlab/ci/custom.images.yml
+++ b/.gitlab/ci/custom.images.yml
@@ -67,3 +67,6 @@ alpine-bash-jq-curl-git:
 # Used by frontend related tasks for linting GraphQL
 apollo:
   extends: .build_and_deploy
+
+zoekt-ci-image:
+  extends: .build_and_deploy
diff --git a/Dockerfile.zoekt-ci-image b/Dockerfile.zoekt-ci-image
new file mode 100644
index 0000000..c607a36
--- /dev/null
+++ b/Dockerfile.zoekt-ci-image
@@ -0,0 +1,16 @@
+FROM golang:1.19
+
+WORKDIR /usr/src/app
+
+RUN apt-get update && apt-get install -y universal-ctags git
+
+RUN git clone https://github.com/DylanGriffith/zoekt.git
+RUN cd /usr/src/app/zoekt && git checkout dynamic-indexserver-api && go install github.com/sourcegraph/zoekt/cmd/zoekt-dynamic-indexserver && go install github.com/sourcegraph/zoekt/cmd/zoekt-git-clone && go install github.com/sourcegraph/zoekt/cmd/zoekt-git-index
+RUN cd /usr/src/app/zoekt && git checkout search-api-with-reposbranches-filter && go install github.com/sourcegraph/zoekt/cmd/zoekt-webserver
+
+COPY assets/zoekt-ci-image/run-zoekt-servers run-zoekt-servers
+
+EXPOSE 6060
+EXPOSE 6070
+
+CMD ["sh", "run-zoekt-servers"]
diff --git a/assets/zoekt-ci-image/run-zoekt-servers b/assets/zoekt-ci-image/run-zoekt-servers
new file mode 100755
index 0000000..c5b3bdb
--- /dev/null
+++ b/assets/zoekt-ci-image/run-zoekt-servers
@@ -0,0 +1,5 @@
+#!/bin/sh -e
+
+zoekt-dynamic-indexserver -data_dir zoekt/test/data -index_dir zoekt/test/index -dynamic_server -listen :6060 &
+
+zoekt-webserver -index zoekt/test/index -rpc -listen :6070