diff --git a/.github/share-actions/ui-types-from-backend/action.yml b/.github/share-actions/ui-types-from-backend/action.yml
index 17bae2d045..4507faa706 100644
--- a/.github/share-actions/ui-types-from-backend/action.yml
+++ b/.github/share-actions/ui-types-from-backend/action.yml
@@ -7,7 +7,7 @@ runs:
       uses: actions/cache@v4
       with:
         path: ui/packages/evidently-ui-lib/src/api/types/endpoints.d.ts
-        key: ui-types-${{ runner.os }}-${{ hashFiles('./.github/**', './src/evidently/**', '!src/evidently/ui/assets/**', '!src/evidently/nbextension/**') }}
+        key: ui-types-${{ runner.os }}-${{ hashFiles('./.github/**', './src/evidently/**', '!src/evidently/**/ui/**/assets/**', '!src/evidently/nbextension/**') }}
 
     - uses: actions/setup-python@v5
       if: steps.cache-ui-types.outputs.cache-hit != 'true'
diff --git a/setup.py b/setup.py
index ae38fb9b38..825e80c090 100644
--- a/setup.py
+++ b/setup.py
@@ -26,10 +26,14 @@
     "evidently": [
         "nbextension/static/*.*js*",
         "nbextension/static/*.*woff2*",
-        "ui/assets/*",
-        "ui/assets/static/css/*",
-        "ui/assets/static/js/*",
-        "ui/assets/static/img/*",
+        "legacy/ui/assets/*",
+        "legacy/ui/assets/static/css/*",
+        "legacy/ui/assets/static/js/*",
+        "legacy/ui/assets/static/img/*",
+        "ui/service/assets/*",
+        "ui/service/assets/static/css/*",
+        "ui/service/assets/static/js/*",
+        "ui/service/assets/static/img/*",
     ]
 }