diff --git a/docker-compose.yml b/docker-compose.yml
index 9310120..adae2d4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
   guacd:
     image: "guacamole/guacd"
-    container_name: "Guacd"
+    container_name: "guacd"
     hostname: "guacd"
     restart: "unless-stopped"
     environment:
@@ -12,17 +12,19 @@ services:
   guacamole:
     image: "guacamole/guacamole"
     container_name: "Guacamole"
-    hostname: "guacd"
+    hostname: "guacamole"
     restart: "unless-stopped"
     depends_on: 
       - "guacd"
+    healthcheck:
+      test: "curl -f http://localhost:8080/ || exit 1"
     environment:
       GUACD_HOSTNAME: "guacd"
       GUACD_PORT: "4822"
       POSTGRESQL_HOSTNAME: "${DB_HOST}"
       POSTGRESQL_DATABASE: "${DB_BASE}"
       POSTGRESQL_USER: "${DB_USER}"
-      POSTGRESQL_PASSWORD: "${DB_PORT}"
+      POSTGRESQL_PASSWORD: "${DB_PASS}"
     ports:
       - "10.0.0.1:8080:8080"
     networks:
@@ -31,3 +33,4 @@ services:
 networks:
   guacamole:
     name: "guacamole"
+