diff --git a/gui/public/env.js b/gui/public/env.js
index 36e728e01c1da9483b8e99b7d5a489edb4008ef9..6cfd9b5127a725477378fadae202d0a0c77d4a16 100644
--- a/gui/public/env.js
+++ b/gui/public/env.js
@@ -3,6 +3,5 @@ window.nomadEnv = {
   'keycloakRealm': 'fairdi_nomad_test',
   'keycloakClientId': 'nomad_gui_dev',
   'appBase': 'http://localhost:8000/fairdi/nomad/latest',
-  'kibanaBase': '/fairdi/kibana',
   'debug': false
 }
diff --git a/gui/src/components/About.js b/gui/src/components/About.js
index 369298abdd0112b4097c17291a71fd33dabeb0a6..ed4246e26aedc46cd4fd854f0647b39b9b84838c 100644
--- a/gui/src/components/About.js
+++ b/gui/src/components/About.js
@@ -2,7 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { withStyles } from '@material-ui/core/styles'
 import Markdown from './Markdown'
-import { kibanaBase, appBase, optimadeBase, apiBase, debug, consent } from '../config'
+import { appBase, optimadeBase, apiBase, debug, consent } from '../config'
 import { compose } from 'recompose'
 import { withApi } from './api'
 import { withDomain } from './domains'
@@ -74,7 +74,7 @@ class About extends React.Component {
           (previously called *Elastic Logstash Kibana* (ELK)-stack).
           This system pushes logs, events, monitoring data,
           and other application metrics to a central database where it
-          can be analysed visually. Here is the [link to Kibana](${kibanaBase}/)
+          can be analysed visually by us.
 
           ### Test user
           During development this GUI might not be connected to the actual NOMAD
diff --git a/gui/src/config.js b/gui/src/config.js
index bc766dbfd135677d570d2ec4a3f4d79787464630..c6b95454571e71a9d062d78c51ed84e187b451ac 100644
--- a/gui/src/config.js
+++ b/gui/src/config.js
@@ -5,7 +5,6 @@ export const appBase = window.nomadEnv.appBase.replace(/\/$/, '')
 export const apiBase = `${appBase}/api`
 export const optimadeBase = `${appBase}/optimade`
 export const guiBase = process.env.PUBLIC_URL
-export const kibanaBase = window.nomadEnv.kibanaBase
 export const matomoUrl = window.nomadEnv.matomoUrl
 export const matomoSiteId = window.nomadEnv.matomoSiteId
 export const keycloakBase = window.nomadEnv.keycloakBase
diff --git a/nomad/config.py b/nomad/config.py
index f20b8e84b2fef91ceb0f467ea9aabc1a5f481560..513138aa42a6093d4f7d3095533604ad7807cbf4 100644
--- a/nomad/config.py
+++ b/nomad/config.py
@@ -112,6 +112,7 @@ elastic = NomadConfig(
 )
 
 keycloak = NomadConfig(
+    server_external_url='https://repository.nomad-coe.eu/fairdi/keycloak/auth/',
     server_url='https://repository.nomad-coe.eu/fairdi/keycloak/auth/',
     realm_name='fairdi_nomad_test',
     username='admin',
diff --git a/nomad/infrastructure.py b/nomad/infrastructure.py
index e1c6b5b7cd1947c704584b2a0aed74f2d803c1b6..169de04a84912e0c3c6e3eb23c509928c9d06eff 100644
--- a/nomad/infrastructure.py
+++ b/nomad/infrastructure.py
@@ -189,7 +189,7 @@ class Keycloak():
                     options = dict(verify_aud=False, verify_exp=True, verify_iss=True)
                     payload = jwt.decode(
                         g.oidc_access_token, key=key, algorithms=['RS256'], options=options,
-                        issuer='%s/realms/%s' % (config.keycloak.server_url.rstrip('/'), config.keycloak.realm_name))
+                        issuer='%s/realms/%s' % (config.keycloak.server_external_url.rstrip('/'), config.keycloak.realm_name))
 
             except jwt.InvalidTokenError as e:
                 auth_error = str(e)
diff --git a/ops/docker-compose/nomad/example_nomad/env.js b/ops/docker-compose/nomad/example_nomad/env.js
index ce6aecdd3b4823869e18784151283f86785ec744..9a2bcf9bc12566cbfa0fae3e76475127753b1e1e 100644
--- a/ops/docker-compose/nomad/example_nomad/env.js
+++ b/ops/docker-compose/nomad/example_nomad/env.js
@@ -1,5 +1,4 @@
 window.nomadEnv = {
   "appBase": "/example-nomad",
-  "kibanaBase": "/fairdi/kibana",
   "debug": false
 };
\ No newline at end of file
diff --git a/ops/helm/nomad/templates/gui-deployment.yml b/ops/helm/nomad/templates/gui-deployment.yml
index 270f46c9a9626507be00e3643255b8555be5aafd..e619a430de2ec1013ffb3d3af807ef7572474a75 100644
--- a/ops/helm/nomad/templates/gui-deployment.yml
+++ b/ops/helm/nomad/templates/gui-deployment.yml
@@ -77,7 +77,6 @@ data:
   env.js: |
     window.nomadEnv = {
       "appBase": "{{ .Values.proxy.external.path }}",
-      "kibanaBase": "{{ .Values.proxy.external.kibanaPath }}",
       "keycloakBase": "{{ .Values.keycloak.serverUrl }}",
       "keycloakRealm": "{{ .Values.keycloak.realmName }}",
       "keycloakClientId": "{{ .Values.keycloak.guiClientId }}",