diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index 36f7340c1f9ec85944fb8c892626c76891b0a2de..07ab3a03d8ad556380ce6510cc96c4c5fa37acd2 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -46,17 +46,27 @@ class Configuration implements ConfigurationInterface
                     ->example('mysecret')
                 ->end()
 
+                // API Frontend (API docs etc)
+                ->scalarNode('frontend_client_id')
+                    ->info('The client ID for the OIDC client (authorization code flow) used for API docs and other frontends provided by the API itself')
+                    ->example('client-docs')
+                ->end()
+
+                // [DEPRECATED]
                 // API docs. This is still Keycloak specific because we only have a keycloak
                 // web component right now.
                 ->scalarNode('frontend_keycloak_server')
+                    ->setDeprecated('dbp/relay-auth-bundle', '0.1.12', 'No longer needed')
                     ->info('The Keycloak server base URL')
                     ->example('https://keycloak.example.com/auth')
                 ->end()
                 ->scalarNode('frontend_keycloak_realm')
+                    ->setDeprecated('dbp/relay-auth-bundle', '0.1.12', 'No longer needed')
                     ->info('The keycloak realm')
                     ->example('client-docs')
                 ->end()
                 ->scalarNode('frontend_keycloak_client_id')
+                    ->setDeprecated('dbp/relay-auth-bundle', '0.1.12', 'Use "frontend_client_id" instead')
                     ->info('The ID for the keycloak client (authorization code flow) used for API docs or similar')
                     ->example('client-docs')
                 ->end()
diff --git a/src/DependencyInjection/DbpRelayAuthExtension.php b/src/DependencyInjection/DbpRelayAuthExtension.php
index 0b6e0587e9b3e0f69f303a7d17e0f6f3fd65864b..70ef15df9a17bd5d29ebd2fad8b6bd2e94cb212b 100644
--- a/src/DependencyInjection/DbpRelayAuthExtension.php
+++ b/src/DependencyInjection/DbpRelayAuthExtension.php
@@ -39,6 +39,8 @@ class DbpRelayAuthExtension extends ConfigurableExtension implements PrependExte
     {
         $config = $container->getExtensionConfig($this->getAlias())[0];
         $this->extendArrayParameter($container, 'dbp_api.twig_globals', [
+            'oicd_server_url' => $config['server_url'] ?? '',
+            'oicd_frontend_client_id' => $config['frontend_client_id'] ?? '',
             'keycloak_server_url' => $config['frontend_keycloak_server'] ?? '',
             'keycloak_realm' => $config['frontend_keycloak_realm'] ?? '',
             'keycloak_frontend_client_id' => $config['frontend_keycloak_client_id'] ?? '',