diff --git a/charts/helm/checkmate/INSTALLATION.md b/charts/helm/checkmate/INSTALLATION.md
index 06cf9f7b9..9792a696f 100644
--- a/charts/helm/checkmate/INSTALLATION.md
+++ b/charts/helm/checkmate/INSTALLATION.md
@@ -23,8 +23,7 @@ Edit `values.yaml` to update:
 - `server.protocol` (usually http or https)
 - **If upgrading**: Migrate persistence settings from flat structure to nested:
   - Old: `persistence.mongodbSize` → New: `persistence.mongo.size`
-  - Old: `persistence.redisSize` → New: `persistence.redis.size`
-  - Add: `persistence.mongo.storageClass` and `persistence.redis.storageClass` (leave empty for default)
+  - Add: `persistence.mongo.storageClass` (leave empty for default)
 - Secrets under the `secrets` section (`JWT_SECRET`, email credentials, API keys, etc.) — replace all change_me values
 - **For TLS/HTTPS**: Configure ingress TLS settings (see section below)
 
@@ -32,7 +31,7 @@ Edit `values.yaml` to update:
 ```bash
 helm install checkmate ./charts/helm/checkmate
 ```
-This will deploy the client, server, MongoDB, and Redis components.
+This will deploy the client, server, and MongoDB components.
 
 ### 4. Verify the deployment
 Check pods and services:
