diff --git a/assets/docker/loginserver.toml b/assets/docker/loginserver.toml
index 65f1dbb..d07c8c5 100644
--- a/assets/docker/loginserver.toml
+++ b/assets/docker/loginserver.toml
@@ -2,7 +2,7 @@
 http_addr = "0.0.0.0:5500"
 
 [gateway]
-host = "shorekeeper-gateway-server"
+host = "host.docker.internal"
 port = 7777
 
 [database]
diff --git a/builder.bat b/builder.bat
index 1392676..e7968e9 100644
--- a/builder.bat
+++ b/builder.bat
@@ -7,3 +7,6 @@ docker build -t shorekeeper-gateway-server:1.3.0-SNAPSHOT --build-arg MICROSERVI
 docker build -t shorekeeper-game-server:1.3.0-SNAPSHOT --build-arg MICROSERVICE=game-server -f Dockerfile-service .
 
 docker rmi shorekeeper-builder:1.3.0-SNAPSHOT
+
+: Persistence for the application
+docker volume create shorekeeper-postgres-vol
\ No newline at end of file
diff --git a/builder.sh b/builder.sh
index 1392676..46c7e74 100644
--- a/builder.sh
+++ b/builder.sh
@@ -7,3 +7,6 @@ docker build -t shorekeeper-gateway-server:1.3.0-SNAPSHOT --build-arg MICROSERVI
 docker build -t shorekeeper-game-server:1.3.0-SNAPSHOT --build-arg MICROSERVICE=game-server -f Dockerfile-service .
 
 docker rmi shorekeeper-builder:1.3.0-SNAPSHOT
+
+# Persistence for the application
+docker volume create shorekeeper-postgres-vol
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index e2fae07..c7e07f0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -66,5 +66,8 @@ services:
     environment:
       - "POSTGRES_PASSWORD=toor"
     volumes:
-      # If you want to have persistence, mount postgres data folder
-      - "./assets/docker/postgres/scripts:/docker-entrypoint-initdb.d"
\ No newline at end of file
+      - "./assets/docker/postgres/scripts:/docker-entrypoint-initdb.d"
+      - shorekeeper-postgres-vol:/var/lib/postgresql/data
+volumes:
+  shorekeeper-postgres-vol:
+    external: true
\ No newline at end of file