diff --git a/notes-service/pom.xml b/notes-service/pom.xml
index 2c4787ace..0af763215 100644
--- a/notes-service/pom.xml
+++ b/notes-service/pom.xml
@@ -49,7 +49,7 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.addons.analytics</groupId>
+      <groupId>io.meeds.analytics</groupId>
       <artifactId>analytics-api</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/notes-service/src/main/java/io/meeds/notes/listener/AnalyticsAddTagListener.java b/notes-service/src/main/java/io/meeds/notes/listener/AnalyticsAddTagListener.java
index fd1ef39d5..3c7bdc4f8 100644
--- a/notes-service/src/main/java/io/meeds/notes/listener/AnalyticsAddTagListener.java
+++ b/notes-service/src/main/java/io/meeds/notes/listener/AnalyticsAddTagListener.java
@@ -19,8 +19,8 @@
 package io.meeds.notes.listener;
 
 import org.apache.commons.lang3.StringUtils;
-import org.exoplatform.analytics.model.StatisticData;
-import org.exoplatform.analytics.utils.AnalyticsUtils;
+import io.meeds.analytics.model.StatisticData;
+import io.meeds.analytics.utils.AnalyticsUtils;
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.Listener;
 import org.exoplatform.services.security.ConversationState;
diff --git a/notes-service/src/test/java/io/meeds/notes/listener/AnalyticsAddTagListenerTest.java b/notes-service/src/test/java/io/meeds/notes/listener/AnalyticsAddTagListenerTest.java
index 740a13d4b..179e5e238 100644
--- a/notes-service/src/test/java/io/meeds/notes/listener/AnalyticsAddTagListenerTest.java
+++ b/notes-service/src/test/java/io/meeds/notes/listener/AnalyticsAddTagListenerTest.java
@@ -18,7 +18,7 @@
  */
 package io.meeds.notes.listener;
 
-import org.exoplatform.analytics.utils.AnalyticsUtils;
+import io.meeds.analytics.utils.AnalyticsUtils;
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.security.ConversationState;
 import org.exoplatform.services.security.Identity;
diff --git a/notes-social-integration/pom.xml b/notes-social-integration/pom.xml
index 602a1266c..78e88b8bf 100644
--- a/notes-social-integration/pom.xml
+++ b/notes-social-integration/pom.xml
@@ -29,7 +29,7 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.addons.analytics</groupId>
+      <groupId>io.meeds.analytics</groupId>
       <artifactId>analytics-api</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/notes-social-integration/src/main/java/org/exoplatform/notes/listener/analytics/NotesPageListener.java b/notes-social-integration/src/main/java/org/exoplatform/notes/listener/analytics/NotesPageListener.java
index d7c69efb6..2196ca0d2 100644
--- a/notes-social-integration/src/main/java/org/exoplatform/notes/listener/analytics/NotesPageListener.java
+++ b/notes-social-integration/src/main/java/org/exoplatform/notes/listener/analytics/NotesPageListener.java
@@ -18,14 +18,14 @@
  */
 package org.exoplatform.notes.listener.analytics;
 
-import static org.exoplatform.analytics.utils.AnalyticsUtils.addSpaceStatistics;
+import static io.meeds.analytics.utils.AnalyticsUtils.addSpaceStatistics;
 
 import java.util.concurrent.CompletableFuture;
 
 import org.apache.commons.lang3.StringUtils;
 
-import org.exoplatform.analytics.model.StatisticData;
-import org.exoplatform.analytics.utils.AnalyticsUtils;
+import io.meeds.analytics.model.StatisticData;
+import io.meeds.analytics.utils.AnalyticsUtils;
 import org.exoplatform.container.ExoContainerContext;
 import org.exoplatform.container.PortalContainer;
 import org.exoplatform.container.component.RequestLifeCycle;
diff --git a/notes-webapp/src/main/webapp/WEB-INF/conf/configuration.xml b/notes-webapp/src/main/webapp/WEB-INF/conf/configuration.xml
index b95f4e13e..182a5bb78 100644
--- a/notes-webapp/src/main/webapp/WEB-INF/conf/configuration.xml
+++ b/notes-webapp/src/main/webapp/WEB-INF/conf/configuration.xml
@@ -31,7 +31,6 @@
   <import>war:/conf/wiki/dynamic-container-configuration.xml</import>
   <import>war:/conf/wiki/search-configuration.xml</import>
   <import>war:/conf/wiki/ckeditor-configuration.xml</import>