diff --git a/charts/helm/checkmate/templates/client-deployment.yaml b/charts/helm/checkmate/templates/client/deployment.yaml
similarity index 100%
rename from charts/helm/checkmate/templates/client-deployment.yaml
rename to charts/helm/checkmate/templates/client/deployment.yaml
diff --git a/charts/helm/checkmate/templates/client-ingress.yaml b/charts/helm/checkmate/templates/client/ingress.yaml
similarity index 100%
rename from charts/helm/checkmate/templates/client-ingress.yaml
rename to charts/helm/checkmate/templates/client/ingress.yaml
diff --git a/charts/helm/checkmate/templates/client-service.yaml b/charts/helm/checkmate/templates/client/service.yaml
similarity index 100%
rename from charts/helm/checkmate/templates/client-service.yaml
rename to charts/helm/checkmate/templates/client/service.yaml
diff --git a/charts/helm/checkmate/templates/mongodb-service.yaml b/charts/helm/checkmate/templates/db/mongodb-service.yaml
similarity index 100%
rename from charts/helm/checkmate/templates/mongodb-service.yaml
rename to charts/helm/checkmate/templates/db/mongodb-service.yaml
diff --git a/charts/helm/checkmate/templates/mongodb-statefulsets.yaml b/charts/helm/checkmate/templates/db/mongodb-statefulsets.yaml
similarity index 100%
rename from charts/helm/checkmate/templates/mongodb-statefulsets.yaml
rename to charts/helm/checkmate/templates/db/mongodb-statefulsets.yaml
diff --git a/charts/helm/checkmate/templates/redis-service.yaml b/charts/helm/checkmate/templates/redis-service.yaml
deleted file mode 100644
index 2720350da..000000000
--- a/charts/helm/checkmate/templates/redis-service.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-{{- if .Values.redis.enabled }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: checkmate-redis
-spec:
-  selector:
-    app: checkmate-redis
-  ports:
-    - port: {{ .Values.redis.port }}
-{{- end }}
diff --git a/charts/helm/checkmate/templates/redis-statefulsets.yaml b/charts/helm/checkmate/templates/redis-statefulsets.yaml
deleted file mode 100644
index acf7c85a8..000000000
--- a/charts/helm/checkmate/templates/redis-statefulsets.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-{{- if .Values.redis.enabled }}
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: checkmate-redis
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: checkmate-redis
-  template:
-    metadata:
-      labels:
-        app: checkmate-redis
-    spec:
-      containers:
-        - name: redis
-          image: {{ .Values.redis.image }}
-          ports:
-            - containerPort: {{ .Values.redis.port }}
-          volumeMounts:
-            - name: redis-data
-              mountPath: /data
-  volumeClaimTemplates:
-    - metadata:
-        name: checkmate-redis-persistent-storage
-      spec:
-        storageClassName: {{ .Values.persistence.redis.storageClass | quote }}
-        accessModes: ["ReadWriteOnce"]
-        resources:
-          requests:
-            storage: {{ .Values.persistence.redis.size | default "1Gi" | quote }}
-{{- end }}
\ No newline at end of file
diff --git a/charts/helm/checkmate/templates/server-deployment.yaml b/charts/helm/checkmate/templates/server/deployment.yaml
similarity index 100%
rename from charts/helm/checkmate/templates/server-deployment.yaml
rename to charts/helm/checkmate/templates/server/deployment.yaml
diff --git a/charts/helm/checkmate/templates/server-ingress.yaml b/charts/helm/checkmate/templates/server/ingress.yaml
similarity index 100%
rename from charts/helm/checkmate/templates/server-ingress.yaml
rename to charts/helm/checkmate/templates/server/ingress.yaml
diff --git a/charts/helm/checkmate/templates/server-nginx-cm.yaml b/charts/helm/checkmate/templates/server/nginx-cm.yaml
similarity index 100%
rename from charts/helm/checkmate/templates/server-nginx-cm.yaml
rename to charts/helm/checkmate/templates/server/nginx-cm.yaml
diff --git a/charts/helm/checkmate/templates/server-service.yaml b/charts/helm/checkmate/templates/server/service.yaml
similarity index 100%
rename from charts/helm/checkmate/templates/server-service.yaml
rename to charts/helm/checkmate/templates/server/service.yaml
diff --git a/charts/helm/checkmate/values.yaml b/charts/helm/checkmate/values.yaml
index 9a586dd54..211b29b98 100644
--- a/charts/helm/checkmate/values.yaml
+++ b/charts/helm/checkmate/values.yaml
@@ -36,11 +36,6 @@ server:
       # a cert-manager issuer annotation (e.g. cert-manager.io/cluster-issuer: "letsencrypt-prod").
       # The secret will be automatically created by cert-manager when using the cert-manager.io/cluster-issuer annotation
 
-redis:
-  enabled: false
-  image: redis:7.2
-  port: 6379
-
 mongodb:
   image: ghcr.io/bluewave-labs/checkmate-mongo:v3.2.0
   port: 27017
@@ -55,8 +50,6 @@ secrets:
 #  PAGESPEED_API_KEY: change_me
   DB_CONNECTION_STRING: mongodb://checkmate-mongodb.namespace.svc:27017/uptime_db
   CLIENT_HOST: change_me
-#  REDIS_HOST: redis
-#  REDIS_PORT: "6379"
 #  DB_TYPE: MongoDB
 #  TOKEN_TTL: 99d
 #  REFRESH_TOKEN_TTL: 99d
@@ -64,7 +57,4 @@ secrets:
 persistence:
   mongo:
     size: 5Gi
-    storageClass: ""
-  redis:
-    size: 1Gi
     storageClass: ""
\ No newline at end of file
diff --git a/docker/.gitignore b/docker/.gitignore
index 76567d514..4c3f83657 100755
--- a/docker/.gitignore
+++ b/docker/.gitignore
@@ -2,14 +2,10 @@
 !quickstart.sh
 !build_images.sh
 dev/mongo/data/*
-dev/redis/data/*
 dist/mongo/data/*
-dist/redis/data/*
 prod/mongo/data/*
-prod/redis/data/*
 dist/docker-compose-test.yaml
 /dist-mono/mongo/data/*
-/dist-mono/redis/data/*
 /dist-arm/mongo/data/*
 *.env
 
diff --git a/docker/coolify/build_images.bat b/docker/coolify/build_images.bat
index 60fc9aa4a..b940039b6 100644
--- a/docker/coolify/build_images.bat
+++ b/docker/coolify/build_images.bat
@@ -12,14 +12,11 @@ set dockerfiles[0]=.\docker\coolify\client.Dockerfile
 set services[1]=bluewaveuptime/uptime_database_mongo
 set dockerfiles[1]=.\docker\coolify\mongoDB.Dockerfile
 
-set services[2]=bluewaveuptime/uptime_redis
-set dockerfiles[2]=.\docker\coolify\redis.Dockerfile
-
-set services[3]=bluewaveuptime/uptime_server
-set dockerfiles[3]=.\docker\coolify\server.Dockerfile
+set services[2]=bluewaveuptime/uptime_server
+set dockerfiles[2]=.\docker\coolify\server.Dockerfile
 
 REM Loop through each service and build the corresponding image
-for /L %%i in (0,1,2,3) do (
+for /L %%i in (0,1,2) do (
     set service=!services[%%i]!
     set dockerfile=!dockerfiles[%%i]!
 
diff --git a/docker/coolify/build_images.sh b/docker/coolify/build_images.sh
index 04dfe324c..1d29ae5b1 100755
--- a/docker/coolify/build_images.sh
+++ b/docker/coolify/build_images.sh
@@ -7,7 +7,6 @@ cd ../../
 declare -A services=(
   ["bluewaveuptime/uptime_client"]="./docker/coolify/client.Dockerfile"
   ["bluewaveuptime/uptime_database_mongo"]="./docker/coolify/mongoDB.Dockerfile"
-  ["bluewaveuptime/uptime_redis"]="./docker/coolify/redis.Dockerfile"
   ["bluewaveuptime/uptime_server"]="./docker/coolify/server.Dockerfile"
 )
 
diff --git a/docker/coolify/redis.Dockerfile b/docker/coolify/redis.Dockerfile
deleted file mode 100755
index af68ec61e..000000000
--- a/docker/coolify/redis.Dockerfile
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM redis
-EXPOSE 6379
\ No newline at end of file
diff --git a/docker/dev/docker-compose.custom-ca-example.yaml b/docker/dev/docker-compose.custom-ca-example.yaml
index a5d7e2f43..e1f185ae9 100644
--- a/docker/dev/docker-compose.custom-ca-example.yaml
+++ b/docker/dev/docker-compose.custom-ca-example.yaml
@@ -19,7 +19,6 @@ services:
       # Mount the certs directory (read-only for security)
       - ./certs:/certs:ro
     depends_on:
-      - redis
       - mongodb
     # Optional: Add healthcheck to ensure the server starts properly
     healthcheck:
diff --git a/docker/dist-arm/docker-compose.yaml b/docker/dist-arm/docker-compose.yaml
index b9aba057c..49f81fe9a 100644
--- a/docker/dist-arm/docker-compose.yaml
+++ b/docker/dist-arm/docker-compose.yaml
@@ -9,7 +9,6 @@ services:
       - UPTIME_APP_API_BASE_URL=http://localhost:52345/api/v1
       - UPTIME_APP_CLIENT_HOST=http://localhost
       - DB_CONNECTION_STRING=mongodb://mongodb:27017/uptime_db
-      - REDIS_URL=redis://redis:6379
       - CLIENT_HOST=http://localhost
       - JWT_SECRET=my_secret
     depends_on: