diff --git a/docker-compose.yml b/docker-compose.yml
index e69de29..7158f1a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -0,0 +1,29 @@
+services:
+  gamertrack-database:
+    image: postgres
+    ports:
+      - "5432:5432"
+    environment:
+      - POSTGRES_PASSWORD=gepardec
+      - POSTGRES_USER=gamertrack
+      - POSTGRES_DB=gamertrack
+
+  gamertrack-backend:
+    image: gamertrack-war
+    ports:
+      - "8080:8080"
+    links:
+      - "gamertrack-database:gamertrack-database"
+    environment:
+        - POSTGRESQL_USER=gamertrack
+        - POSTGRESQL_PASSWORD=gepardec
+        - POSTGRESQL_URL=jdbc:postgresql://gamertrack-database/gamertrack
+    hostname:
+
+  gamertrack-frontend:
+    image: gamertrack-frontend
+    ports:
+      - "4200:80"
+    links:
+      - "gamertrack-backend:gamertrack-backend"
+    hostname: gamertrack-frontend
diff --git a/nginx.conf b/nginx.conf
index a639939..45ec8e2 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -3,9 +3,10 @@ events{}
 http {
     include /etc/nginx/mime.types;
     server {
-        listen 80;
+        listen 8080;
         server_name localhost;
         root /usr/share/nginx/html;
+        index index.html;
 
         location / {
             try_files $uri $uri/ /index.html;