diff --git a/docker-compose.yml b/docker-compose.yml
index ca689494..1c777887 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1388,6 +1388,7 @@ services:
       volumes:
         - ${DATA_PATH_HOST}/gitlab/runner:/etc/gitlab-runner
         - /var/run/docker.sock:/var/run/docker.sock:rw
+      restart: always
 
 ### JupyterHub #########################################
     jupyterhub:
@@ -1517,6 +1518,18 @@ services:
       networks:
         - backend
 
+### Weaver (Athena PDF) #################################################
+    weaver:
+      image: arachnysdocker/athenapdf-service
+      ports:
+        - "8080:8080"
+      env_file:
+        - ./weaver/conf/sample.env
+      networks:
+        - backend
+      depends_on:
+        - workspace
+
 ### IDE-THEIA ################################################
     ide-theia:
       build:
diff --git a/weaver/conf/sample.env b/weaver/conf/sample.env
new file mode 100644
index 00000000..ccb48de5
--- /dev/null
+++ b/weaver/conf/sample.env
@@ -0,0 +1,19 @@
+GIN_MODE=debug
+
+# Weaver
+WEAVER_AUTH_KEY=arachnys-weaver
+WEAVER_ATHENA_CMD=athenapdf -S
+WEAVER_MAX_WORKERS=10
+WEAVER_MAX_CONVERSION_QUEUE=50
+WEAVER_WORKER_TIMEOUT=90
+WEAVER_CONVERSION_FALLBACK=false
+
+# CloudConvert
+# API key can be found: https://cloudconvert.com/user/profile
+# CLOUDCONVERT_API=https://api.cloudconvert.com
+# CLOUDCONVERT_KEY=
+
+# Monitoring
+# STATSD_ADDRESS=
+# STATSD_PREFIX=
+# SENTRY_DSN=
\ No newline at end of file