diff --git a/build.gradle b/build.gradle
index 44275f9..6075335 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.cubaVersion = '6.9.3'
+    ext.cubaVersion = '6.9.7'
     repositories {
         maven {
             url 'https://repo.cuba-platform.com/content/groups/work'
diff --git a/modules/core/src/com/haulmont/addon/admintools/spring.xml b/modules/core/src/com/haulmont/addon/admintools/spring.xml
index 2949224..68edf2c 100644
--- a/modules/core/src/com/haulmont/addon/admintools/spring.xml
+++ b/modules/core/src/com/haulmont/addon/admintools/spring.xml
@@ -12,7 +12,7 @@
           class="com.haulmont.cuba.core.sys.jmx.MBeanExporter">
         <property name="beans">
             <map>
-                <entry key="cuba-at:type=TomcatCore"
+                <entry key="${cuba.webContextName}.cuba-at:type=TomcatCore"
                        value-ref="cuba-at_TomcatCoreMBean"/>
             </map>
         </property>