diff --git a/applications/workspaces/server/workspaces/persistence/crud_persistence.py b/applications/workspaces/server/workspaces/persistence/crud_persistence.py
index 177bc0bf..c8ac1031 100644
--- a/applications/workspaces/server/workspaces/persistence/crud_persistence.py
+++ b/applications/workspaces/server/workspaces/persistence/crud_persistence.py
@@ -229,7 +229,7 @@ def update_workspace_resources(self, workspace_id, resources):
                 # not found --> create a new wsr
                 filename = os.path.basename(resource)
                 wsr = WorkspaceResourceEntity(
-                    name=filename,
+                    name=filename if not "index" in filename else os.path.basename(os.path.dirname(resource)),
                     folder=resource,
                     origin='{"path": "' + resource + '"}',
                     status=ResourceStatus.P,  # default status
diff --git a/applications/workspaces/tasks/scan-workspace/main.py b/applications/workspaces/tasks/scan-workspace/main.py
index eb0365c1..de8b9f1f 100644
--- a/applications/workspaces/tasks/scan-workspace/main.py
+++ b/applications/workspaces/tasks/scan-workspace/main.py
@@ -32,10 +32,11 @@
     if ".ipynb_checkpoints" in root:
         continue
     for file in files:
-        full_file_name = os.path.join(root, file)
+        
         filename, file_extension = os.path.splitext(full_file_name)
-        if file_extension.lower() in (".nwb", ".netpyne", ".ipynb"):
+        if file_extension.lower() in (".nwb", ".npjson", ".ipynb"):
             logger.info(f"Found resource: {full_file_name}")
+            full_file_name = os.path.join(root, file)
             resources.append(full_file_name)
 
 payload = {