diff --git a/helm/deploy.sh b/helm/deploy.sh
index 2a2d675..481e5c7 100755
--- a/helm/deploy.sh
+++ b/helm/deploy.sh
@@ -4,6 +4,11 @@ then
     echo '$NATS_PASSWORD is required'
     exit 1
 fi
-helm --namespace=staging upgrade nocodelytics-nats nats/nats --values ./nats.yaml \
+if [ -z "$NAMESPACE" ]
+then
+    echo '$NAMESPACE is required'
+    exit 1
+fi
+helm --namespace=$(NAMESPACE) upgrade nocodelytics-nats nats/nats --values ./nats.yaml \
     --set auth.basic.accounts.sys.users[0].pass=$NATS_PASSWORD \
     --set auth.basic.accounts.js.users[0].pass=$NATS_PASSWORD
\ No newline at end of file
diff --git a/kustomization/bases/nocodelytics-dashboard.yaml b/kustomization/bases/nocodelytics-dashboard.yaml
index a343ff5..edbd9f7 100644
--- a/kustomization/bases/nocodelytics-dashboard.yaml
+++ b/kustomization/bases/nocodelytics-dashboard.yaml
@@ -68,9 +68,11 @@ spec:
             requests:
               memory: "256Mi"
               cpu: "50m"
+              ephemeral-storage: "1Mi"
             limits:
               memory: "512Mi"
               cpu: "200m"
+              ephemeral-storage: "1Mi"
       nodeSelector:
         kubernetes.io/arch: arm64
       tolerations:
diff --git a/kustomization/bases/nocodelytics-events-worker.yaml b/kustomization/bases/nocodelytics-events-worker.yaml
index 6c62453..550185a 100644
--- a/kustomization/bases/nocodelytics-events-worker.yaml
+++ b/kustomization/bases/nocodelytics-events-worker.yaml
@@ -25,9 +25,11 @@ spec:
             requests:
               memory: "256Mi"
               cpu: "50m"
+              ephemeral-storage: "1Mi"
             limits:
               memory: "512Mi"
               cpu: "200m"
+              ephemeral-storage: "1Mi"
           env:
             - name: ENCRYPTION_KEY
               valueFrom:
diff --git a/kustomization/bases/nocodelytics-tracker-api.yaml b/kustomization/bases/nocodelytics-tracker-api.yaml
index f9a0638..1856e57 100644
--- a/kustomization/bases/nocodelytics-tracker-api.yaml
+++ b/kustomization/bases/nocodelytics-tracker-api.yaml
@@ -30,17 +30,35 @@ spec:
       containers:
         - name: nocodelytics-tracker-api
           imagePullPolicy: Always
-          image: container-registry.nocodelytics.com/nocodelytics/tracker-api:1ce14e7d367fa42ab725dd14194ff7d254ceb738
+          image: container-registry.nocodelytics.com/nocodelytics/dashboard:latest
+          command: ["forever", "./api/.build/src/tracker/index.js"]
           resources:
             requests:
               memory: "128Mi"
-              cpu: "50m"
+              cpu: "200m"
+              ephemeral-storage: "1Mi"
             limits:
               memory: "512Mi"
               cpu: "200m"
+              ephemeral-storage: "1Mi"
           env:
+            - name: PORT
+              value: "3001"
+            - name: K8S_NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
+            - name: K8S_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
             - name: NATS_USER
               value: nocodelytics-nats
+            - name: ENCRYPTION_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: secrets
+                  key: ENCRYPTION_KEY
       nodeSelector:
         kubernetes.io/arch: arm64
       tolerations:
diff --git a/kustomization/overlays/production/kustomization.yaml b/kustomization/overlays/production/kustomization.yaml
index 6ac4656..e7be90e 100644
--- a/kustomization/overlays/production/kustomization.yaml
+++ b/kustomization/overlays/production/kustomization.yaml
@@ -3,6 +3,7 @@ resources:
   - ../../bases
 patchesStrategicMerge:
   - ./nocodelytics-dashboard.yaml
+  - ./nocodelytics-events-worker.yaml
   - ./nocodelytics-tracker-api.yaml
   - ./nats.yaml
 patches:
diff --git a/kustomization/overlays/production/nocodelytics-events-worker.yaml b/kustomization/overlays/production/nocodelytics-events-worker.yaml
new file mode 100644
index 0000000..9310fd6
--- /dev/null
+++ b/kustomization/overlays/production/nocodelytics-events-worker.yaml
@@ -0,0 +1,19 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: nocodelytics-events-worker
+spec:
+  replicas: 4
+  selector:
+    matchLabels:
+      ms: nocodelytics-events-worker
+  template:
+    metadata:
+      labels:
+        ms: nocodelytics-events-worker
+    spec:
+      containers:
+        - name: nocodelytics-events-worker
+          env:
+            - name: NODE_ENV
+              value: production
diff --git a/kustomization/overlays/staging/nocodelytics-dashboard.yaml b/kustomization/overlays/staging/nocodelytics-dashboard.yaml
index bbac415..cd91ae1 100644
--- a/kustomization/overlays/staging/nocodelytics-dashboard.yaml
+++ b/kustomization/overlays/staging/nocodelytics-dashboard.yaml
@@ -55,5 +55,3 @@ spec:
           env:
             - name: NODE_ENV
               value: stage
-            - name: PROCESS_EVENT_QUEUE
-              value: 'true'
diff --git a/kustomization/overlays/staging/nocodelytics-tracker-api.yaml b/kustomization/overlays/staging/nocodelytics-tracker-api.yaml
index 79546dd..b694579 100644
--- a/kustomization/overlays/staging/nocodelytics-tracker-api.yaml
+++ b/kustomization/overlays/staging/nocodelytics-tracker-api.yaml
@@ -52,6 +52,10 @@ spec:
       containers:
         - name: nocodelytics-tracker-api
           env:
+            - name: NODE_ENV
+              value: stage
+            - name: BASE_URL
+              value: https://stagingtracker.nocodelytics.com
             - name: NATS_URL
               value: nocodelytics-nats.staging.svc.cluster.local:4222
             - name: NATS_PASSWORD