diff --git a/apps/ui/src/routes/applications/[id]/__layout.svelte b/apps/ui/src/routes/applications/[id]/__layout.svelte
index 94977e5e0..a9bb458c2 100644
--- a/apps/ui/src/routes/applications/[id]/__layout.svelte
+++ b/apps/ui/src/routes/applications/[id]/__layout.svelte
@@ -460,7 +460,7 @@
 			</button>
 		{/if}
 		{#if $location && $status.application.overallStatus === 'healthy'}
-			<a href={$location} target="_blank" class="btn btn-sm gap-2 text-sm bg-primary"
+			<a href={$location} target="_blank noreferrer" class="btn btn-sm gap-2 text-sm bg-primary"
 				><svg
 					xmlns="http://www.w3.org/2000/svg"
 					class="h-6 w-6"
diff --git a/apps/ui/src/routes/applications/[id]/previews/index.svelte b/apps/ui/src/routes/applications/[id]/previews/index.svelte
index b97116430..dc4baa84e 100644
--- a/apps/ui/src/routes/applications/[id]/previews/index.svelte
+++ b/apps/ui/src/routes/applications/[id]/previews/index.svelte
@@ -216,7 +216,7 @@
 
 							<div class="flex justify-end items-end space-x-2 h-10">
 								{#if preview.customDomain}
-									<a id="openpreview" href={preview.customDomain} target="_blank" class="icons">
+									<a id="openpreview" href={preview.customDomain} target="_blank noreferrer" class="icons">
 										<svg
 											xmlns="http://www.w3.org/2000/svg"
 											class="h-6 w-6"
diff --git a/apps/ui/src/routes/index.svelte b/apps/ui/src/routes/index.svelte
index 936c1b356..e0ab74b06 100644
--- a/apps/ui/src/routes/index.svelte
+++ b/apps/ui/src/routes/index.svelte
@@ -674,7 +674,7 @@
 
 									<div class="flex justify-end items-end space-x-2 h-10">
 										{#if application?.fqdn}
-											<a href={application?.fqdn} target="_blank" class="icons hover:bg-green-500">
+											<a href={application?.fqdn} target="_blank noreferrer" class="icons hover:bg-green-500">
 												<svg
 													xmlns="http://www.w3.org/2000/svg"
 													class="h-6 w-6"
@@ -698,7 +698,7 @@
 												href={`http://${dev ? 'localhost' : settings.ipv4}:${
 													application.exposePort
 												}`}
-												target="_blank"
+												target="_blank noreferrer"
 												class="icons hover:bg-green-500"
 											>
 												<svg
@@ -780,7 +780,7 @@
 
 								<div class="flex justify-end items-end space-x-2 h-10">
 									{#if application?.fqdn}
-										<a href={application?.fqdn} target="_blank" class="icons hover:bg-green-500">
+										<a href={application?.fqdn} target="_blank noreferrer" class="icons hover:bg-green-500">
 											<svg
 												xmlns="http://www.w3.org/2000/svg"
 												class="h-6 w-6"
@@ -802,7 +802,7 @@
 									{#if application.settings?.isBot && application.exposePort}
 										<a
 											href={`http://${dev ? 'localhost' : settings.ipv4}:${application.exposePort}`}
-											target="_blank"
+											target="_blank noreferrer"
 											class="icons hover:bg-green-500"
 										>
 											<svg
@@ -889,7 +889,7 @@
 									</div>
 									<div class="flex justify-end items-end space-x-2 h-10">
 										{#if service?.fqdn}
-											<a href={service?.fqdn} target="_blank" class="icons hover:bg-pink-500">
+											<a href={service?.fqdn} target="_blank noreferrer" class="icons hover:bg-pink-500">
 												<svg
 													xmlns="http://www.w3.org/2000/svg"
 													class="h-6 w-6"
@@ -962,7 +962,7 @@
 								</div>
 								<div class="flex justify-end items-end space-x-2 h-10">
 									{#if service?.fqdn}
-										<a href={service?.fqdn} target="_blank" class="icons hover:bg-pink-500">
+										<a href={service?.fqdn} target="_blank noreferrer" class="icons hover:bg-pink-500">
 											<svg
 												xmlns="http://www.w3.org/2000/svg"
 												class="h-6 w-6"
diff --git a/apps/ui/src/routes/services/[id]/configuration/type.svelte b/apps/ui/src/routes/services/[id]/configuration/type.svelte
index fcebb9de4..da43fc9db 100644
--- a/apps/ui/src/routes/services/[id]/configuration/type.svelte
+++ b/apps/ui/src/routes/services/[id]/configuration/type.svelte
@@ -91,6 +91,7 @@
 <div class="container lg:mx-auto lg:pt-20 lg:p-0 px-8 pt-20">
 	<div class="flex flex-wrap justify-center  gap-8">
 		{#each filteredServices as service}
+		{#key service.name}
 			<div class="p-2">
 				<form on:submit|preventDefault={() => handleSubmit(service)}>
 					<button type="submit" class="box-selection relative text-xl font-bold hover:bg-primary">
@@ -99,6 +100,7 @@
 					</button>
 				</form>
 			</div>
+			{/key}
 		{/each}
 	</div>
 </div>
diff --git a/apps/ui/src/routes/sources/[id]/_Gitlab.svelte b/apps/ui/src/routes/sources/[id]/_Gitlab.svelte
index cf645ce4d..6f724ead2 100644
--- a/apps/ui/src/routes/sources/[id]/_Gitlab.svelte
+++ b/apps/ui/src/routes/sources/[id]/_Gitlab.svelte
@@ -169,7 +169,7 @@
 				<a
 					href="https://docs.coollabs.io/coolify/sources#how-to-integrate-with-gitlab"
 					class="font-bold "
-					target="_blank"
+					target="_blank noreferrer"
 					rel="noopener noreferrer">Documentation and detailed instructions.</a
 				>
 				<div class="grid grid-cols-2 items-center">