diff --git a/oidc-playground-client/docker/conf/000-default.conf b/oidc-playground-client/docker/conf/000-default.conf
index f790434..d0cdff9 100644
--- a/oidc-playground-client/docker/conf/000-default.conf
+++ b/oidc-playground-client/docker/conf/000-default.conf
@@ -14,11 +14,10 @@ RewriteCond %{REQUEST_URI} !^/oidc
 RewriteCond %{REQUEST_URI} !^/internal
 RewriteCond %{REQUEST_URI} !^/fonts
 RewriteRule (.*) /index.html [L]
-ProxyPass /oidc/api/ http://oidcplaygroundserver:8080/g/ retry=0
-ProxyPassReverse /oidc/api/ http://oidcplaygroundserver:8080/g/
-
-ProxyPass /internal http://oidcplaygroundserver:8080/g/internal retry=0
-ProxyPassReverse /internal http://oidcplaygroundserver:8080/g/internal
+ProxyPass /oidc/api/ http://oidcplaygroundserver:8080/
+ProxyPassReverse /oidc/api/ http://oidcplaygroundserver:8080/
+ProxyPass /internal http://oidcplaygroundserver:8080/internal 
+ProxyPassReverse /internal http://oidcplaygroundserver:8080/internal
 
 DocumentRoot "/var/www/html"
 
diff --git a/oidc-playground-server/src/main/resources/application-devconf.yml b/oidc-playground-server/src/main/resources/application-devconf.yml
index 9ded3a6..c472a59 100644
--- a/oidc-playground-server/src/main/resources/application-devconf.yml
+++ b/oidc-playground-server/src/main/resources/application-devconf.yml
@@ -1,24 +1,24 @@
 server:
-  port: 8079
+  port: 8080
   error:
     path: "/error"
   max-http-header-size: 10000000
   server-header:
   servlet:
-    context-path: /oidc/api
+    context-path:
   tomcat:
     max-http-form-post-size: 10000000
 
 oidc:
-  discovery_endpoint: "https://dev.openconext.local/oidc/.well-known/openid-configuration"
-  client_id: "playground_client"
-  secret: "secret"
+  discovery_endpoint: "https://connect.dev.openconext.local/oidc/.well-known/openid-configuration"
+  client_id: "oidc-playground.dev.openconext.local"
+  secret: "secretsecret"
   jwt_secret: "very-long-long-long-long-long-secret"
-  resource_server_id: "resource-server-playground-client"
-  resource_server_secret: "secret"
-  redirect_uri: "https://dev.openconext.local/redirect"
-  redirect_uri_form_post: "https://dev.openconext.local/oidc/api/redirect"
-  client_redirect_uri: "https://dev.openconext.local/redirect"
+  resource_server_id: "oidc-playgroundrs.dev.openconext.local"
+  resource_server_secret: "secretsecret"
+  redirect_uri: "https://oidc-playground.dev.openconext.local/redirect"
+  redirect_uri_form_post: "https://oidc-playground.dev.openconext.local/oidc/api/redirect"
+  client_redirect_uri: "https://connect.dev.openconext.local/redirect"
 
 gui:
   disclaimer: