diff --git a/angular.json b/angular.json
index 6f2761e..f5974fd 100644
--- a/angular.json
+++ b/angular.json
@@ -60,6 +60,9 @@
         },
         "serve": {
           "builder": "@angular/build:dev-server",
+          "options": {
+            "proxyConfig": "proxy.conf.json"
+          },
           "configurations": {
             "production": {
               "buildTarget": "Bonsai-webapp:build:production"
diff --git a/nginx.conf b/nginx.conf
index 5db99a0..c1e1dfb 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -3,6 +3,14 @@ server {
     root /usr/share/nginx/html;
     index index.html;
 
+    location /api {
+        proxy_pass http://api:8080;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+
     location / {
         try_files $uri $uri/ /index.html;
     }
diff --git a/proxy.conf.json b/proxy.conf.json
new file mode 100644
index 0000000..975a708
--- /dev/null
+++ b/proxy.conf.json
@@ -0,0 +1,7 @@
+{
+  "/api": {
+    "target": "http://localhost:8080",
+    "secure": false,
+    "changeOrigin": true
+  }
+}
diff --git a/src/app/issues/issues-api.service.ts b/src/app/issues/issues-api.service.ts
index c54c79b..2348a32 100644
--- a/src/app/issues/issues-api.service.ts
+++ b/src/app/issues/issues-api.service.ts
@@ -3,7 +3,7 @@ import { Injectable, inject } from '@angular/core';
 import { Observable } from 'rxjs';
 import { IssueEntity } from './issues.store';
 
-export const API_BASE_URL = 'http://localhost:8080';
+export const API_BASE_URL = '/api';
 
 @Injectable({ providedIn: 'root' })
 export class IssuesApiService {