diff --git a/.github/workflows/generate-template-json.py b/.github/workflows/generate-template-json.py
index d7a0f87..0d4aeb0 100755
--- a/.github/workflows/generate-template-json.py
+++ b/.github/workflows/generate-template-json.py
@@ -44,7 +44,7 @@ for filename in sorted(glob.glob("composes-files/*.y*ml")):
                 elif data[0] == "note":
                     try:
                         link = re.search("(?<=href=')[^']+(?=')", data[1]).group()
-                        website = re.search("(?<=rel='noopener'>)[^']+(?=<)", data[1]).group()
+                        website = re.search("(?<=rel='noopener'>)[^']+(?=<\/a)", data[1]).group()
                     except:
                         link=""
                         website=""
@@ -93,7 +93,7 @@ for filename in sorted(glob.glob("composes-files/*.y*ml")):
             dataset["env"] = env
             templates.append(dataset)
             print (f" ✅ {filename} ")
-            SERVICES=SERVICES + f'\n| ✅ | <img src="{logo}" alt="{file_name}" width="20"/> [{file_name}](https://github.com/PAPAMICA/docker-compose-collection/tree/master/composes-files/{file_name}.yml) | [{website}]{link} | {date} | {maintainer} |'
+            SERVICES=SERVICES + f'\n| ✅ | <img src="{logo}" alt="{file_name}" width="20"/> [{file_name}](https://github.com/PAPAMICA/docker-compose-collection/tree/master/composes-files/{file_name}.yml) | [{website}]({link}) | {date} | {maintainer} |'
             nb_a += 1
             
         else: