diff --git a/apps/api/src/routes/webhooks/traefik/handlers.ts b/apps/api/src/routes/webhooks/traefik/handlers.ts
index 7c54b5856..2667c54ca 100644
--- a/apps/api/src/routes/webhooks/traefik/handlers.ts
+++ b/apps/api/src/routes/webhooks/traefik/handlers.ts
@@ -535,12 +535,13 @@ export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote
 					if (!found) {
 						continue;
 					}
-					found = await parseAndFindServiceTemplates(service, null, true);
+					found = JSON.parse(JSON.stringify(found).replaceAll('$$id', id));
 					for (const oneService of Object.keys(found.services)) {
 						const isDomainAndProxyConfiguration =
-							found?.services[oneService]?.proxy?.filter((p) => p.domain && p.port) ?? [];
+							found?.services[oneService]?.proxy?.filter((p) => p.port) ?? [];
 						if (isDomainAndProxyConfiguration.length > 0) {
-							const { proxy } = found.services[oneService];
+							const template: any = await parseAndFindServiceTemplates(service, null, true);
+							const { proxy } = template.services[oneService] || found.services[oneService];
 							for (let configuration of proxy) {
 								if (configuration.domain) {
 									const setting = serviceSetting.find(
diff --git a/apps/ui/static/icons/mattermost.svg b/apps/ui/static/icons/mattermost.svg
index b6c526ac6..e71900c57 100644
--- a/apps/ui/static/icons/mattermost.svg
+++ b/apps/ui/static/icons/mattermost.svg
@@ -1 +1,3 @@
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" x="0" y="0" viewBox="0 0 1164 265" xml:space="preserve"><style type="text/css">.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#1b1d21}</style><g id="XMLID_6_"><path id="XMLID_11_" class="st0" d="M280.1 79.4c4.5-.6 8.9-.9 13-.9 4.4 0 8.8.3 13.1.9l28 58 28.8-58c3.5-.6 7.4-.9 11.7-.9 4.3 0 8.4.3 12.4.9l5.8 106.6c-4.3.6-8.4.9-12.2.9-3.8 0-7.6-.3-11.4-.9l-3.1-77.1-24.7 53.3c-1.6.2-3.2.4-4.9.6-1.7.2-3.4.2-5.1.2-1.5 0-2.9-.1-4.4-.2-1.5-.1-3-.3-4.6-.6l-23-54.4L297 186c-3.6.6-7.1.9-10.5.9-3.6 0-7.3-.3-11.2-.9l4.8-106.6zm737.5 41.7h-10.2l-.8-3.1 29.3-37.4h3.6v23.6h18.9c.3 1.6.5 3 .6 4.2.1 1.3.2 2.6.2 3.9 0 1.5-.1 2.9-.2 4.2-.1 1.4-.3 2.9-.6 4.5h-18.9v31.8c0 3.2.3 5.8.8 7.8s1.3 3.5 2.3 4.7c1 1.1 2.2 1.9 3.7 2.3 1.5.4 3.2.6 5.2.6 1.6 0 3.1-.1 4.6-.4 1.5-.3 2.8-.5 4-.7.7 2 1.3 4 1.6 6.2.3 2.1.5 4 .5 5.7 0 1.1 0 2.1-.1 2.9-.1.8-.1 1.5-.2 2.3-4.8 1.1-9.8 1.7-14.9 1.7-9.5 0-16.7-2.2-21.7-6.6-5-4.4-7.5-11.7-7.5-21.7v-36.5h-.2zm-54.1 28.8c-5.8-1.7-10.4-4.1-13.7-7.4-3.3-3.3-4.9-8.2-4.9-14.8 0-7.9 2.8-14.1 8.5-18.6 5.7-4.5 13.4-6.7 23.2-6.7 4.1 0 8.1.4 12 1.1 4 .7 8 1.8 12 3.3-.2 2.7-.7 5.5-1.6 8.4-.8 2.9-1.8 5.5-3 7.7-2.5-1-5.3-2-8.3-2.7-3-.8-6.2-1.2-9.5-1.2-3.5 0-6.3.5-8.3 1.6-2 1.1-3 2.8-3 5.2 0 2.3.7 3.9 2.1 4.9 1.4.9 3.4 1.8 6 2.7l8.9 2.7c2.9.8 5.6 1.8 7.9 3 2.3 1.2 4.4 2.7 6 4.5 1.7 1.8 3 4 3.9 6.6.9 2.6 1.4 5.8 1.4 9.5 0 3.9-.8 7.5-2.4 10.8-1.6 3.3-4 6.2-7 8.7-3.1 2.5-6.8 4.4-11.2 5.8-4.4 1.4-9.3 2.1-14.9 2.1-2.5 0-4.8-.1-6.9-.2-2.1-.2-4.1-.4-6-.8-1.9-.4-3.8-.8-5.7-1.3-1.9-.5-3.9-1.2-6.1-2 .2-2.8.7-5.7 1.5-8.5.8-2.9 1.8-5.7 3.1-8.4 3.4 1.4 6.7 2.4 9.8 3.1 3.1.7 6.3 1 9.6 1 1.5 0 3.1-.1 4.8-.4 1.7-.3 3.3-.7 4.8-1.4s2.7-1.6 3.7-2.7 1.5-2.5 1.5-4.3c0-2.5-.8-4.3-2.3-5.4-1.5-1.1-3.6-2.1-6.3-2.9l-9.6-3zm-67.5 37c-6.6 0-12.3-1.1-17.1-3.2-4.9-2.1-8.9-5.1-12-8.9-3.2-3.8-5.6-8.3-7.2-13.4-1.6-5.1-2.4-10.6-2.4-16.6 0-5.9.8-11.5 2.4-16.7 1.6-5.2 4-9.7 7.2-13.5 3.2-3.8 7.2-6.8 12-9s10.6-3.3 17.1-3.3c6.6 0 12.3 1.1 17.2 3.3 4.9 2.2 9 5.2 12.2 9 3.2 3.8 5.6 8.3 7.2 13.5 1.6 5.2 2.3 10.8 2.3 16.7 0 5.9-.8 11.5-2.3 16.6-1.6 5.1-4 9.6-7.2 13.4-3.2 3.8-7.3 6.8-12.2 8.9-4.9 2.2-10.6 3.2-17.2 3.2zm0-16.9c5.8 0 10-2.2 12.6-6.5 2.6-4.3 3.8-10.6 3.8-18.7s-1.3-14.4-3.8-18.7c-2.6-4.3-6.8-6.5-12.6-6.5-5.7 0-9.9 2.2-12.4 6.5-2.6 4.3-3.8 10.6-3.8 18.7s1.3 14.4 3.8 18.7c2.5 4.4 6.6 6.5 12.4 6.5zm-162.6-65.8c1.5-.3 2.9-.5 4.4-.7 1.5-.2 3.1-.2 4.9-.2 1.8 0 3.3.1 4.7.2 1.4.2 2.8.4 4.2.7.3.5.6 1.3.9 2.3.3 1 .5 2 .7 3.1.2 1.1.4 2.2.5 3.2.2 1 .3 1.9.4 2.7.8-1.6 1.9-3.1 3.3-4.7s3-3 4.8-4.2c1.9-1.3 4-2.3 6.3-3.1 2.3-.8 5-1.2 7.9-1.2 12.6 0 20.7 4.8 24.2 14.4 2.1-3.9 5-7.2 8.8-10.1 3.8-2.9 8.6-4.3 14.5-4.3 9.2 0 15.9 2.5 20.3 7.6 4.3 5.1 6.5 13 6.5 23.7v51.5c-3.8.6-7.5.9-11.1.9-3.7 0-7.4-.3-11.1-.9v-45.7c0-5.6-.7-10-2.1-13-1.4-3-4.2-4.5-8.5-4.5-1.8 0-3.5.3-5.2.8-1.7.5-3.3 1.5-4.7 2.9-1.4 1.4-2.6 3.4-3.4 5.9-.9 2.6-1.3 5.9-1.3 9.9V185c-3.8.6-7.5.9-11.1.9-3.7 0-7.4-.3-11.1-.9v-45.7c0-5.6-.7-10-2.1-13-1.4-3-4.2-4.5-8.5-4.5-1.8 0-3.5.3-5.3.8-1.8.5-3.4 1.5-4.8 3.1-1.4 1.5-2.5 3.6-3.4 6.3-.8 2.7-1.3 6.3-1.3 10.6V185c-3.8.6-7.5.9-11.1.9-3.7 0-7.4-.3-11.1-.9v-80.8h-.1zm-59.2 0c1.6-.3 3-.5 4.5-.7 1.4-.2 2.9-.2 4.6-.2 1.6 0 3.1.1 4.6.3 1.5.2 3 .5 4.5.8.3.5.6 1.3.9 2.3.3 1 .5 2 .7 3.1.2 1.1.4 2.2.5 3.3.2 1.1.3 2 .4 2.7 2.3-3.2 5.1-6.1 8.4-8.7 3.3-2.6 7.5-3.8 12.5-3.8 1 0 2.2.1 3.6.2s2.3.3 3 .5c.2 1 .4 2.2.5 3.6.1 1.4.2 2.8.2 4.2 0 1.8-.1 3.7-.2 5.8-.2 2.1-.4 4.1-.9 5.9-1.1-.2-2.4-.3-3.8-.3h-2.6c-1.8 0-3.8.2-5.9.5-2.2.4-4.3 1.3-6.3 2.9-2 1.6-3.6 3.9-4.9 7-1.3 3.1-2 7.5-2 13.1v38.5c-1.9.3-3.8.5-5.6.6-1.9.1-3.7.2-5.5.2-1.8 0-3.6-.1-5.4-.2-1.8-.1-3.7-.3-5.7-.6v-81h-.1zM613 151.4c.4 6.3 2.6 10.8 6.6 13.6 4 2.8 9.2 4.2 15.6 4.2 3.5 0 7.2-.3 10.9-1s7.2-1.6 10.6-2.9c1.1 2.1 2.1 4.6 3 7.5.8 2.9 1.3 6 1.4 9.4-8.1 3.1-17.3 4.7-27.5 4.7-7.5 0-13.9-1-19.3-3.1s-9.8-5-13.1-8.7c-3.4-3.7-5.9-8.1-7.5-13.2-1.6-5.1-2.4-10.7-2.4-16.7 0-5.9.8-11.5 2.5-16.7 1.7-5.2 4.1-9.8 7.4-13.6 3.3-3.9 7.4-6.9 12.2-9.2 4.8-2.2 10.5-3.4 17-3.4 5.6 0 10.6 1 15 3s8.1 4.7 11.2 8.1c3.1 3.4 5.4 7.5 7 12.3 1.6 4.7 2.3 9.8 2.3 15.3 0 2-.1 3.9-.2 5.9-.2 1.9-.3 3.5-.5 4.6H613v-.1zm31.7-15.5c-.2-5-1.6-9-4.1-12.1-2.6-3.1-6.1-4.6-10.7-4.6-5.2 0-9.2 1.5-11.9 4.4-2.7 2.9-4.3 7-4.8 12.4h31.5v-.1zM542 121.1h-10.2l-.8-3.1 29.3-37.4h3.6v23.6h18.9c.3 1.6.5 3 .6 4.2.1 1.3.2 2.6.2 3.9 0 1.5-.1 2.9-.2 4.2-.1 1.4-.3 2.9-.6 4.5h-18.9v31.8c0 3.2.3 5.8.8 7.8s1.3 3.5 2.3 4.7c1 1.1 2.2 1.9 3.7 2.3 1.5.4 3.2.6 5.2.6 1.6 0 3.1-.1 4.6-.4 1.5-.3 2.8-.5 4-.7.7 2 1.3 4 1.6 6.2.3 2.1.5 4 .5 5.7 0 1.1 0 2.1-.1 2.9-.1.8-.1 1.5-.2 2.3-4.8 1.1-9.8 1.7-14.9 1.7-9.5 0-16.7-2.2-21.7-6.6-5-4.4-7.5-11.7-7.5-21.7v-36.5h-.2zm-58.7 0h-10.2l-.8-3.1 29.3-37.4h3.6v23.6h18.9c.3 1.6.5 3 .6 4.2.1 1.3.2 2.6.2 3.9 0 1.5-.1 2.9-.2 4.2-.1 1.4-.3 2.9-.6 4.5h-18.9v31.8c0 3.2.3 5.8.8 7.8s1.3 3.5 2.3 4.7c1 1.1 2.2 1.9 3.7 2.3 1.5.4 3.2.6 5.2.6 1.6 0 3.1-.1 4.6-.4 1.5-.3 2.8-.5 4-.7.7 2 1.3 4 1.6 6.2.3 2.1.5 4 .5 5.7 0 1.1 0 2.1-.1 2.9-.1.8-.1 1.5-.2 2.3-4.8 1.1-9.8 1.7-14.9 1.7-9.5 0-16.7-2.2-21.7-6.6-5-4.4-7.5-11.7-7.5-21.7v-36.5h-.2zM446.9 148c-1.3-.2-2.6-.4-4.1-.5-1.5-.2-2.8-.2-3.9-.2-5.1 0-9.2.9-12.1 2.7-3 1.8-4.5 4.8-4.5 8.8 0 2.7.6 4.8 1.7 6.3s2.5 2.5 4.1 3.2c1.6.7 3.3 1.1 5.2 1.3 1.8.2 3.4.2 4.8.2 1.6 0 3.1-.1 4.7-.4 1.6-.3 2.9-.5 4.1-.7V148zm0-16.1c0-2.5-.4-4.5-1.3-6.1-.8-1.6-2-2.8-3.4-3.7-1.5-.9-3.3-1.5-5.4-1.8-2.1-.3-4.5-.5-7.1-.5-5.6 0-11.6 1.1-18 3.3-1.5-2.7-2.6-5.3-3.3-7.7-.7-2.4-1.1-5.3-1.1-8.6 4.6-1.6 9.2-2.7 13.8-3.4 4.6-.7 8.9-1.1 12.8-1.1 10.8 0 19.3 2.6 25.4 7.8 6.1 5.2 9.2 13.6 9.2 25V182c-3.7 1.1-8.1 2.2-13.3 3.3-5.2 1-11.1 1.6-17.7 1.6-5.3 0-10.2-.5-14.6-1.4-4.4-.9-8.2-2.5-11.4-4.7-3.2-2.2-5.6-5-7.4-8.4-1.7-3.4-2.6-7.7-2.6-12.7 0-5 1.1-9.2 3.2-12.6 2.1-3.4 4.9-6.1 8.3-8.1 3.4-2 7.2-3.5 11.3-4.4 4.2-.9 8.3-1.3 12.5-1.3 3 0 6.4.2 10 .5v-1.9z"/><g id="XMLID_2_"><g id="XMLID_3_"><path id="XMLID_4_" class="st0" d="M192.4 62.7l.9 17.4c14.1 15.6 19.7 37.7 12.7 58.5-10.5 31-45.1 47.3-77.4 36.4s-49.8-44.9-39.3-75.9c7.1-20.9 25-35.1 45.8-38.8L146.3 47c-35.1-.9-68.1 20.8-80 55.8-14.5 43 8.5 89.6 51.5 104.1s89.6-8.5 104.1-51.5c11.8-34.8-1.2-72.2-29.5-92.7z"/></g><path id="XMLID_5_" class="st0" d="M172.3 114.1l-.6-24.4-.5-14-.3-12.2s.1-5.9-.1-7.2c0-.3-.1-.5-.2-.7v-.2c-.2-.4-.6-.7-1-.9-.5-.2-1-.1-1.4.1 0 0-.1 0-.1.1-.2.1-.4.2-.6.4-1 1-4.5 5.7-4.5 5.7l-7.6 9.5-8.9 10.9-15.3 19s-7 8.7-5.5 19.5 9.6 16 15.8 18.1c6.2 2.1 15.8 2.8 23.5-4.8 7.5-7.7 7.3-18.9 7.3-18.9z"/></g></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+	<path fill="white" d="M16.109 0c-6.713-0.047-12.989 4.167-15.26 10.869-2.833 8.371 1.656 17.448 10.020 20.281 8.371 2.833 17.448-1.656 20.281-10.020 2.303-6.803-0.229-14.068-5.749-18.079l0.172 3.396c2.749 3.041 3.839 7.349 2.468 11.401-2.047 6.041-8.791 9.219-15.068 7.093-6.276-2.125-9.708-8.745-7.661-14.792 1.376-4.057 4.876-6.828 8.928-7.557l2.187-2.588c-0.104-0.005-0.213-0.005-0.323-0.005zM20.812 1.459c-0.057 0-0.115 0.011-0.167 0.031h-0.005c-0.052 0.027-0.104 0.057-0.145 0.099-0.192 0.188-0.875 1.105-0.875 1.105l-1.484 1.837-1.735 2.115-2.98 3.704c0 0-1.364 1.703-1.061 3.801 0.301 2.1 1.859 3.12 3.072 3.532 1.208 0.405 3.068 0.541 4.584-0.943 1.515-1.48 1.463-3.667 1.463-3.667l-0.115-4.745-0.093-2.735-0.063-2.364c0 0 0.011-1.141-0.025-1.412-0.011-0.047-0.027-0.099-0.047-0.14l-0.011-0.016-0.005-0.016c-0.068-0.109-0.183-0.181-0.308-0.187z" />
+</svg>