diff --git a/_static/images/oshw/BeagleBone AI_beaglebone#ai_US000169.svg b/_static/images/oshw/BeagleBone AI_beaglebone-ai_US000169.svg
similarity index 100%
rename from _static/images/oshw/BeagleBone AI_beaglebone#ai_US000169.svg
rename to _static/images/oshw/BeagleBone AI_beaglebone-ai_US000169.svg
diff --git a/_static/images/oshw/BeagleY-AI_beagley#ai_US002616.svg b/_static/images/oshw/BeagleY-AI_beagley-ai_US002616.svg
similarity index 100%
rename from _static/images/oshw/BeagleY-AI_beagley#ai_US002616.svg
rename to _static/images/oshw/BeagleY-AI_beagley-ai_US002616.svg
diff --git a/_templates/oshw.html b/_templates/oshw.html
index 8d7364f63fd3e0da23ae1c08f8a40b3bfa65fd9e..3b12a3ec21045739a2cfacf2ccfa4f67247c17f2 100644
--- a/_templates/oshw.html
+++ b/_templates/oshw.html
@@ -10,7 +10,7 @@
               {% if pages_slug %}
                 <img src="../../../../{{pages_slug}}/_static/images/oshw/{{board}}_{{path | replace('/', '#')}}_{{oshw_id}}.svg" alt="{{board}} OSHW mark"/>
               {% else %}
-                <img src="../../../../_static/images/oshw/{{board}}_{{path | replace('/', '#')}}_{{oshw_id}}.svg" alt="{{board}} OSHW mark"/>
+                <img src="../../../../_static/images/oshw/{{board}}_{{path | replace('/', '-')}}_{{oshw_id}}.svg" alt="{{board}} OSHW mark"/>
               {% endif %}
             </a>
         </p>
diff --git a/conf.py b/conf.py
index 15876aeefc322b88052cee78ec6a6051088b89f8..29ea03965faa6d73f9caf0faf6a642146663e2e6 100644
--- a/conf.py
+++ b/conf.py
@@ -30,18 +30,21 @@ oshw_details = []
 for (dirpath, dirnames, filenames) in os.walk(oshw_logos_path):
     for filename in filenames:
         if filename.endswith('.svg'):
-            oshw_logo_name = filename.replace('#','/').split(".")[0]
-            oshw_details.append(oshw_logo_name.split('_'))
-
+            oshw_logo_name = filename.split(".")[0]
+            board, path, oshw_id = oshw_logo_name.split('_')
+            path = path.replace('-','/')
+            oshw_details.append([board, path, oshw_id])
+            
 # Unique boards path information
 boards_path = []
 for board, path, oshw_id in oshw_details:
-    for (dirpath, dirnames, filenames) in os.walk("boards"):
+    for (dirpath, dirnames, filenames) in os.walk("boards"):  
         if '/'+path+'/' in dirpath+'/':
             if path+'/' not in dirpath:
                 boards_path.append(dirpath)
 boards_path = set(boards_path)
 
+print(boards_path)
 # -- Project information --
 project = 'BeagleBoard Docs'
 copyright = '2024, BeagleBoard.org Foundation'