diff --git a/community/bolt/pom.xml b/community/bolt/pom.xml
index 1b7cc42cb0f79..e31425ac30955 100644
--- a/community/bolt/pom.xml
+++ b/community/bolt/pom.xml
@@ -60,6 +60,11 @@
             <artifactId>neo4j-kernel</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.neo4j</groupId>
+            <artifactId>neo4j-udc</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.neo4j</groupId>
diff --git a/community/kernel/src/main/java/org/neo4j/udc/UsageData.java b/community/udc/src/main/java/org/neo4j/udc/UsageData.java
similarity index 100%
rename from community/kernel/src/main/java/org/neo4j/udc/UsageData.java
rename to community/udc/src/main/java/org/neo4j/udc/UsageData.java
index e33f84cb42ae1..f6de4ade5e416 100644
--- a/community/kernel/src/main/java/org/neo4j/udc/UsageData.java
+++ b/community/udc/src/main/java/org/neo4j/udc/UsageData.java
@@ -21,10 +21,10 @@
 
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.neo4j.kernel.lifecycle.LifecycleAdapter;
 import org.neo4j.scheduler.Group;
 import org.neo4j.scheduler.JobHandle;
 import org.neo4j.scheduler.JobScheduler;
-import org.neo4j.kernel.lifecycle.LifecycleAdapter;
 
 import static java.util.concurrent.TimeUnit.DAYS;
 
diff --git a/community/kernel/src/main/java/org/neo4j/udc/UsageDataKey.java b/community/udc/src/main/java/org/neo4j/udc/UsageDataKey.java
similarity index 100%
rename from community/kernel/src/main/java/org/neo4j/udc/UsageDataKey.java
rename to community/udc/src/main/java/org/neo4j/udc/UsageDataKey.java
diff --git a/community/kernel/src/main/java/org/neo4j/udc/UsageDataKeys.java b/community/udc/src/main/java/org/neo4j/udc/UsageDataKeys.java
similarity index 100%
rename from community/kernel/src/main/java/org/neo4j/udc/UsageDataKeys.java
rename to community/udc/src/main/java/org/neo4j/udc/UsageDataKeys.java
diff --git a/community/kernel/src/test/java/org/neo4j/sysinfo/UsageDataTest.java b/community/udc/src/test/java/org/neo4j/udc/UsageDataTest.java
similarity index 93%
rename from community/kernel/src/test/java/org/neo4j/sysinfo/UsageDataTest.java
rename to community/udc/src/test/java/org/neo4j/udc/UsageDataTest.java
index c779ad26cfee4..ea7d0e83538a0 100644
--- a/community/kernel/src/test/java/org/neo4j/sysinfo/UsageDataTest.java
+++ b/community/udc/src/test/java/org/neo4j/udc/UsageDataTest.java
@@ -17,13 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.sysinfo;
+package org.neo4j.udc;
 
 import org.junit.jupiter.api.Test;
 
 import org.neo4j.scheduler.JobScheduler;
-import org.neo4j.udc.UsageData;
-import org.neo4j.udc.UsageDataKey;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;