diff --git a/apps/api/src/lib/common.ts b/apps/api/src/lib/common.ts
index e2afeb3e5..352df307e 100644
--- a/apps/api/src/lib/common.ts
+++ b/apps/api/src/lib/common.ts
@@ -17,7 +17,7 @@ import { day } from './dayjs';
 import { saveBuildLog } from './buildPacks/common';
 import { scheduler } from './scheduler';
 
-export const version = '3.11.5';
+export const version = '3.11.6';
 export const isDev = process.env.NODE_ENV === 'development';
 
 const algorithm = 'aes-256-ctr';
diff --git a/apps/api/src/lib/services.ts b/apps/api/src/lib/services.ts
index df3c44e54..17086fa8a 100644
--- a/apps/api/src/lib/services.ts
+++ b/apps/api/src/lib/services.ts
@@ -22,15 +22,22 @@ const compareSemanticVersions = (a: string, b: string) => {
     return b1.length - a1.length;
 };
 export async function getTags(type: string) {
-    if (type) {
-        const tagsPath = isDev ? './tags.json' : '/app/tags.json';
-        const data = await fs.readFile(tagsPath, 'utf8')
-        let tags = JSON.parse(data)
-        if (tags) {
-            tags = tags.find((tag: any) => tag.name.includes(type))
-            tags.tags = tags.tags.sort(compareSemanticVersions).reverse();
-            return tags
+
+    try {
+        if (type) {
+            const tagsPath = isDev ? './tags.json' : '/app/tags.json';
+            const data = await fs.readFile(tagsPath, 'utf8')
+            let tags = JSON.parse(data)
+            if (tags) {
+                tags = tags.find((tag: any) => tag.name.includes(type))
+                tags.tags = tags.tags.sort(compareSemanticVersions).reverse();
+                return tags
+            }
         }
+    } catch (error) {
+        return []
+
     }
-    return []
+
+
 }
diff --git a/apps/api/src/lib/services/handlers.ts b/apps/api/src/lib/services/handlers.ts
index 56ffb2e1f..f0be78133 100644
--- a/apps/api/src/lib/services/handlers.ts
+++ b/apps/api/src/lib/services/handlers.ts
@@ -34,7 +34,8 @@ export async function startService(request: FastifyRequest<ServiceStartStop>, fa
         const { id } = request.params;
         const teamId = request.user.teamId;
         const service = await getServiceFromDB({ id, teamId });
-        const arm = isARM(process.arch);
+        console.log({service})
+        const arm = isARM(service.arch);
         const { type, destinationDockerId, destinationDocker, persistentStorage, exposePort } =
             service;
 
@@ -128,7 +129,6 @@ export async function startService(request: FastifyRequest<ServiceStartStop>, fa
                 labels: makeLabelForServices(type),
                 ...defaultComposeConfiguration(network),
             }
-            console.log(config[s].image)
 
             // Generate files for builds
             if (template.services[s]?.files?.length > 0) {
diff --git a/apps/ui/src/routes/services/[id]/_ServiceLinks.svelte b/apps/ui/src/routes/services/[id]/_ServiceLinks.svelte
index 63e5c06a5..f9f456f4d 100644
--- a/apps/ui/src/routes/services/[id]/_ServiceLinks.svelte
+++ b/apps/ui/src/routes/services/[id]/_ServiceLinks.svelte
@@ -8,7 +8,7 @@
 </script>
 
 {#if linkToDocs}
-	<DocLink url={template[service.id].documentation} text={`Documentation`} isExternal={true} />
+	<DocLink url={template[service.id]?.documentation || 'https://docs.coollabs.io'} text={`Documentation`} isExternal={true} />
 {:else}
 	<ServiceIcons type={service.type} />
 {/if}
diff --git a/apps/ui/src/routes/services/[id]/index.svelte b/apps/ui/src/routes/services/[id]/index.svelte
index 70e97800c..f36275809 100644
--- a/apps/ui/src/routes/services/[id]/index.svelte
+++ b/apps/ui/src/routes/services/[id]/index.svelte
@@ -276,20 +276,25 @@
 			</div>
 			<div class="grid grid-cols-2 items-center">
 				<label for="version">Version / Tag</label>
-				<div class="custom-select-wrapper w-full">
-					<Select
-						form="saveForm"
-						containerClasses={isDisabled && containerClass()}
-						{isDisabled}
-						id="version"
-						showIndicator={!isDisabled}
-						items={[...tags.tags]}
-						on:select={selectTag}
-						value={service.version}
-						isClearable={false}
-					/>
-				</div>
+				{#if tags.tags?.length > 0}
+					<div class="custom-select-wrapper w-full">
+						<Select
+							form="saveForm"
+							containerClasses={isDisabled && containerClass()}
+							{isDisabled}
+							id="version"
+							showIndicator={!isDisabled}
+							items={[...tags.tags]}
+							on:select={selectTag}
+							value={service.version}
+							isClearable={false}
+						/>
+					</div>
+				{:else}
+					<input class="w-full border-red-500" disabled placeholder="Error getting tags...">
+				{/if}
 			</div>
+
 			<div class="grid grid-cols-2 items-center">
 				<label for="destination">{$t('application.destination')}</label>
 				<div>
diff --git a/package.json b/package.json
index 97e2f6861..da5db2f7f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "coolify",
   "description": "An open-source & self-hostable Heroku / Netlify alternative.",
-  "version": "3.11.5",
+  "version": "3.11.6",
   "license": "Apache-2.0",
   "repository": "github:coollabsio/coolify",
   "scripts": {