diff --git a/src/main/java/eu/hbp/mip/configuration/KeycloakConfiguration.java b/src/main/java/eu/hbp/mip/configuration/KeycloakConfiguration.java
new file mode 100644
index 0000000000000000000000000000000000000000..45c5989245e8113affb00f7827a88df1f80b6800
--- /dev/null
+++ b/src/main/java/eu/hbp/mip/configuration/KeycloakConfiguration.java
@@ -0,0 +1,14 @@
+package eu.hbp.mip.configuration;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import org.keycloak.KeycloakSecurityContext;
+
+public class KeycloakConfiguration {
+
+    @Autowired
+    private HttpServletRequest request;
+    public KeycloakSecurityContext getKeycloakSecurityContext() {
+        return (KeycloakSecurityContext) request.getAttribute(KeycloakSecurityContext.class.getName());
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java b/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java
index adacd7a814d7a50434df94ec843160f93dc2ade8..3d0a4935732b0f2c266b9b647ddbeccba3f28d36 100644
--- a/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java
+++ b/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java
@@ -88,8 +88,8 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
     @Value("#{'${hbp.resource.revokeTokenUri:https://services.humanbrainproject.eu/oidc/revoke}'}")
     private String revokeTokenURI;
 
-    @Autowired
-    private HttpServletRequest request;
+//    @Autowired
+//    private HttpServletRequest request;
 
     @Override
     protected void configure(HttpSecurity http) throws Exception {
@@ -112,7 +112,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
         }
         else {
             //keycloak
-            (KeycloakSecurityContext) request.getAttribute(KeycloakSecurityContext.class.getName());
+            KeycloakConfiguration.getKeycloakSecurityContext();
 //            http.antMatcher("/**")
 //                    .authorizeRequests()
 //                    .antMatchers("/**").permitAll().and().csrf().disable();