diff --git a/apiserver/Dockerfile.api b/apiserver/Dockerfile.api
index 402940f83..15c3f53a9 100644
--- a/apiserver/Dockerfile.api
+++ b/apiserver/Dockerfile.api
@@ -49,7 +49,7 @@ USER root
 RUN apk --no-cache add "bash~=5.2"
 COPY ./bin ./bin/
 
-RUN chmod +x ./bin/takeoff ./bin/worker
+RUN chmod +x ./bin/takeoff ./bin/worker ./bin/beat
 RUN chmod -R 777 /code
 
 USER captain
diff --git a/apiserver/bin/beat b/apiserver/bin/beat
new file mode 100644
index 000000000..45d357442
--- /dev/null
+++ b/apiserver/bin/beat
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -e
+
+python manage.py wait_for_db
+celery -A plane beat -l info
\ No newline at end of file
diff --git a/docker-compose-hub.yml b/docker-compose-hub.yml
index 48e424d19..c0466e09c 100644
--- a/docker-compose-hub.yml
+++ b/docker-compose-hub.yml
@@ -82,6 +82,21 @@ services:
                         - plane-db
                         - plane-redis
 
+        plane-beat-worker:
+                container_name: planebeatworker
+                image: makeplane/plane-worker:latest
+                restart: always
+                command: ./bin/beat
+                env_file:
+                        - .env
+                environment:
+                        <<: *api-and-worker-env
+                depends_on:
+                        - plane-api
+                        - plane-db
+                        - plane-redis
+
+
         plane-db:
                 container_name: plane-db
                 image: postgres:15.2-alpine
diff --git a/docker-compose.yml b/docker-compose.yml
index 8a52d3c36..be8b96258 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -90,6 +90,22 @@ services:
                         - plane-db
                         - plane-redis
 
+        plane-beat-worker:
+                container_name: planebeatworker
+                build:
+                        context: ./apiserver
+                        dockerfile: Dockerfile.api
+                restart: always
+                command: ./bin/beat
+                env_file:
+                        - .env
+                environment:
+                        <<: *api-and-worker-env
+                depends_on:
+                        - plane-api
+                        - plane-db
+                        - plane-redis
+
         plane-db:
                 container_name: plane-db
                 image: postgres:15.2-alpine