-  <import profiles="analytics">war:/conf/wiki/analytics-ui-watchers-configuration.xml</import>
   <import>war:/conf/wiki/metadata-configuration.xml</import>
 
 </configuration>
diff --git a/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/analytics-ui-watchers-configuration.xml b/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/analytics-ui-watchers-configuration.xml
deleted file mode 100644
index 9a3476c39..000000000
--- a/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/analytics-ui-watchers-configuration.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2019 eXo Platform SAS. This is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License 
-  for more details. You should have received a copy of the GNU Lesser General Public License along with this software; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org. -->
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
-
-  <external-component-plugins>
-    <target-component>org.exoplatform.analytics.api.service.AnalyticsService</target-component>
-    <component-plugin>
-      <name>Switch to Old Wiki App</name>
-      <set-method>addUIWatcherPlugin</set-method>
-      <type>org.exoplatform.analytics.api.service.StatisticUIWatcherPlugin</type>
-      <init-params>
-        <object-param>
-          <name>watcher</name>
-          <object type="org.exoplatform.analytics.api.service.StatisticWatcher">
-            <!-- Statistic data: name field -->
-            <field name="name">
-              <string>Switch to Old Wik App</string>
-            </field>
-            <!-- Statistic data: operation field -->
-            <field name="operation">
-              <string>click</string>
-            </field>
-            <!-- Statistic data: additional embedded parameters -->
-            <field name="parameters">
-              <map type="java.util.HashMap">
-                <entry>
-                  <key>
-                    <string>ui</string>
-                  </key>
-                  <value>
-                    <string>notes</string>
-                  </value>
-                </entry>
-                <entry>
-                  <key>
-                    <string>application</string>
-                  </key>
-                  <value>
-                    <string>notesHeader</string>
-                  </value>
-                </entry>
-              </map>
-            </field>
-            <!-- DOM jquery selector, used to search elements -->
-            <field name="domSelector">
-              <string>#switchToOldWikiApp</string>
-            </field>
-            <!-- DOM jquery event, used to trigger storing new statistic data -->
-            <field name="domEvent">
-              <string>mousedown</string>
-            </field>
-          </object>
-        </object-param>
-      </init-params>
-    </component-plugin>
-
-    <component-plugin>
-      <name>Switch to New Notes App</name>
-      <set-method>addUIWatcherPlugin</set-method>
-      <type>org.exoplatform.analytics.api.service.StatisticUIWatcherPlugin</type>
-      <init-params>
-        <object-param>
-          <name>watcher</name>
-          <object type="org.exoplatform.analytics.api.service.StatisticWatcher">
-            <!-- Statistic data: name field -->
-            <field name="name">
-              <string>Switch to New Notes App</string>
-            </field>
-            <!-- Statistic data: operation field -->
-            <field name="operation">
-              <string>click</string>
-            </field>
-            <!-- Statistic data: additional embedded parameters -->
-            <field name="parameters">
-              <map type="java.util.HashMap">
-                <entry>
-                  <key>
-                    <string>ui</string>
-                  </key>
-                  <value>
-                    <string>notes</string>
-                  </value>
-                </entry>
-                <entry>
-                  <key>
-                    <string>application</string>
-                  </key>
-                  <value>
-                    <string>notesHeader</string>
-                  </value>
-                </entry>
-              </map>
-            </field>
-            <!-- DOM jquery selector, used to search elements -->
-            <field name="domSelector">
-              <string>#switchToNewNotesApp</string>
-            </field>
-            <!-- DOM jquery event, used to trigger storing new statistic data -->
-            <field name="domEvent">
-              <string>mousedown</string>
-            </field>
-          </object>
-        </object-param>
-      </init-params>
-    </component-plugin>
-
-    <component-plugin>
-      <name>Open Add note</name>
-      <set-method>addUIWatcherPlugin</set-method>
-      <type>org.exoplatform.analytics.api.service.StatisticUIWatcherPlugin</type>
-      <init-params>
-        <object-param>
-          <name>watcher</name>
-          <object type="org.exoplatform.analytics.api.service.StatisticWatcher">
-            <!-- Statistic data: name field -->
-            <field name="name">
-              <string>Open Add note</string>
-            </field>
-            <!-- Statistic data: operation field -->
-            <field name="operation">
-              <string>Open Add note</string>
-            </field>
-            <!-- Statistic data: additional embedded parameters -->
-            <field name="parameters">
-              <map type="java.util.HashMap">
-                <entry>
-                  <key>
-                    <string>ui</string>
-                  </key>
-                  <value>
-                    <string>notes</string>
-                  </value>
-                </entry>
-                <entry>
-                  <key>
-                    <string>application</string>
-                  </key>
-                  <value>
-                    <string>notesActions</string>
-                  </value>
-                </entry>
-              </map>
-            </field>
-            <!-- DOM jquery selector, used to search elements -->
-            <field name="domSelector">
-              <string>.add-note-click</string>
-            </field>
-            <!-- DOM jquery event, used to trigger storing new statistic data -->
-            <field name="domEvent">
-              <string>mousedown</string>
-            </field>
-          </object>
-        </object-param>
-      </init-params>
-    </component-plugin>
-
-    <component-plugin>
-      <name>Open Edit note</name>
-      <set-method>addUIWatcherPlugin</set-method>
-      <type>org.exoplatform.analytics.api.service.StatisticUIWatcherPlugin</type>
-      <init-params>
-        <object-param>
-          <name>watcher</name>
-          <object type="org.exoplatform.analytics.api.service.StatisticWatcher">
-            <!-- Statistic data: name field -->
-            <field name="name">
-              <string>Open Edit note</string>
-            </field>
-            <!-- Statistic data: operation field -->
-            <field name="operation">
-              <string>Open Edit note</string>
-            </field>
-            <!-- Statistic data: additional embedded parameters -->
-            <field name="parameters">
-              <map type="java.util.HashMap">
-                <entry>
-                  <key>
-                    <string>ui</string>
-                  </key>
-                  <value>
-                    <string>notes</string>
-                  </value>
-                </entry>
-                <entry>
-                  <key>
-                    <string>application</string>
-                  </key>
-                  <value>
-                    <string>notesActions</string>
-                  </value>
-                </entry>
-              </map>
-            </field>
-            <!-- DOM jquery selector, used to search elements -->
-            <field name="domSelector">
-              <string>.edit-note-click</string>
-            </field>
-            <!-- DOM jquery event, used to trigger storing new statistic data -->
-            <field name="domEvent">
-              <string>mousedown</string>
-            </field>
-          </object>
-        </object-param>
-      </init-params>
-    </component-plugin>
-
-  </external-component-plugins>
-
-</configuration>
diff --git a/pom.xml b/pom.xml
index e0d8ebdb4..1ed45898e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,10 +29,11 @@
     <!-- **************************************** -->
     <!-- Project Dependencies                     -->
     <!-- **************************************** -->
+<<<<<<< HEAD
     <org.exoplatform.social.version>7.0.x-exo-SNAPSHOT</org.exoplatform.social.version>
     <org.exoplatform.platform-ui.version>7.0.x-exo-SNAPSHOT</org.exoplatform.platform-ui.version>
     <addon.exo.gamification.version>7.0.x-exo-SNAPSHOT</addon.exo.gamification.version>
-    <addon.exo.analytics.version>7.0.x-exo-SNAPSHOT</addon.exo.analytics.version>
+    <addon.meeds.analytics.version>7.0.x-exo-SNAPSHOT</addon.meeds.analytics.version>
     <addon.meeds.layout.version>7.0.x-exo-SNAPSHOT</addon.meeds.layout.version>
 
     <!-- Sonar properties -->
@@ -68,9 +69,9 @@
         <scope>import</scope>
       </dependency>
       <dependency>
-        <groupId>org.exoplatform.addons.analytics</groupId>
+        <groupId>io.meeds.analytics</groupId>
         <artifactId>analytics-parent</artifactId>
-        <version>${addon.exo.analytics.version}</version>
+        <version>${addon.meeds.analytics.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>