diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json
index 9cf83e3235..f827f7206a 100644
--- a/src/Umbraco.Web.UI.Client/package.json
+++ b/src/Umbraco.Web.UI.Client/package.json
@@ -41,6 +41,8 @@
 		"./document": "./dist-cms/packages/documents/documents/index.js",
 		"./data-type": "./dist-cms/packages/settings/data-types/index.js",
 		"./user-group": "./dist-cms/packages/users/user-groups/index.js",
+		"./current-user": "./dist-cms/packages/users/current-user/index.js",
+		"./users/": "./dist-cms/packages/users/users/index.js",
 		"./external/*": "./dist-cms/external/*/index.js"
 	},
 	"files": [
diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/current-user/index.ts b/src/Umbraco.Web.UI.Client/src/packages/users/current-user/index.ts
new file mode 100644
index 0000000000..30f15ab9c5
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/users/current-user/index.ts
@@ -0,0 +1,4 @@
+export * from './types.js';
+// TODO:Do not export store, but instead export future repository
+export * from './current-user.store.js';
+export * from './current-user-history.store.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/users/index.ts b/src/Umbraco.Web.UI.Client/src/packages/users/users/index.ts
new file mode 100644
index 0000000000..d4702960d5
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/packages/users/users/index.ts
@@ -0,0 +1 @@
+export * from './types.js';
diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json
index 415d4e6c1a..6aa564d2ea 100644
--- a/src/Umbraco.Web.UI.Client/tsconfig.json
+++ b/src/Umbraco.Web.UI.Client/tsconfig.json
@@ -73,6 +73,9 @@
 
 			// USERS
 			"@umbraco-cms/backoffice/user-group": ["src/packages/users/user-groups"],
+			"@umbraco-cms/backoffice/current-user": ["src/packages/users/current-user"],
+			"@umbraco-cms/backoffice/users": ["src/packages/users/users"],
+
 			"@umbraco-cms/backoffice/css": ["src/shared/css/custom-properties.css"],
 
 			"@umbraco-cms/internal/lit-element": ["src/shared/lit-element"],
diff --git a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs
index e69e89f94a..620a2ea5af 100644
--- a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs
+++ b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs
@@ -84,6 +84,8 @@ export default {
 						'@umbraco-cms/backoffice/data-type': './src/packages/settings/data-types/index.ts',
 
 						'@umbraco-cms/backoffice/user-group': './src/packages/users/user-groups/index.ts',
+						"@umbraco-cms/backoffice/current-user": "./src/packages/users/current-user/index.js",
+						"@umbraco-cms/backoffice/users": "./src/packages/users/users/index.js",
 
 						'@umbraco-cms/internal/test-utils': './utils/test-utils.ts',
 					},