diff --git a/.gitignore b/.gitignore
index 5f7a525f..c23e56c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 *.swo
 *.swp
 
+logs
 .pnpm-debug.log
 .env*
 github.secrets
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 882036ad..194a7959 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -55,6 +55,7 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock:ro
       - ${PWD}:/runtipi
       - ${PWD}/packages/system-api/src:/api/src
+      - ${PWD}/logs:/api/logs
       # - /api/node_modules
     environment:
       INTERNAL_IP: ${INTERNAL_IP}
diff --git a/docker-compose.rc.yml b/docker-compose.rc.yml
index 8cca27fd..c6501cba 100644
--- a/docker-compose.rc.yml
+++ b/docker-compose.rc.yml
@@ -47,11 +47,11 @@ services:
       ## Docker sock
       - /var/run/docker.sock:/var/run/docker.sock:ro
       - ${PWD}:/runtipi
+      - ${PWD}/logs:/api/logs
     environment:
       INTERNAL_IP: ${INTERNAL_IP}
       TIPI_VERSION: ${TIPI_VERSION}
       JWT_SECRET: ${JWT_SECRET}
-      ROOT_FOLDER_HOST: ${ROOT_FOLDER_HOST}
       NGINX_PORT: ${NGINX_PORT}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_USERNAME: tipi
diff --git a/docker-compose.yml b/docker-compose.yml
index e9310ade..9ac45635 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -47,11 +47,11 @@ services:
       ## Docker sock
       - /var/run/docker.sock:/var/run/docker.sock:ro
       - ${PWD}:/runtipi
+      - ${PWD}/logs:/api/logs
     environment:
       INTERNAL_IP: ${INTERNAL_IP}
       TIPI_VERSION: ${TIPI_VERSION}
       JWT_SECRET: ${JWT_SECRET}
-      ROOT_FOLDER_HOST: ${ROOT_FOLDER_HOST}
       NGINX_PORT: ${NGINX_PORT}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_USERNAME: tipi
diff --git a/packages/dashboard/src/core/helpers/url-helpers.ts b/packages/dashboard/src/core/helpers/url-helpers.ts
index 8dcc85d3..bbf71d4f 100644
--- a/packages/dashboard/src/core/helpers/url-helpers.ts
+++ b/packages/dashboard/src/core/helpers/url-helpers.ts
@@ -1,10 +1,5 @@
 export const getUrl = (url: string) => {
-  const domain = process.env.NEXT_PUBLIC_DOMAIN;
-  let prefix = '';
-
-  prefix = 'dashboard';
-  if (domain !== 'tipi.localhost') {
-  }
+  let prefix = 'dashboard';
 
   return `/${prefix}/${url}`;
 };
diff --git a/packages/system-api/src/core/updates/v040.ts b/packages/system-api/src/core/updates/v040.ts
index e5fe4a20..8c8b3410 100644
--- a/packages/system-api/src/core/updates/v040.ts
+++ b/packages/system-api/src/core/updates/v040.ts
@@ -70,7 +70,6 @@ export const updateV040 = async (): Promise<void> => {
     await Update.create({ name: UPDATE_NAME, status: UpdateStatusEnum.SUCCESS }).save();
   } catch (error) {
     logger.error(error);
-    console.error(error);
     await Update.create({ name: UPDATE_NAME, status: UpdateStatusEnum.FAILED }).save();
   }
 };
diff --git a/packages/system-api/src/helpers/repo-helpers.ts b/packages/system-api/src/helpers/repo-helpers.ts
index 424c2cc4..e4b407f0 100644
--- a/packages/system-api/src/helpers/repo-helpers.ts
+++ b/packages/system-api/src/helpers/repo-helpers.ts
@@ -1,13 +1,15 @@
+import Logger from '../config/logger/logger';
 import { runScript } from '../modules/fs/fs.helpers';
 
 export const updateRepo = (repo: string): Promise<void> => {
   return new Promise((resolve, reject) => {
     runScript('/scripts/git.sh', ['update', repo], (err: string, stdout: string) => {
       if (err) {
+        Logger.error(`Error updating repo: ${err}`);
         reject(err);
       }
 
-      console.info('Update result', stdout);
+      Logger.info(`Update resul: ${stdout}`);
 
       resolve();
     });
@@ -18,10 +20,11 @@ export const cloneRepo = (repo: string): Promise<void> => {
   return new Promise((resolve, reject) => {
     runScript('/scripts/git.sh', ['clone', repo], (err: string, stdout: string) => {
       if (err) {
+        Logger.error(`Error cloning repo: ${err}`);
         reject(err);
       }
 
-      console.info('Clone result', stdout);
+      Logger.info(`Clone result ${stdout}`);
 
       resolve();
     });
diff --git a/packages/system-api/src/server.ts b/packages/system-api/src/server.ts
index 1f0ed0ef..29c2be2a 100644
--- a/packages/system-api/src/server.ts
+++ b/packages/system-api/src/server.ts
@@ -96,10 +96,9 @@ const main = async () => {
       startJobs();
       // Start apps
       appsService.startAllApps();
-      console.info(`Server running on port ${port} 🚀 Production => ${__prod__}`);
+      logger.info(`Server running on port ${port} 🚀 Production => ${__prod__}`);
     });
   } catch (error) {
-    console.error(error);
     logger.error(error);
   }
 };
diff --git a/scripts/start.sh b/scripts/start.sh
index 284fd5e8..ca0bd0e3 100755
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -157,6 +157,9 @@ if [[ -f "/etc/resolv.conf" ]]; then
   TEMP=$(grep -E -o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' /etc/resolv.conf | head -n 1)
 fi
 
+# Clean logs folder
+rm -rf "${ROOT_FOLDER}/logs/*"
+
 # Create seed file with cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1
 if [[ ! -f "${STATE_FOLDER}/seed" ]]; then
   echo "Generating seed..."