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 487f543a5543d90a31c34fc7d999ee63160b53c4..c1d4566648071e0add8f497f2fd0e80373deab0c 100644
--- a/_templates/oshw.html
+++ b/_templates/oshw.html
@@ -8,9 +8,9 @@
         <p class="card-text text-dark">
             <a href="https://certification.oshwa.org/{{ oshw_id|lower }}.html" target="_blank">
               {% if pages_slug %}
-                <img src="../../../../{{pages_slug}}/_static/images/oshw/{{board}}_{{path | replace('/', '-')}}_{{oshw_id}}.svg" alt="{{board}} OSHW mark"/>
+                <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 29ea03965faa6d73f9caf0faf6a642146663e2e6..cac4f1b43818c775106ec885c646701bad8230c1 100644
--- a/conf.py
+++ b/conf.py
@@ -32,9 +32,10 @@ for (dirpath, dirnames, filenames) in os.walk(oshw_logos_path):
         if filename.endswith('.svg'):
             oshw_logo_name = filename.split(".")[0]
             board, path, oshw_id = oshw_logo_name.split('_')
-            path = path.replace('-','/')
+            path = path.replace('@','/')
             oshw_details.append([board, path, oshw_id])
-            
+
+print(oshw_details)
 # Unique boards path information
 boards_path = []
 for board, path, oshw_id in oshw_details: