diff --git a/deployment/bare_metal/nginx/sites-available/gradido.conf.ssl.template b/deployment/bare_metal/nginx/sites-available/gradido.conf.ssl.template
index 047547e91..2079960c5 100644
--- a/deployment/bare_metal/nginx/sites-available/gradido.conf.ssl.template
+++ b/deployment/bare_metal/nginx/sites-available/gradido.conf.ssl.template
@@ -56,7 +56,9 @@ server {
         
         limit_req zone=frontend burst=40 nodelay;
         limit_conn addr 40;
-        root $PROJECT_ROOT/frontend/
+        root $PROJECT_ROOT/frontend/build/;
+        index index.html;
+        try_files $uri $uri/ /index.html = 404;
         
         access_log $GRADIDO_LOG_PATH/nginx-access.frontend.log gradido_log;
         error_log $GRADIDO_LOG_PATH/nginx-error.frontend.log warn;
@@ -112,7 +114,9 @@ server {
     location /admin {
         limit_req zone=frontend burst=30 nodelay;
         limit_conn addr 40;
-        root $PROJECT_ROOT/admin/
+        root $PROJECT_ROOT/admin/build/;
+        index index.html;
+        try_files $uri $uri/ /index.html = 404;
 
         access_log $GRADIDO_LOG_PATH/nginx-access.admin.log gradido_log;
         error_log $GRADIDO_LOG_PATH/nginx-error.admin.log warn;
diff --git a/deployment/bare_metal/nginx/sites-available/gradido.conf.template b/deployment/bare_metal/nginx/sites-available/gradido.conf.template
index a61fbee47..d1f5cfece 100644
--- a/deployment/bare_metal/nginx/sites-available/gradido.conf.template
+++ b/deployment/bare_metal/nginx/sites-available/gradido.conf.template
@@ -40,7 +40,9 @@ server {
     location / {
         limit_req zone=frontend burst=40 nodelay;
         limit_conn addr 40;
-        root $PROJECT_ROOT/frontend/
+        root $PROJECT_ROOT/frontend/build/;
+        index index.html;
+        try_files $uri $uri/ /index.html = 404;
 
         access_log $GRADIDO_LOG_PATH/nginx-access.frontend.log gradido_log;
         error_log $GRADIDO_LOG_PATH/nginx-error.frontend.log warn;
@@ -96,7 +98,9 @@ server {
     location /admin {
         limit_req zone=frontend burst=30 nodelay;
         limit_conn addr 40;
-        root $PROJECT_ROOT/admin/
+        root $PROJECT_ROOT/admin/build/;
+        index index.html;
+        try_files $uri $uri/ /index.html = 404;
 
         access_log $GRADIDO_LOG_PATH/nginx-access.admin.log gradido_log;
         error_log $GRADIDO_LOG_PATH/nginx-error.admin.log warn;