diff --git a/Dockerfile b/Dockerfile
index e8c0bf52224ae132bcd25c8f7826f6f33544b364..d24200ce112dc8c69bfd92183bd6f9af08e4b411 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@ RUN npm install
 COPY . .
 
 # Build the Angular app
-RUN npm run ng build --configuration=prod
+RUN npx ng build --base-href=/v2/ --configuration=prod
 
 #RUN npm run ng -- build --configuration=dev02
 
diff --git a/nginx.conf b/nginx.conf
index a40436b2c965786f91c7277607e0c56a4f24460d..5617e0468263e07f09a7a6d2892b9c505d539e18 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -1,15 +1,14 @@
 server {
     listen 80;
-
     server_name localhost;
 
     root /usr/share/nginx/html;
-    index index.html;
 
-    location / {
-        # Angular routing fallback
-        try_files $uri /index.html;
+    location /v2/ {
+        alias /usr/share/nginx/html/;
+        index index.html;
+        try_files $uri $uri/ /index.html;
     }
 
-    error_page 404 /index.html;
+    error_page 404 /v2/index.html;
 }