diff --git a/.github/workflows/Readme-template.md b/.github/workflows/Readme-template.md
index fd3b8ca..b4610c9 100644
--- a/.github/workflows/Readme-template.md
+++ b/.github/workflows/Readme-template.md
@@ -39,7 +39,7 @@ You can deploye a compatible Docker environment with Portainer and Traefik with:
 ## List of services availables:
 ##NB_A##
 
-| Status | Service | Update | Maintainer |
+| Status | Service | Website | Update | Maintainer |
 ##SERVICES##
 
 ## List of services to do:
diff --git a/.github/workflows/generate-template-json.py b/.github/workflows/generate-template-json.py
index 74d21a1..d7a0f87 100755
--- a/.github/workflows/generate-template-json.py
+++ b/.github/workflows/generate-template-json.py
@@ -7,7 +7,7 @@ import datetime
 from textwrap import indent
 
 GITHUB_REPOSITORY_URL = 'https://github.com/PAPAMICA/docker-compose-collection'
-SERVICES="|:--:|--|--|--|"
+SERVICES="|:--:|--|--|--|--|"
 SERVICES_TODO="|:--:|--|"
 try:
     os.remove("./templates-portainer.json") 
@@ -44,8 +44,10 @@ 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()
                     except:
                         link=""
+                        website=""
                     dataset[data[0]] = data[1]
                     print(link)
                 elif data[0] == "title":
@@ -91,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}]({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: