diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ae40491..c4dd9d2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,3 +9,16 @@ build:
   - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
   - if [ $CI_COMMIT_BRANCH == "master" ]; then docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA $CI_REGISTRY_IMAGE:latest && docker push $CI_REGISTRY_IMAGE:latest; fi
   - if [ $CI_COMMIT_BRANCH != "master" ]; then docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME && docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME; fi
+
+build puppeteer:
+  stage: build
+  image: docker:latest
+  before_script:
+  - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+  script:
+  - cd puppet
+  - docker pull $CI_REGISTRY_IMAGE/puppeteer:latest || true
+  - docker build --pull --cache-from $CI_REGISTRY_IMAGE/puppeteer:latest --tag $CI_REGISTRY_IMAGE/puppeteer:$CI_COMMIT_SHA .
+  - docker push $CI_REGISTRY_IMAGE/puppeteer:$CI_COMMIT_SHA
+  - if [ $CI_COMMIT_BRANCH == "master" ]; then docker tag $CI_REGISTRY_IMAGE/puppeteer:$CI_COMMIT_SHA $CI_REGISTRY_IMAGE/puppeteer:latest && docker push $CI_REGISTRY_IMAGE/puppeteer:latest; fi
+  - if [ $CI_COMMIT_BRANCH != "master" ]; then docker tag $CI_REGISTRY_IMAGE/puppeteer:$CI_COMMIT_SHA $CI_REGISTRY_IMAGE/puppeteer:$CI_COMMIT_REF_NAME && docker push $CI_REGISTRY_IMAGE/puppeteer:$CI_COMMIT_REF_NAME; fi
diff --git a/puppet/Dockerfile b/puppet/Dockerfile
new file mode 100644
index 0000000..b0014d8
--- /dev/null
+++ b/puppet/Dockerfile
@@ -0,0 +1,8 @@
+FROM node:lts-alpine AS builder
+
+WORKDIR /opt/mautrix-amp/puppet
+COPY package.json yarn.lock ./
+RUN yarn --production
+
+COPY . /opt/mautrix-amp/puppet
+CMD ["yarn", "start", "/data/config.json"]