diff --git a/.env.prod b/.env.prod
index 8c3d0d53d6e7e6532715b53ba3baea6ede25921d..048a0053ce15bb65432f4e00e768c9ee3338733d 100644
--- a/.env.prod
+++ b/.env.prod
@@ -12,4 +12,5 @@ SEARX_PROXY_HTTPS=http://proxy01.ecloud.global:1099
 WIREGUARD_IP=127.0.0.1 
 FILTRON_PORT=8088
 MORTY_PORT=8089
-INTERNAL_NETWORK_NAME=default
\ No newline at end of file
+INTERNAL_NETWORK_NAME=default
+LOG_DIRECTORY=staging-spot
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7b5fe3a8a1bed15ed3e86281779842aa25eac0a3..3bad0c5954c865471f7eef5e8c722ccbe70be7e3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -187,6 +187,7 @@ deploy:spot.ecloud.global.backend1:
       && sed -i 's/FILTRON_PORT=8088/FILTRON_PORT=$FILTRON_PORT/g' .env
       && sed -i 's/MORTY_PORT=8089/MORTY_PORT=$MORTY_PORT/g' .env
       && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env
+      && sed -i 's/LOG_DIRECTORY=staging-spot/LOG_DIRECTORY=production-spot/g' .env
       && docker-compose pull && docker-compose stop filtron && sleep 2 && docker-compose up -d"
 
 deploy:spot.ecloud.global.backend2:
@@ -226,5 +227,6 @@ deploy:spot.ecloud.global.backend2:
       && sed -i 's/FILTRON_PORT=8088/FILTRON_PORT=$FILTRON_PORT/g' .env
       && sed -i 's/MORTY_PORT=8089/MORTY_PORT=$MORTY_PORT/g' .env
       && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env
+      && sed -i 's/LOG_DIRECTORY=staging-spot/LOG_DIRECTORY=production-spot/g' .env
       && docker-compose pull && docker-compose stop filtron && sleep 2 && docker-compose up -d"
 
diff --git a/Dockerfile b/Dockerfile
index 23ce4b0c0d4c9d0d3944eea9c96edf04fca7779d..1da20f5232eee9a280aa1536bbde777abfb003a4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,4 +15,4 @@ COPY --from=builder /install/ /usr/local/
 EXPOSE 80
 STOPSIGNAL SIGINT
 
-CMD ["gunicorn", "-w", "1", "-b", "0.0.0.0:80", "--pythonpath", "/usr/local/lib/python3.9/site-packages", "searx.webapp:app"]
+CMD ["gunicorn", "-w", "1", "-b", "0.0.0.0:80", "--access-logfile", "/var/log/gunicorn/access.log", "--error-logfile", "/var/log/gunicorn/access.log", "--pythonpath", "/usr/local/lib/python3.9/site-packages", "searx.webapp:app"]
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 45ffd4eb82c8f125579e993dc1c06281acd1d9be..3c20b32e12a21f86146def15c396e1373a426085 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -22,7 +22,6 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    logging: *default-logging
     restart: always
     networks:
       - ${INTERNAL_NETWORK_NAME}
@@ -36,6 +35,8 @@ services:
       SEARX_UI_DEFAULT_THEME: "${SEARX_UI_DEFAULT_THEME}"
       GUNICORN_LOGGER: 1
       GUNICORN_LEVEL: INFO
+    volumes: 
+      - /var/log/containers/${LOG_DIRECTORY}/app:/var/log/gunicorn
 
   spot-nginx:
     image: registry.gitlab.e.foundation:5000/e/cloud/my-spot/nginx:${SPOT_NGINX_DOCKER_TAG}
@@ -43,12 +44,13 @@ services:
     build:
       context: .
       dockerfile: nginx.Dockerfile
-    logging: *default-logging
     restart: always
     networks:
       - ${INTERNAL_NETWORK_NAME}
     environment:
       SEARX_MORTY_URL: "${SEARX_MORTY_URL}"
+    volumes: 
+      - /var/log/containers/${LOG_DIRECTORY}/nginx:/var/log/nginx
 
   filtron:
     image: dalf/filtron:latest
diff --git a/etc/nginx/conf.d/spot.conf b/etc/nginx/conf.d/spot.conf
index a95b5aa6b48c0468f61e44c6fcc6f855707a5d9c..d6c7f73a0fc06a426490cab9b14e216042d2f9db 100644
--- a/etc/nginx/conf.d/spot.conf
+++ b/etc/nginx/conf.d/spot.conf
@@ -18,6 +18,9 @@ server {
   add_header Content-Security-Policy "default-src 'none'; script-src 'self'; style-src 'self' 'unsafe-inline'; form-action 'self'; font-src 'self'; frame-ancestors 'self'; base-uri 'self'; connect-src 'self' https://overpass-api.de; img-src 'self' __SEARX_MORTY_URL__ data: https://*.tile.openstreetmap.org; frame-src https://www.youtube-nocookie.com https://player.vimeo.com https://www.dailymotion.com https://www.deezer.com https://www.mixcloud.com https://w.soundcloud.com https://embed.spotify.com";
   add_header X-Frame-Options "SAMEORIGIN";
 
+  access_log /var/log/nginx/access.log;
+  error_log /var/log/nginx/error.log;
+
   root /var/www/spot;
 
   location = / {