diff --git a/docker-compose.yaml b/docker-compose.yaml
index b1bf5bf..5f43e2c 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,7 +1,6 @@
 services:
   nginx-srv:
     image: eroncero/nginx-srv:latest
-    hostname: nginx-srv
     build:
       context: ./nginx-srv
       dockerfile: Dockerfile
@@ -11,6 +10,7 @@ services:
       - "${NGINX_HTTPS_IPV4_HOST}:${NGINX_HTTPS_IPV4_PORT}:${NGINX_CONTAINER_HTTPS_PORT}"
       - "${NGINX_HTTPS_IPV6_HOST}:${NGINX_HTTPS_IPV6_PORT}:${NGINX_CONTAINER_HTTPS_PORT}"
     restart: unless-stopped
+    hostname: nginx-srv
     volumes:
       - ./nginx-srv/etc/nginx/sites-available:/etc/nginx/sites-available
       - ./nginx-srv/var/www:/var/www
@@ -19,8 +19,11 @@ services:
 
   multi-php-fpm:
     image: eroncero/multi-php-fpm
-    hostname: multi-php-fpm
+    build:
+      context: ./multi-php-fpm
+      dockerfile: Dockerfile
     restart: unless-stopped
+    hostname: multi-php-fpm
     environment:
       - PHP_VERSIONS=${PHP_VERSIONS}  # Inherits from .env
     volumes:
@@ -30,8 +33,11 @@ services:
 
   mariadb-srv:
     image: eroncero/mariadb-srv:latest
-    hostname: mariadb-srv
+    build:
+      context: ./mariadb-srv
+      dockerfile: Dockerfile
     restart: unless-stopped
+    hostname: mariadb-srv
     volumes:
       - ./mariadb-srv/var/lib/mysql:/var/lib/mysql
       - ./mariadb-srv/etc/mysql:/etc/mysql