diff --git a/chart/snapshots/values-3.yaml b/chart/snapshots/values-3.yaml
index a396888..49bd763 100644
--- a/chart/snapshots/values-3.yaml
+++ b/chart/snapshots/values-3.yaml
@@ -941,129 +941,6 @@ spec:
             - name: DJANGO_APP_TYPE
               value: "worker"
 ---
-# Source: banjo-helm/templates/worker-beat/deployment.yaml
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: release-name-banjo-helm-worker-beat
-  annotations:
-    reloader.stakater.com/auto: "true"
-  labels:
-    app: release-name-banjo-helm
-    component: worker-beat
-    environment: ALPHA
-    release: release-name
-spec:
-  replicas: 1  # This should only 1
-  selector:
-    matchLabels:
-      app: release-name-banjo-helm
-      component: worker-beat
-  template:
-    metadata:
-      annotations:
-        checksum/secret: 66a6fc24b76971f276c49234b716b2b8226b4c72a18511215a54ab9a414b4d53
-        checksum/configmap: 3f5505b0f56b1094e754509a8dd06e18d87db0905c755ea4b4ab0cc647f29da3
-        aws.workload.identity/use: "true"
-      labels:
-        app: release-name-banjo-helm
-        component: worker-beat
-        azure.workload.identity/use: "true"
-    spec:
-      containers:
-        - name: worker-beat
-          image: "ghcr.io/example/example:v1.0.1"
-          imagePullPolicy: IfNotPresent
-          command:
-            - celery
-            - -A
-            - myapp
-            - beat
-            - -l
-            - INFO
-          # TODO: livenessProbe
-          resources:
-            limits:
-              cpu: "1"
-              memory: 1Gi
-            requests:
-              cpu: "0.1"
-              memory: 0.5Gi
-          envFrom:
-            - secretRef:
-                name: release-name-banjo-helm-secret
-            - configMapRef:
-                name: release-name-banjo-helm-env-name
-          env:
-            - name: DJANGO_APP_TYPE
-              value: "worker"
----
-# Source: banjo-helm/templates/worker/deployment.yaml
-# Queue: default
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: release-name-banjo-helm-worker-default
-  annotations:
-    reloader.stakater.com/auto: "true"
-  labels:
-    app: release-name-banjo-helm
-    component: worker
-    queue: default
-    environment: ALPHA
-    release: release-name
-spec:
-  selector:
-    matchLabels:
-      app: release-name-banjo-helm
-      component: worker
-      queue: default
-  template:
-    metadata:
-      annotations:
-        checksum/secret: 66a6fc24b76971f276c49234b716b2b8226b4c72a18511215a54ab9a414b4d53
-        checksum/configmap: 3f5505b0f56b1094e754509a8dd06e18d87db0905c755ea4b4ab0cc647f29da3
-        aws.workload.identity/use: "true"
-      labels:
-        app: release-name-banjo-helm
-        component: worker
-        queue: default
-        azure.workload.identity/use: "true"
-    spec:
-      containers:
-        - name: worker
-          command:
-            - celery
-            - -A
-            - myapp
-            - worker
-            - -l
-            - INFO
-            - -Q
-            - celery
-            - --concurrency
-            - "4"
-            - --max-tasks-per-child
-            - "10"
-          image: "ghcr.io/example/example:v1.0.1"
-          imagePullPolicy: IfNotPresent
-          # TODO: livenessProbe
-          resources:
-            limits:
-              cpu: "1"
-              memory: 2Gi
-            requests:
-              cpu: "0.1"
-              memory: 1Gi
-          envFrom:
-            - secretRef:
-                name: release-name-banjo-helm-secret
-            - configMapRef:
-                name: release-name-banjo-helm-env-name
-          env:
-            - name: DJANGO_APP_TYPE
-              value: "worker"
----
 # Source: banjo-helm/charts/postgresql/templates/primary/statefulset.yaml
 apiVersion: apps/v1
 kind: StatefulSet
diff --git a/chart/templates/worker-beat/deployment.yaml b/chart/templates/worker-beat/deployment.yaml
index 3a8acf4..339fe98 100644
--- a/chart/templates/worker-beat/deployment.yaml
+++ b/chart/templates/worker-beat/deployment.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.worker.enabled }}
+{{- if and .Values.worker.enabled .Values.worker.beat.enabled }}
 
 apiVersion: apps/v1
 kind: Deployment
diff --git a/chart/templates/worker/deployment.yaml b/chart/templates/worker/deployment.yaml
index 3a3a524..98f8d82 100644
--- a/chart/templates/worker/deployment.yaml
+++ b/chart/templates/worker/deployment.yaml
@@ -1,6 +1,7 @@
 {{- if .Values.worker.enabled }}
 
 {{- range $queue_name, $config := .Values.worker.queues }}
+{{- if $config.enabled }}
 
 ---
 # Queue: {{ $queue_name }}
@@ -71,3 +72,5 @@ spec:
 {{- end }}
 
 {{- end }}
+
+{{- end }}
diff --git a/chart/tests/values-1.yaml b/chart/tests/values-1.yaml
index 217ae3d..b99ac49 100644
--- a/chart/tests/values-1.yaml
+++ b/chart/tests/values-1.yaml
@@ -54,6 +54,7 @@ worker:
     name: ghcr.io/example/example
     tag: v1.0.1
   beat:
+    enabled: true
     resources:
       requests:
         cpu: "0.1"
diff --git a/chart/tests/values-2.yaml b/chart/tests/values-2.yaml
index ac292cd..24bf527 100644
--- a/chart/tests/values-2.yaml
+++ b/chart/tests/values-2.yaml
@@ -75,6 +75,7 @@ worker:
     name: ghcr.io/example/example
     tag: v1.0.1
   beat:
+    enabled: true
     resources:
       requests:
         cpu: "0.1"
diff --git a/chart/tests/values-3.yaml b/chart/tests/values-3.yaml
index fe33c13..b6cc702 100644
--- a/chart/tests/values-3.yaml
+++ b/chart/tests/values-3.yaml
@@ -67,6 +67,7 @@ worker:
   queues:
     # NOTE: Make sure keys are lowercase
     default:
+      enabled: false
       resources:
         requests:
           cpu: "0.1"
diff --git a/chart/values.yaml b/chart/values.yaml
index 3e47753..6d4cc5d 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -149,6 +149,7 @@ worker:
     # imagePullSecrets:
   enabled: true
   beat:
+    enabled: false
     image: {}
       # name: WORKER-SET-BY-CICD-IMAGE
       # tag: WORKER-SET-BY-CICD-TAG