diff --git a/project-integrations/aerogear-ups/auth-server/src/main/webapp/WEB-INF/classes/META-INF/keycloak-server.json b/project-integrations/aerogear-ups/auth-server/src/main/webapp/WEB-INF/classes/META-INF/keycloak-server.json
index 752704ce74..fd02151ac8 100755
--- a/project-integrations/aerogear-ups/auth-server/src/main/webapp/WEB-INF/classes/META-INF/keycloak-server.json
+++ b/project-integrations/aerogear-ups/auth-server/src/main/webapp/WEB-INF/classes/META-INF/keycloak-server.json
@@ -3,10 +3,21 @@
         "realm": "master"
     },
 
+    "audit": {
+        "provider": "jpa",
+        "jpa": {
+            "exclude-events": [ "REFRESH_TOKEN" ]
+        }
+    },
+
     "model": {
         "provider": "jpa"
     },
 
+    "userSessions": {
+        "provider" : "mem"
+    },
+
     "modelCache": {
         "provider": "${keycloak.model.cache.provider:}"
     },
@@ -17,11 +28,25 @@
 
     "theme": {
         "default": "keycloak",
+        "staticMaxAge": 2592000,
+        "cacheTemplates": true,
         "folder": {
             "dir": "${jboss.server.config.dir}/themes"
         }
     },
 
+    "login": {
+        "provider": "freemarker"
+    },
+
+    "account": {
+        "provider": "freemarker"
+    },
+
+    "email": {
+        "provider": "freemarker"
+    },
+
     "scheduled": {
         "interval": 900
     }
diff --git a/testsuite/tools/src/main/resources/META-INF/keycloak-server.json b/testsuite/tools/src/main/resources/META-INF/keycloak-server.json
index 7e3f2465b8..fd02151ac8 100755
--- a/testsuite/tools/src/main/resources/META-INF/keycloak-server.json
+++ b/testsuite/tools/src/main/resources/META-INF/keycloak-server.json
@@ -14,6 +14,10 @@
         "provider": "jpa"
     },
 
+    "userSessions": {
+        "provider" : "mem"
+    },
+
     "modelCache": {
         "provider": "${keycloak.model.cache.provider:}"
     },
@@ -27,7 +31,7 @@
         "staticMaxAge": 2592000,
         "cacheTemplates": true,
         "folder": {
-          "dir": "${jboss.server.config.dir}/themes"
+            "dir": "${jboss.server.config.dir}/themes"
         }
     },