diff --git a/backend b/backend
index 453ecef..b1c42fc 160000
--- a/backend
+++ b/backend
@@ -1 +1 @@
-Subproject commit 453ecef4e8e015de60bf4dfc707a264ef91895bc
+Subproject commit b1c42fc394ba27aa9559cb3e1f2da0fcae0a756d
diff --git a/docker-compose.yml b/docker-compose.yml
index 28ed564..94e6857 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -59,7 +59,9 @@ services:
                 PHP_VERSION: ${PHP_VERSION}
         image: european-airports/api-php-fpm
         restart: always
-        env_file: ./php-fpm/php.env
+        env_file: 
+            - ./php-fpm/php.env
+            - ./backend/php.env
         volumes:
             - ./backend/src/:/var/www/html
         networks:
@@ -76,7 +78,7 @@ services:
         image: european-airports/www-nginx
         restart: always
         ports: 
-            - 8080:80
+            - 8081:80
         depends_on:
             - frontend-php
         env_file: 
@@ -95,7 +97,9 @@ services:
                 PHP_VERSION: ${PHP_VERSION}
         image: european-airports/www-php-fpm
         restart: always
-        env_file: ./php-fpm/php.env
+        env_file: 
+            - ./php-fpm/php.env
+            - ./frontend/php.env
         volumes:
             - ./frontend/src/:/var/www/html
         networks:
diff --git a/frontend b/frontend
index 4e94a3b..27bef3b 160000
--- a/frontend
+++ b/frontend
@@ -1 +1 @@
-Subproject commit 4e94a3b359b453e215dda48b217538c3c627c900
+Subproject commit 27bef3bd67220d4c5838306d3d51c230b1564470
diff --git a/nginx/etc/nginx/templates/default.conf.template b/nginx/etc/nginx/templates/default.conf.template
index 76105a2..cd5adb8 100644
--- a/nginx/etc/nginx/templates/default.conf.template
+++ b/nginx/etc/nginx/templates/default.conf.template
@@ -30,7 +30,7 @@ server {
     listen 80;
     root /var/www/html;
     server_name ${NGINX_HOST}
-    index index.php;
+    index index.php index.htm;
     
     location ~ \.php$ {
         include fastcgi_params;
@@ -41,7 +41,7 @@ server {
     }
 
     location / {
-        try_files $uri $uri/ /index.php?$query_string;
+        try_files $uri $uri/ /index.php?$query_string =404;
     }
     
 }
\ No newline at end of file