diff --git a/docker-compose.yml b/docker-compose.yml
index 2290a301429..73e7260e28b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -116,6 +116,12 @@ services:
   redis:
     <<: *restart_policy
     image: "redis:6.2.19-alpine"
+    deploy:
+      resources:
+        reservations:
+          memory: 512m
+        limits:
+          memory: 2560m
     healthcheck:
       <<: *healthcheck_defaults
       test: redis-cli ping | grep PONG
diff --git a/redis.conf b/redis.conf
index 090b148b15e..4168573c3ed 100644
--- a/redis.conf
+++ b/redis.conf
@@ -12,7 +12,7 @@
 # maxmemory 0         # Unlimited memory usage
 # maxmemory 15gb     # Limit memory usage to 15 GB
 
-maxmemory 0
+maxmemory 2gb
 
 # This setting determines how Redis evicts keys when it reaches the memory limit.
 # `allkeys-lru` evicts the least recently used keys from all keys stored in Redis,