diff --git a/Makefile b/Makefile
index 81e3e20..a6abe61 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ lint:
 .PHONY: test
 test:
 	export ENVIRONMENT_FILE=.env.test && \
+	export TESTING=true && \
 	poetry run coverage run -m pytest -v --disable-warnings --color=yes app/tests/ && \
 	poetry run coverage report
 
@@ -15,6 +16,7 @@ clean-dev:
 
 .PHONY: dev
 dev:
+	sysctl vm.overcommit_memory 2>/dev/null | grep -q 'vm.overcommit_memory = 1' || sudo sysctl vm.overcommit_memory=1
 	docker compose --env-file .env.dev -f docker-compose.yml -f docker-compose.dev.yml build
 	docker compose --env-file .env.dev -f docker-compose.yml -f docker-compose.dev.yml up --remove-orphans
 
@@ -29,6 +31,7 @@ stop-dev:
 
 .PHONY: prod
 prod:
+	sysctl vm.overcommit_memory 2>/dev/null | grep -q 'vm.overcommit_memory = 1' || sudo sysctl vm.overcommit_memory=1
 	docker compose --env-file .env.prod build
 	docker compose --env-file .env.prod up -d --remove-orphans
 	docker buildx prune --keep-storage 30gb -f
diff --git a/app/shared/log.py b/app/shared/log.py
index 138a650..9c53339 100644
--- a/app/shared/log.py
+++ b/app/shared/log.py
@@ -1,18 +1,20 @@
+import os
 import traceback
 
 from auto_archiver.utils.custom_logger import logger
 
 
 # logging configurations
-logger.add(
-    "logs/all_logs.log", retention="30 days", format="{extra[serialized]}"
-)
-logger.add(
-    "logs/all_error_logs.log",
-    retention="120 days",
-    level="ERROR",
-    format="{extra[serialized]}",
-)
+if not os.getenv("TESTING", "").lower() == "true":
+    logger.add(
+        "logs/all_logs.log", retention="60 days", format="{extra[serialized]}"
+    )
+    logger.add(
+        "logs/all_error_logs.log",
+        retention="120 days",
+        level="ERROR",
+        format="{extra[serialized]}",
+    )
 
 
 def log_error(e: Exception, traceback_str: str = None, extra: str = ""):