diff --git a/SAS/LSMR/docker/lsmr-testenv/lsmr_testenv_Dockerfile b/SAS/LSMR/docker/lsmr-testenv/lsmr_testenv_Dockerfile
index a0892ac800433316294e6a691cbb7e759602b543..dde6329fc17e4f85cd8cbf1be79382ca204bf96b 100644
--- a/SAS/LSMR/docker/lsmr-testenv/lsmr_testenv_Dockerfile
+++ b/SAS/LSMR/docker/lsmr-testenv/lsmr_testenv_Dockerfile
@@ -60,5 +60,5 @@ ENTRYPOINT /bin/bash -c 'export VARIANT=gnucxx11_opt; \
            lsmr_testdatabase & \
            sleep 15 && \
            lsmr & \
-           cd /lofar/build/gnucxx11_opt/SAS/LSMR/frontend/frontend_poc && \
+           cd /lofar/build/gnucxx11_opt/installed/share/www && \
            npm start'
\ No newline at end of file
diff --git a/SAS/LSMR/docker/lsmr-testenv/nginx.conf b/SAS/LSMR/docker/lsmr-testenv/nginx.conf
index 6c84f08eda64c1a6790248627a590a3252e981bd..c00bf984dbd5cdc0f00cc3b5648f44af7c492343 100644
--- a/SAS/LSMR/docker/lsmr-testenv/nginx.conf
+++ b/SAS/LSMR/docker/lsmr-testenv/nginx.conf
@@ -29,7 +29,7 @@ http {
       proxy_pass http://lsmr_test:3000$uri;
     }
 
-    location / {
+    location /api/ {
       proxy_pass http://lsmr_test:8000/;
     }
 
diff --git a/SAS/LSMR/frontend/frontend_poc/src/App.js b/SAS/LSMR/frontend/frontend_poc/src/App.js
index 7705faf5a0b8789a46d7fe41c09a7361392cb118..63ed4f460f008c422c3445deb6594db0bad92e90 100644
--- a/SAS/LSMR/frontend/frontend_poc/src/App.js
+++ b/SAS/LSMR/frontend/frontend_poc/src/App.js
@@ -8,7 +8,7 @@ function App() {
       <header className="App-header">
         <img src={logo} className="App-logo" alt="logo" />
         <p>
-          Navigate to <a href='/api/cycle/'>Cycles</a> or <a href='/api/project/'>Projects</a>.
+          Navigate to <a href='/frontend/cycle/'>Cycles</a> or <a href='/frontend/project/'>Projects</a>.
         </p>
         <a
           className="App-link"
diff --git a/SAS/LSMR/frontend/frontend_poc/src/CycleList.js b/SAS/LSMR/frontend/frontend_poc/src/CycleList.js
index 64be58327490fa479050d5400b6ab09458638dfe..e11294b74ae2d009d4ef3773533688f2abc6b515 100644
--- a/SAS/LSMR/frontend/frontend_poc/src/CycleList.js
+++ b/SAS/LSMR/frontend/frontend_poc/src/CycleList.js
@@ -8,7 +8,7 @@ var headers = new Headers();
 headers.append('Authorization', 'Basic ' + btoa('paulus:pauluspass'));
 headers.append('Content-Type', 'application/json');
 
-var api_url = '/'
+var api_url = '/api/'
 
 function lsmrGetList(url, component){
    console.log('Getting '+ url)
diff --git a/SAS/LSMR/frontend/frontend_poc/src/ProjectList.js b/SAS/LSMR/frontend/frontend_poc/src/ProjectList.js
index 0bd084fad58e1ec6b56d79934c7e59b97d387c3f..5bbe56a535b62942ee554e1ab1545957c3030aa1 100644
--- a/SAS/LSMR/frontend/frontend_poc/src/ProjectList.js
+++ b/SAS/LSMR/frontend/frontend_poc/src/ProjectList.js
@@ -9,7 +9,7 @@ var headers = new Headers();
 headers.append('Authorization', 'Basic ' + btoa('paulus:pauluspass'));
 headers.append('Content-Type', 'application/json');
 
-var api_url = '/'
+var api_url = '/app/'
 
 function lsmrGetList(url, component){
    console.log('Getting '+ url)
diff --git a/SAS/LSMR/frontend/frontend_poc/src/index.js b/SAS/LSMR/frontend/frontend_poc/src/index.js
index e60f03d9e351f3b6d45a434f0d0a77992a30a1ee..a809b448c60bb2bb463fd0cd447cd90fa3df484f 100644
--- a/SAS/LSMR/frontend/frontend_poc/src/index.js
+++ b/SAS/LSMR/frontend/frontend_poc/src/index.js
@@ -11,9 +11,9 @@ import { Route, Link, BrowserRouter as Router } from 'react-router-dom'
 const routing = (
   <Router>
     <div>
-      <Route exact path="/" component={App} />
-      <Route path="/cycle" component={CycleList} />
-      <Route path="/project" component={ProjectList} />
+      <Route exact path="/frontend/" component={App} />
+      <Route path="/frontend/cycle" component={CycleList} />
+      <Route path="/frontend/project" component={ProjectList} />
     </div>
   </Router>
 )
diff --git a/SAS/LSMR/src/lsmr/urls.py b/SAS/LSMR/src/lsmr/urls.py
index c0eefc8e0efc7b29475818e800232668c4a4bcc8..339f3c18485b8c5a56025f04937afa7e4492bb28 100644
--- a/SAS/LSMR/src/lsmr/urls.py
+++ b/SAS/LSMR/src/lsmr/urls.py
@@ -44,11 +44,11 @@ swagger_schema_view = get_schema_view(
 )
 
 urlpatterns = [
-    path('admin/', admin.site.urls),
-    path('docs/', include_docs_urls(title='LSMR API')),
+    path('api/admin/', admin.site.urls),
+    path('api/docs/', include_docs_urls(title='LSMR API')),
     re_path(r'^swagger(?P<format>\.json|\.yaml)$', swagger_schema_view.without_ui(cache_timeout=0), name='schema-json'),
-    path('swagger/', swagger_schema_view.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui'),
-    path('redoc/', swagger_schema_view.with_ui('redoc', cache_timeout=0), name='schema-redoc'),
+    path('api/swagger/', swagger_schema_view.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui'),
+    path('api/redoc/', swagger_schema_view.with_ui('redoc', cache_timeout=0), name='schema-redoc'),
 ]