diff --git a/.env.template b/.env.template
index 0fa7427f3..3237d9b2c 100644
--- a/.env.template
+++ b/.env.template
@@ -2,5 +2,7 @@ COOLIFY_APP_ID=
 COOLIFY_SECRET_KEY=12341234123412341234123412341234
 COOLIFY_DATABASE_URL=file:../db/dev.db
 COOLIFY_SENTRY_DSN=
-COOLIFY_IS_ON="docker"
-COOLIFY_WHITE_LABELED="false"
\ No newline at end of file
+COOLIFY_IS_ON=docker
+COOLIFY_WHITE_LABELED=false
+COOLIFY_WHITE_LABELED_ICON=
+COOLIFY_AUTO_UPDATE=false
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..858d6ae2c
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,11 @@
+{
+	"i18n-ally.localesPaths": ["src/lib/locales"],
+	"i18n-ally.keystyle": "nested",
+	"i18n-ally.extract.ignoredByFiles": {
+		"src\\routes\\__layout.svelte": ["Coolify", "coolLabs logo"]
+	},
+	"i18n-ally.sourceLanguage": "en",
+	"i18n-ally.enabledFrameworks": ["svelte"],
+	"i18n-ally.enabledParsers": ["js", "ts", "json"],
+	"i18n-ally.extract.autoDetect": true
+}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8a21ec10a..2be3c4ff5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,14 +1,23 @@
-# Welcome
+# 👋 Welcome
 
-First of all, thank you for considering to contribute to my project! It means a lot 💜.
+First of all, thank you for considering contributing to my project! It means a lot 💜.
 
-# Technical skills required
+## 🙋 Want to help?
 
-- Node.js / Javascript
-- Svelte / SvelteKit
-- Prisma.io
+If you begin in GitHub contribution, you can find the [first contribution](https://github.com/firstcontributions/first-contributions) and follow this guide.
 
-# Recommended Pull Request Guideline
+Follow the [introduction](#introduction) to get started then start contributing!
+
+This is a little list of what you can do to help the project:
+
+- [🧑‍💻 Develop your own ideas](#developer-contribution)
+- [🌐 Translate the project](#translation)
+
+## 👋 Introduction
+
+🔴 At the moment, Coolify **doesn't support Windows**. You must use Linux or MacOS.
+
+#### Recommended Pull Request Guideline
 
 - Fork the project
 - Clone your fork repo to local
@@ -16,15 +25,17 @@ First of all, thank you for considering to contribute to my project! It means a
 - Push to your fork repo
 - Create a pull request: https://github.com/coollabsio/compare
 - Write a proper description
-- Open the pull request to review
+- Open the pull request to review against `next` branch
+
+---
 
 # How to start after you set up your local fork?
 
-This repository best with [pnpm](https://pnpm.io) due to the lock file. I recommend you should try and use `pnpm` as well, because it is cool and efficient!
+Due to the lock file, this repository is best with [pnpm](https://pnpm.io). I recommend you try and use `pnpm` because it is cool and efficient!
 
 You need to have [Docker Engine](https://docs.docker.com/engine/install/) installed locally.
 
-## Setup development environment
+#### Setup a local development environment
 
 - Copy `.env.template` to `.env` and set the `COOLIFY_APP_ID` environment variable to something cool.
 - Install dependencies with `pnpm install`.
@@ -33,12 +44,234 @@ You need to have [Docker Engine](https://docs.docker.com/engine/install/) instal
 - Seed the database with base entities with `pnpm db:seed`
 - You can start coding after starting `pnpm dev`.
 
-## Database migrations
+#### How to start after you set up your local fork?
+
+This repository works better with [pnpm](https://pnpm.io) due to the lock file. I recommend you to give it a try and use `pnpm` as well because it is cool and efficient!
+
+You need to have [Docker Engine](https://docs.docker.com/engine/install/) installed locally.
+
+## 🧑‍💻 Developer contribution
+
+### Technical skills required
+
+- **Languages**: Node.js / Javascript / Typescript
+- **Framework JS/TS**: Svelte / SvelteKit
+- **Database ORM**: Prisma.io
+- **Docker Engine**
+
+### Database migrations
 
 During development, if you change the database layout, you need to run `pnpm db:push` to migrate the database and create types for Prisma. You also need to restart the development process.
 
 If the schema is finalized, you need to create a migration file with `pnpm db:migrate <nameOfMigration>` where `nameOfMigration` is given by you. Make it sense. :)
 
-## Tricky parts
+### Tricky parts
 
-- BullMQ, the queue system Coolify is using, cannot be hot reloaded. So if you change anything in the files related to it, you need to restart the development process. I'm actively looking of a different queue/scheduler library. I'm open for discussion!
+- BullMQ, the queue system Coolify uses, cannot be hot reloaded. So if you change anything in the files related to it, you need to restart the development process. I'm actively looking for a different queue/scheduler library. I'm open to discussion!
+
+---
+
+# How to add new services
+
+You can add any open-source and self-hostable software (service/application) to Coolify if the following statements are true:
+
+- Self-hostable (obviously)
+- Open-source
+- Maintained (I do not want to add software full of bugs)
+
+## Backend
+
+There are 5 steps you should make on the backend side.
+
+1. Create Prisma / database schema for the new service.
+2. Add supported versions of the service.
+3. Update global functions.
+4. Create API endpoints.
+5. Define automatically generated variables.
+
+> I will use [Umami](https://umami.is/) as an example service.
+
+### Create Prisma / database schema for the new service.
+
+You only need to do this if you store passwords or any persistent configuration. Mostly it is required by all services, but there are some exceptions, like NocoDB.
+
+Update Prisma schema in [prisma/schema.prisma](prisma/schema.prisma).
+
+- Add new model with the new service name.
+- Make a relationshup with `Service` model.
+- In the `Service` model, the name of the new field should be with low-capital.
+- If the service needs a database, define a `publicPort` field to be able to make it's database public, example field name in case of PostgreSQL: `postgresqlPublicPort`. It should be a optional field.
+
+If you are finished with the Prisma schema, you should update the database schema with `pnpm db:push` command.
+
+> You must restart the running development environment to be able to use the new model
+
+> If you use VSCode, you probably need to restart the `Typescript Language Server` to get the new types loaded in the running VSCode.
+
+### Add supported versions
+
+Supported versions are hardcoded into Coolify (for now).
+
+You need to update `supportedServiceTypesAndVersions` function at [src/lib/components/common.ts](src/lib/components/common.ts). Example JSON:
+
+```js
+     {
+       // Name used to identify the service internally
+       name: 'umami',
+       // Fancier name to show to the user
+       fancyName: 'Umami',
+       // Docker base image for the service
+       baseImage: 'ghcr.io/mikecao/umami',
+       // Optional: If there is any dependent image, you should list it here
+       images: [],
+       // Usable tags
+       versions: ['postgresql-latest'],
+       // Which tag is the recommended
+       recommendedVersion: 'postgresql-latest',
+       // Application's default port, Umami listens on 3000
+       ports: {
+         main: 3000
+       }
+     }
+```
+
+### Update global functions
+
+1. Add the new service to the `include` variable in [src/lib/database/services.ts](src/lib/database/services.ts), so it will be included in all places in the database queries where it is required.
+
+```js
+const include: Prisma.ServiceInclude = {
+	destinationDocker: true,
+	persistentStorage: true,
+	serviceSecret: true,
+	minio: true,
+	plausibleAnalytics: true,
+	vscodeserver: true,
+	wordpress: true,
+	ghost: true,
+	meiliSearch: true,
+	umami: true // This line!
+};
+```
+
+2. Update the database update query with the new service type to `configureServiceType` function in [src/lib/database/services.ts](src/lib/database/services.ts). This function defines the automatically generated variables (passwords, users, etc.) and it's encryption process (if applicable).
+
+```js
+[...]
+else if (type === 'umami') {
+		const postgresqlUser = cuid();
+		const postgresqlPassword = encrypt(generatePassword());
+		const postgresqlDatabase = 'umami';
+		const hashSalt = encrypt(generatePassword(64));
+		await prisma.service.update({
+			where: { id },
+			data: {
+				type,
+				umami: {
+					create: {
+						postgresqlDatabase,
+						postgresqlPassword,
+						postgresqlUser,
+						hashSalt,
+					}
+				}
+			}
+		});
+	}
+```
+
+3. Add decryption process for configurations and passwords to `getService` function in [src/lib/database/services.ts](src/lib/database/services.ts)
+
+```js
+if (body.umami?.postgresqlPassword)
+	body.umami.postgresqlPassword = decrypt(body.umami.postgresqlPassword);
+
+if (body.umami?.hashSalt) body.umami.hashSalt = decrypt(body.umami.hashSalt);
+```
+
+4. Add service deletion query to `removeService` function in [src/lib/database/services.ts](src/lib/database/services.ts)
+
+### Create API endpoints.
+
+You need to add a new folder under [src/routes/services/[id]](src/routes/services/[id]) with the low-capital name of the service. You need 3 default files in that folder.
+
+#### `index.json.ts`:
+
+It has a POST endpoint that updates the service details in Coolify's database, such as name, url, other configurations, like passwords. It should look something like this:
+
+```js
+import { getUserDetails } from '$lib/common';
+import * as db from '$lib/database';
+import { ErrorHandler } from '$lib/database';
+import type { RequestHandler } from '@sveltejs/kit';
+
+export const post: RequestHandler = async (event) => {
+	const { status, body } = await getUserDetails(event);
+	if (status === 401) return { status, body };
+
+	const { id } = event.params;
+
+	let { name, fqdn } = await event.request.json();
+	if (fqdn) fqdn = fqdn.toLowerCase();
+
+	try {
+		await db.updateService({ id, fqdn, name });
+		return { status: 201 };
+	} catch (error) {
+		return ErrorHandler(error);
+	}
+};
+```
+
+If it's necessary, you can create your own database update function, specifically for the new service.
+
+#### `start.json.ts`
+
+It has a POST endpoint that sets all the required secrets, persistent volumes, `docker-compose.yaml` file and sends a request to the specified docker engine.
+
+You could also define an `HTTP` or `TCP` proxy for every other port that should be proxied to your server. (See `startHttpProxy` and `startTcpProxy` functions in [src/lib/haproxy/index.ts](src/lib/haproxy/index.ts))
+
+#### `stop.json.ts`
+
+It has a POST endpoint that stops the service and all dependent (TCP/HTTP proxies) containers. If publicPort is specified it also needs to cleanup it from the database.
+
+## Frontend
+
+1. You need to add a custom logo at [src/lib/components/svg/services/](src/lib/components/svg/services/) as a svelte component.
+
+   SVG is recommended, but you can use PNG as well. It should have the `isAbsolute` variable with the suitable CSS classes, primarily for sizing and positioning.
+
+2. You need to include it the logo at
+
+- [src/routes/services/index.svelte](src/routes/services/index.svelte) with `isAbsolute` in two places,
+- [src/lib/components/ServiceLinks.svelte](src/lib/components/ServiceLinks.svelte) with `isAbsolute` and a link to the docs/main site of the service
+- [src/routes/services/[id]/configuration/type.svelte](src/routes/services/[id]/configuration/type.svelte) with `isAbsolute`.
+
+3. By default the URL and the name frontend forms are included in [src/routes/services/[id]/\_Services/\_Services.svelte](src/routes/services/[id]/_Services/_Services.svelte).
+
+   If you need to show more details on the frontend, such as users/passwords, you need to add Svelte component to [src/routes/services/[id]/\_Services](src/routes/services/[id]/_Services) with an underscore. For example, see other files in that folder.
+
+   You also need to add the new inputs to the `index.json.ts` file of the specific service, like for MinIO here: [src/routes/services/[id]/minio/index.json.ts](src/routes/services/[id]/minio/index.json.ts)
+
+## 🌐 Translate the project
+
+The project use [sveltekit-i18n](https://github.com/sveltekit-i18n/lib) to translate the project.
+It follows the [ISO 639-1](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) to name languages.
+
+### Installation
+
+You must have gone throw all the [intro](#introduction) steps before you can start translating.
+
+It's only an advice, but I recommend you to use:
+
+- Visual Studio Code
+- [i18n Ally for Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=Lokalise.i18n-ally): ideal to see the progress of the translation.
+- [Svelte for VS Code](https://marketplace.visualstudio.com/items?itemName=svelte.svelte-vscode): to get the syntax color for the project
+
+### Adding a language
+
+If your language doesn't appear in the [locales folder list](src/lib/locales/), follow the step below:
+
+1.  In `src/lib/locales/`, Copy paste `en.json` and rename it with your language (eg: `cz.json`).
+2.  In the [lang.json](src/lib/lang.json) file, add a line after the first bracket (`{`) with `"ISO of your language": "Language",` (eg: `"cz": "Czech",`).
+3.  Have fun translating!
diff --git a/Dockerfile b/Dockerfile
index df4614a13..87c4d54c9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,31 +1,42 @@
-FROM node:16.14.0-alpine
-RUN apk add --no-cache g++ cmake make python3
-WORKDIR /app
-COPY package*.json .
-RUN yarn install
-COPY . .
-RUN yarn build
-
-FROM node:16.14.0-alpine
+FROM node:16.14.2-alpine as install
 WORKDIR /app
 
-LABEL coolify.managed true
-
-RUN apk add --no-cache git git-lfs openssh-client curl jq cmake sqlite openssl
-
+RUN apk add --no-cache curl
 RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@6
 RUN pnpm add -g pnpm
 
-RUN curl -fsSL "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.9.tgz" | tar -xzvf - docker/docker -C . --strip-components 1 && mv docker /usr/bin/docker
-RUN mkdir -p ~/.docker/cli-plugins/
-RUN curl -SL https://github.com/docker/compose/releases/download/v2.2.2/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose
-RUN chmod +x ~/.docker/cli-plugins/docker-compose
+COPY package*.json .
+RUN pnpm install
+
+FROM node:16.14.2-alpine
+ARG TARGETPLATFORM
+
+WORKDIR /app
+
+ENV PRISMA_QUERY_ENGINE_BINARY=/app/prisma-engines/query-engine \
+  PRISMA_MIGRATION_ENGINE_BINARY=/app/prisma-engines/migration-engine \
+  PRISMA_INTROSPECTION_ENGINE_BINARY=/app/prisma-engines/introspection-engine \
+  PRISMA_FMT_BINARY=/app/prisma-engines/prisma-fmt \
+  PRISMA_CLI_QUERY_ENGINE_TYPE=binary \
+  PRISMA_CLIENT_ENGINE_TYPE=binary
+  
+COPY --from=coollabsio/prisma-engine:latest /prisma-engines/query-engine /prisma-engines/migration-engine /prisma-engines/introspection-engine /prisma-engines/prisma-fmt /app/prisma-engines/
+
+COPY --from=install /app/node_modules ./node_modules
+COPY . .
+
+RUN apk add --no-cache git git-lfs openssh-client curl jq cmake sqlite openssl
+RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@6
+RUN pnpm add -g pnpm
+RUN mkdir -p ~/.docker/cli-plugins/
+RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/docker-20.10.9 -o /usr/bin/docker
+RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/docker-compose-linux-2.3.4 -o ~/.docker/cli-plugins/docker-compose
+RUN chmod +x ~/.docker/cli-plugins/docker-compose /usr/bin/docker
+
+RUN pnpm prisma generate
+RUN pnpm build
+
 
-COPY --from=0 /app/docker-compose.yaml .
-COPY --from=0 /app/build .
-COPY --from=0 /app/package.json .
-COPY --from=0 /app/node_modules ./node_modules
-COPY --from=0 /app/prisma ./prisma
 
 EXPOSE 3000
 CMD ["pnpm", "start"]
\ No newline at end of file
diff --git a/README.md b/README.md
index 2cb2d5bf6..d214d42b7 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ If you would like no questions during installation
 
 ### Git Sources
 
-You can use the following Git Sources to be auto-deployed to your Coolifyt instance! (Self hosted versions also supported.)
+You can use the following Git Sources to be auto-deployed to your Coolifyt instance! (Self-hosted versions are also supported.)
 
 - Github
 - GitLab
@@ -38,7 +38,7 @@ You can deploy your applications to the following destinations:
 
 ### Applications
 
-These are the predefined build packs, but with the Docker build pack, you can host basically anything that is hostable with a single Dockerfile.
+These are the predefined build packs, but with the Docker build pack, you can host anything that is hostable with a single Dockerfile.
 
 - Static sites
 - NodeJS
diff --git a/data/fluentd/Dockerfile-dev b/data/fluentd/Dockerfile-dev
new file mode 100644
index 000000000..bb5524df9
--- /dev/null
+++ b/data/fluentd/Dockerfile-dev
@@ -0,0 +1,6 @@
+FROM fluent/fluent-bit:1.9.0
+COPY fluentbit-dev.conf /tmp/fluentbit.conf
+ENTRYPOINT ["/fluent-bit/bin/fluent-bit", "-c", "/tmp/fluentbit.conf"]
+# USER root
+# RUN ["gem", "install", "fluent-plugin-mongo"]
+# USER fluent
\ No newline at end of file
diff --git a/data/fluentd/fluentbit-dev.conf b/data/fluentd/fluentbit-dev.conf
new file mode 100644
index 000000000..8d06fd0af
--- /dev/null
+++ b/data/fluentd/fluentbit-dev.conf
@@ -0,0 +1,24 @@
+[INPUT]
+    Name              forward
+    Listen            0.0.0.0
+    Port              24224
+    Buffer_Chunk_Size 32KB
+    Buffer_Max_Size   64KB
+
+[OUTPUT]
+    Name          influxdb
+    Match         *
+    Host          coolify-influxdb
+    Port          8086
+    Bucket        containerlogs
+    Org           organization
+    HTTP_Token    supertoken
+    Sequence_Tag  _seq
+    Tag_Keys      container_name
+[OUTPUT]
+    Name  http
+    Match *
+    Host  host.docker.internal
+    Port  3000
+    URI   /logs.json
+    Format json
\ No newline at end of file
diff --git a/data/fluentd/fluentd-dev.conf b/data/fluentd/fluentd-dev.conf
new file mode 100644
index 000000000..9ae4a06c0
--- /dev/null
+++ b/data/fluentd/fluentd-dev.conf
@@ -0,0 +1,28 @@
+<source>
+  @type forward
+  port 24224
+  bind 0.0.0.0
+</source>
+
+<match **>
+  @type http
+  endpoint http://host.docker.internal:3000/logs.json
+  <buffer>
+    flush_at_shutdown true
+    flush_mode immediate
+    flush_thread_count 8
+    flush_thread_interval 1
+    flush_thread_burst_interval 1
+    retry_forever true
+    retry_type exponential_backoff
+   </buffer>
+</match>
+
+<filter docker.**>
+  @type parser
+  key_name log
+  reserve_data true
+  <parse>
+    @type json
+  </parse>
+</filter>
\ No newline at end of file
diff --git a/haproxy-http.Dockerfile b/data/haproxy-http.Dockerfile
similarity index 100%
rename from haproxy-http.Dockerfile
rename to data/haproxy-http.Dockerfile
diff --git a/haproxy-tcp.Dockerfile b/data/haproxy-tcp.Dockerfile
similarity index 100%
rename from haproxy-tcp.Dockerfile
rename to data/haproxy-tcp.Dockerfile
diff --git a/haproxy.Dockerfile b/data/haproxy.Dockerfile
similarity index 100%
rename from haproxy.Dockerfile
rename to data/haproxy.Dockerfile
diff --git a/data/haproxy/haproxy.cfg-http.template b/data/haproxy/haproxy.cfg-http.template
index 72fdece7a..f819e9be7 100644
--- a/data/haproxy/haproxy.cfg-http.template
+++ b/data/haproxy/haproxy.cfg-http.template
@@ -4,10 +4,10 @@ global
 defaults 
   mode http
   log global
-  timeout http-request 60s
-  timeout connect 10s
-  timeout client 60s
-  timeout server 60s
+  timeout http-request 120s
+  timeout connect 20s
+  timeout client 120s
+  timeout server 120s
 
 frontend "${APP}"
   mode http
diff --git a/data/haproxy/haproxy.cfg.template b/data/haproxy/haproxy.cfg.template
index c39cb7878..35cb8a74d 100644
--- a/data/haproxy/haproxy.cfg.template
+++ b/data/haproxy/haproxy.cfg.template
@@ -5,10 +5,10 @@ global
 defaults 
   mode http
   log global
-  timeout http-request 60s
-  timeout connect 10s
-  timeout client 60s
-  timeout server 60s
+  timeout http-request 120s
+  timeout connect 20s
+  timeout client 120s
+  timeout server 120s
 
 userlist haproxy-dataplaneapi 
   user admin insecure-password "${HAPROXY_PASSWORD}"
diff --git a/data/prisma/build-prisma-engine.sh b/data/prisma/build-prisma-engine.sh
new file mode 100644
index 000000000..4c0757d39
--- /dev/null
+++ b/data/prisma/build-prisma-engine.sh
@@ -0,0 +1 @@
+docker build --platform linux/amd64,linux/arm64 -t coollabsio/prisma-engine -f prisma-engine.Dockerfile --push .
\ No newline at end of file
diff --git a/data/prisma/prisma-engine.Dockerfile b/data/prisma/prisma-engine.Dockerfile
new file mode 100644
index 000000000..76d1204fb
--- /dev/null
+++ b/data/prisma/prisma-engine.Dockerfile
@@ -0,0 +1,10 @@
+FROM rust:1.58.1-alpine3.14 as prisma
+WORKDIR /prisma
+ENV RUSTFLAGS="-C target-feature=-crt-static"
+RUN apk --no-cache add openssl direnv git musl-dev openssl-dev build-base perl protoc
+RUN git clone --depth=1 --branch=3.12.x https://github.com/prisma/prisma-engines.git /prisma 
+RUN cargo build --release
+
+FROM alpine
+WORKDIR /prisma-engines
+COPY --from=prisma /prisma/target/release/query-engine /prisma/target/release/migration-engine /prisma/target/release/introspection-engine /prisma/target/release/prisma-fmt /prisma-engines/
diff --git a/docker-compose-dev.yaml b/docker-compose-dev.yaml
index 41f287f2b..6c89e87d5 100644
--- a/docker-compose-dev.yaml
+++ b/docker-compose-dev.yaml
@@ -2,10 +2,8 @@ version: '3.8'
 
 services:
   redis:
-    image: 'bitnami/redis:6.2'
+    image: redis:6.2-alpine
     container_name: coolify-redis
-    environment:
-      - ALLOW_EMPTY_PASSWORD=yes
     networks:
       - coolify-infra
     ports:
@@ -13,7 +11,24 @@ services:
         published: 6379
         protocol: tcp
         mode: host
-
+  # fluentbit:
+  #     container_name: coolify-fluentbit
+  #     build:
+  #       context: ./data/fluentd
+  #       dockerfile: Dockerfile-dev
+  #     ports:
+  #       - target: 24224
+  #         published: 24224
+  #         protocol: tcp
+  #         mode: host
+  #       - target: 24224
+  #         published: 24224
+  #         protocol: udp
+  #         mode: host
+  #     networks:
+  #       - coolify-infra
+  #     extra_hosts:
+  #       - 'host.docker.internal:host-gateway'
 networks:
   coolify-infra:
     attachable: true
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 145f2536a..6f3cd69f0 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -21,11 +21,9 @@ services:
       - coolify-infra
     depends_on: ['redis']
   redis:
-    image: bitnami/redis:6.2
+    image: redis:6.2-alpine
     restart: always
     container_name: coolify-redis
-    environment:
-      - ALLOW_EMPTY_PASSWORD=yes
     networks:
       - coolify-infra
 
diff --git a/package.json b/package.json
index 71e06130f..9f38331ad 100644
--- a/package.json
+++ b/package.json
@@ -1,14 +1,14 @@
 {
 	"name": "coolify",
 	"description": "An open-source & self-hostable Heroku / Netlify alternative.",
-	"version": "2.4.2",
+	"version": "2.5.2",
 	"license": "AGPL-3.0",
 	"scripts": {
-		"dev": "docker-compose -f docker-compose-dev.yaml up -d && cross-env NODE_ENV=development & svelte-kit dev",
+		"dev": "docker-compose -f docker-compose-dev.yaml up -d && cross-env NODE_ENV=development & svelte-kit dev --host 0.0.0.0",
 		"dev:stop": "docker-compose -f docker-compose-dev.yaml down",
 		"dev:logs": "docker-compose -f docker-compose-dev.yaml logs -f --tail 10",
 		"studio": "npx prisma studio",
-		"start": "npx prisma migrate deploy && npx prisma generate && npx prisma db seed && node index.js",
+		"start": "npx prisma migrate deploy && npx prisma generate && npx prisma db seed && node build/index.js",
 		"build": "svelte-kit build",
 		"preview": "svelte-kit preview",
 		"check": "svelte-check --tsconfig ./tsconfig.json",
@@ -17,22 +17,23 @@
 		"db:push": "prisma db push && prisma generate",
 		"db:seed": "prisma db seed",
 		"db:migrate": "COOLIFY_DATABASE_URL=file:../db/migration.db prisma migrate dev --skip-seed --name",
-		"release:staging": "cross-var docker build -t coollabsio/coolify:$npm_package_version . && docker push coollabsio/coolify:$npm_package_version",
-		"release:pre": "cross-var docker build -t coollabsio/coolify:$npm_package_version -t coollabsio/coolify:latest .",
-		"release:coolify": "cross-var yarn release:pre && docker push coollabsio/coolify:$npm_package_version && docker push coollabsio/coolify:latest",
-		"release:haproxy": "docker build -f haproxy.Dockerfile -t coollabsio/coolify-haproxy-alpine:1.0.0 -t coollabsio/coolify-haproxy-alpine:latest . && docker image push --all-tags coollabsio/coolify-haproxy-alpine",
-		"release:haproxy:tcp": "docker build -f haproxy-tcp.Dockerfile -t coollabsio/coolify-haproxy-tcp-alpine:1.0.0 -t coollabsio/coolify-haproxy-tcp-alpine:latest . && docker image push --all-tags coollabsio/coolify-haproxy-tcp-alpine",
-		"release:haproxy:http": "docker build -f haproxy-http.Dockerfile -t coollabsio/coolify-haproxy-http-alpine:1.0.0 -t coollabsio/coolify-haproxy-http-alpine:latest . && docker image push --all-tags coollabsio/coolify-haproxy-http-alpine",
+		"release:production:all": "cross-var docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify:$npm_package_version -t coollabsio/coolify:latest --push .",
+		"release:production:amd": "cross-var docker build --platform linux/amd64 -t coollabsio/coolify:$npm_package_version -t coollabsio/coolify:latest --push .",
+		"release:production:arm": "cross-var docker build --platform linux/arm64 -t coollabsio/coolify:$npm_package_version -t coollabsio/coolify:latest --push .",
+		"release:staging:all": "cross-var docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify:$npm_package_version --push .",
+		"release:staging:amd": "cross-var docker build --platform linux/amd64 -t coollabsio/coolify:$npm_package_version --push .",
+		"release:staging:arm": "cross-var docker build --platform linux/arm64 -t coollabsio/coolify:$npm_package_version --push .",
+		"release:haproxy": "docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify-haproxy-alpine:latest -t coollabsio/coolify-haproxy-alpine:1.1.0 -f data/haproxy.Dockerfile --push .",
+		"release:haproxy:tcp": "docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify-haproxy-tcp-alpine:latest -t coollabsio/coolify-haproxy-tcp-alpine:1.1.0 -f data/haproxy-tcp.Dockerfile --push .",
+		"release:haproxy:http": "docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify-haproxy-http-alpine:latest -t coollabsio/coolify-haproxy-http-alpine:1.1.0 -f data/haproxy-http.Dockerfile --push .",
 		"prepare": "husky install"
 	},
 	"devDependencies": {
 		"@sveltejs/adapter-node": "1.0.0-next.73",
-		"@sveltejs/kit": "1.0.0-next.303",
-		"@types/bcrypt": "5.0.0",
-		"@types/dockerode": "^3.3.8",
+		"@sveltejs/kit": "1.0.0-next.316",
 		"@types/js-cookie": "3.0.1",
 		"@types/js-yaml": "4.0.5",
-		"@types/node": "17.0.23",
+		"@types/node": "17.0.25",
 		"@types/node-forge": "1.0.1",
 		"@typescript-eslint/eslint-plugin": "4.31.1",
 		"@typescript-eslint/parser": "4.31.1",
@@ -44,17 +45,18 @@
 		"eslint-config-prettier": "8.5.0",
 		"eslint-plugin-svelte3": "3.4.1",
 		"husky": "7.0.4",
-		"lint-staged": "12.3.7",
+		"lint-staged": "12.4.0",
 		"postcss": "8.4.12",
-		"prettier": "2.6.1",
-		"prettier-plugin-svelte": "2.6.0",
-		"prettier-plugin-tailwindcss": "0.1.8",
+		"prettier": "2.6.2",
+		"prettier-plugin-svelte": "2.7.0",
+		"prettier-plugin-tailwindcss": "0.1.10",
 		"prisma": "3.11.1",
-		"svelte": "3.46.4",
-		"svelte-check": "2.4.6",
-		"svelte-preprocess": "4.10.4",
+		"svelte": "3.47.0",
+		"svelte-check": "2.7.0",
+		"svelte-preprocess": "4.10.6",
 		"svelte-select": "4.4.7",
-		"tailwindcss": "3.0.23",
+		"tailwindcss": "3.0.24",
+		"sveltekit-i18n": "2.1.2",
 		"ts-node": "10.7.0",
 		"tslib": "2.3.1",
 		"typescript": "4.6.3"
@@ -63,26 +65,25 @@
 	"dependencies": {
 		"@iarna/toml": "2.2.5",
 		"@prisma/client": "3.11.1",
-		"@sentry/node": "6.19.2",
-		"bcrypt": "5.0.1",
-		"bullmq": "1.78.1",
+		"@sentry/node": "6.19.6",
+		"bcryptjs": "2.4.3",
+		"bullmq": "1.80.4",
 		"compare-versions": "4.1.3",
-		"cookie": "0.4.2",
-		"cooltipz-css": "2.1.0",
+		"cookie": "0.5.0",
 		"cuid": "2.1.8",
-		"dayjs": "1.11.0",
+		"dayjs": "1.11.1",
 		"dockerode": "3.3.1",
 		"dotenv-extended": "2.9.0",
 		"generate-password": "1.7.0",
 		"get-port": "6.1.2",
-		"got": "12.0.2",
+		"got": "12.0.3",
 		"js-cookie": "3.0.1",
 		"js-yaml": "4.1.0",
 		"jsonwebtoken": "8.5.1",
 		"mustache": "4.2.0",
-		"node-forge": "1.3.0",
+		"node-forge": "1.3.1",
 		"p-limit": "4.0.0",
-		"svelte-kit-cookie-session": "2.1.2",
+		"svelte-kit-cookie-session": "2.1.3",
 		"tailwindcss-scrollbar": "0.1.0",
 		"unique-names-generator": "4.7.1"
 	},
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b87591e81..c0e8a2bd9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -3,28 +3,25 @@ lockfileVersion: 5.3
 specifiers:
   '@iarna/toml': 2.2.5
   '@prisma/client': 3.11.1
-  '@sentry/node': 6.19.2
+  '@sentry/node': 6.19.6
   '@sveltejs/adapter-node': 1.0.0-next.73
-  '@sveltejs/kit': 1.0.0-next.303
-  '@types/bcrypt': 5.0.0
-  '@types/dockerode': ^3.3.8
+  '@sveltejs/kit': 1.0.0-next.316
   '@types/js-cookie': 3.0.1
   '@types/js-yaml': 4.0.5
-  '@types/node': 17.0.23
+  '@types/node': 17.0.25
   '@types/node-forge': 1.0.1
   '@typescript-eslint/eslint-plugin': 4.31.1
   '@typescript-eslint/parser': 4.31.1
   '@zerodevx/svelte-toast': 0.7.1
   autoprefixer: 10.4.4
-  bcrypt: 5.0.1
-  bullmq: 1.78.1
+  bcryptjs: 2.4.3
+  bullmq: 1.80.4
   compare-versions: 4.1.3
-  cookie: 0.4.2
-  cooltipz-css: 2.1.0
+  cookie: 0.5.0
   cross-env: 7.0.3
   cross-var: 1.1.0
   cuid: 2.1.8
-  dayjs: 1.11.0
+  dayjs: 1.11.1
   dockerode: 3.3.1
   dotenv-extended: 2.9.0
   eslint: 7.32.0
@@ -32,26 +29,27 @@ specifiers:
   eslint-plugin-svelte3: 3.4.1
   generate-password: 1.7.0
   get-port: 6.1.2
-  got: 12.0.2
+  got: 12.0.3
   husky: 7.0.4
   js-cookie: 3.0.1
   js-yaml: 4.1.0
   jsonwebtoken: 8.5.1
-  lint-staged: 12.3.7
+  lint-staged: 12.4.0
   mustache: 4.2.0
-  node-forge: 1.3.0
+  node-forge: 1.3.1
   p-limit: 4.0.0
   postcss: 8.4.12
-  prettier: 2.6.1
-  prettier-plugin-svelte: 2.6.0
-  prettier-plugin-tailwindcss: 0.1.8
+  prettier: 2.6.2
+  prettier-plugin-svelte: 2.7.0
+  prettier-plugin-tailwindcss: 0.1.10
   prisma: 3.11.1
-  svelte: 3.46.4
-  svelte-check: 2.4.6
-  svelte-kit-cookie-session: 2.1.2
-  svelte-preprocess: 4.10.4
+  svelte: 3.47.0
+  svelte-check: 2.7.0
+  svelte-kit-cookie-session: 2.1.3
+  svelte-preprocess: 4.10.6
   svelte-select: 4.4.7
-  tailwindcss: 3.0.23
+  tailwindcss: 3.0.24
+  sveltekit-i18n: 2.1.2
   tailwindcss-scrollbar: 0.1.0
   ts-node: 10.7.0
   tslib: 2.3.1
@@ -61,37 +59,34 @@ specifiers:
 dependencies:
   '@iarna/toml': 2.2.5
   '@prisma/client': 3.11.1_prisma@3.11.1
-  '@sentry/node': 6.19.2
-  bcrypt: 5.0.1
-  bullmq: 1.78.1
+  '@sentry/node': 6.19.6
+  bcryptjs: 2.4.3
+  bullmq: 1.80.4
   compare-versions: 4.1.3
-  cookie: 0.4.2
-  cooltipz-css: 2.1.0
+  cookie: 0.5.0
   cuid: 2.1.8
-  dayjs: 1.11.0
+  dayjs: 1.11.1
   dockerode: 3.3.1
   dotenv-extended: 2.9.0
   generate-password: 1.7.0
   get-port: 6.1.2
-  got: 12.0.2
+  got: 12.0.3
   js-cookie: 3.0.1
   js-yaml: 4.1.0
   jsonwebtoken: 8.5.1
   mustache: 4.2.0
-  node-forge: 1.3.0
+  node-forge: 1.3.1
   p-limit: 4.0.0
-  svelte-kit-cookie-session: 2.1.2
-  tailwindcss-scrollbar: 0.1.0_tailwindcss@3.0.23
+  svelte-kit-cookie-session: 2.1.3
+  tailwindcss-scrollbar: 0.1.0_tailwindcss@3.0.24
   unique-names-generator: 4.7.1
 
 devDependencies:
   '@sveltejs/adapter-node': 1.0.0-next.73
-  '@sveltejs/kit': 1.0.0-next.303_svelte@3.46.4
-  '@types/bcrypt': 5.0.0
-  '@types/dockerode': 3.3.8
+  '@sveltejs/kit': 1.0.0-next.316_svelte@3.47.0
   '@types/js-cookie': 3.0.1
   '@types/js-yaml': 4.0.5
-  '@types/node': 17.0.23
+  '@types/node': 17.0.25
   '@types/node-forge': 1.0.1
   '@typescript-eslint/eslint-plugin': 4.31.1_8ede7edd7694646e12d33c52460f622c
   '@typescript-eslint/parser': 4.31.1_eslint@7.32.0+typescript@4.6.3
@@ -101,20 +96,21 @@ devDependencies:
   cross-var: 1.1.0
   eslint: 7.32.0
   eslint-config-prettier: 8.5.0_eslint@7.32.0
-  eslint-plugin-svelte3: 3.4.1_eslint@7.32.0+svelte@3.46.4
+  eslint-plugin-svelte3: 3.4.1_eslint@7.32.0+svelte@3.47.0
   husky: 7.0.4
-  lint-staged: 12.3.7
+  lint-staged: 12.4.0
   postcss: 8.4.12
-  prettier: 2.6.1
-  prettier-plugin-svelte: 2.6.0_prettier@2.6.1+svelte@3.46.4
-  prettier-plugin-tailwindcss: 0.1.8_prettier@2.6.1
+  prettier: 2.6.2
+  prettier-plugin-svelte: 2.7.0_prettier@2.6.2+svelte@3.47.0
+  prettier-plugin-tailwindcss: 0.1.10_prettier@2.6.2
   prisma: 3.11.1
-  svelte: 3.46.4
-  svelte-check: 2.4.6_postcss@8.4.12+svelte@3.46.4
-  svelte-preprocess: 4.10.4_296873641a0ad9f42fe92172d27bcedd
+  svelte: 3.47.0
+  svelte-check: 2.7.0_postcss@8.4.12+svelte@3.47.0
+  svelte-preprocess: 4.10.6_41810887ae6c6d59323116f47e33fa38
   svelte-select: 4.4.7
-  tailwindcss: 3.0.23_b89136460714832cdda11d1e9d57d1ff
-  ts-node: 10.7.0_ee885bc7281b682b6adbed6ae09ee090
+  tailwindcss: 3.0.24_ts-node@10.7.0
+  ts-node: 10.7.0_de7c86b0cde507c63a0402da5b982bd3
+  sveltekit-i18n: 2.1.2_svelte@3.46.4
   tslib: 2.3.1
   typescript: 4.6.3
 
@@ -214,26 +210,6 @@ packages:
       }
     dev: false
 
-  /@mapbox/node-pre-gyp/1.0.6:
-    resolution:
-      {
-        integrity: sha512-qK1ECws8UxuPqOA8F5LFD90vyVU33W7N3hGfgsOVfrJaRVc8McC3JClTDHpeSbL9CBrOHly/4GsNPAvIgNZE+g==
-      }
-    hasBin: true
-    dependencies:
-      detect-libc: 1.0.3
-      https-proxy-agent: 5.0.0
-      make-dir: 3.1.0
-      node-fetch: 2.6.6
-      nopt: 5.0.0
-      npmlog: 5.0.1
-      rimraf: 3.0.2
-      semver: 7.3.5
-      tar: 6.1.11
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
   /@nodelib/fs.scandir/2.1.5:
     resolution:
       {
@@ -307,55 +283,55 @@ packages:
       picomatch: 2.3.0
     dev: true
 
-  /@sentry/core/6.19.2:
+  /@sentry/core/6.19.6:
     resolution:
       {
-        integrity: sha512-yu1R3ewBT4udmB4v7sc4biQZ0Z0rfB9+TzB5ZKoCftbe6kqXjFMMaFRYNUF9HicVldKAsBktgkWw3+yfqGkw/A==
+        integrity: sha512-biEotGRr44/vBCOegkTfC9rwqaqRKIpFljKGyYU6/NtzMRooktqOhjmjmItNCMRknArdeaQwA8lk2jcZDXX3Og==
       }
     engines: { node: '>=6' }
     dependencies:
-      '@sentry/hub': 6.19.2
-      '@sentry/minimal': 6.19.2
-      '@sentry/types': 6.19.2
-      '@sentry/utils': 6.19.2
+      '@sentry/hub': 6.19.6
+      '@sentry/minimal': 6.19.6
+      '@sentry/types': 6.19.6
+      '@sentry/utils': 6.19.6
       tslib: 1.14.1
     dev: false
 
-  /@sentry/hub/6.19.2:
+  /@sentry/hub/6.19.6:
     resolution:
       {
-        integrity: sha512-W7KCgNBgdBIMagOxy5J5KQPe+maYxSqfE8a5ncQ3R8BcZDQEKnkW/1FplNbfRLZqA/tL/ndKb7pTPqVtzsbARw==
+        integrity: sha512-PuEOBZxvx3bjxcXmWWZfWXG+orojQiWzv9LQXjIgroVMKM/GG4QtZbnWl1hOckUj7WtKNl4hEGO2g/6PyCV/vA==
       }
     engines: { node: '>=6' }
     dependencies:
-      '@sentry/types': 6.19.2
-      '@sentry/utils': 6.19.2
+      '@sentry/types': 6.19.6
+      '@sentry/utils': 6.19.6
       tslib: 1.14.1
     dev: false
 
-  /@sentry/minimal/6.19.2:
+  /@sentry/minimal/6.19.6:
     resolution:
       {
-        integrity: sha512-ClwxKm77iDHET7kpzv1JvzDx1er5DoNu+EUjst0kQzARIrXvu9xuZuE2/CnBWycQWqw8o3HoGoKz65uIhsUCzQ==
+        integrity: sha512-T1NKcv+HTlmd8EbzUgnGPl4ySQGHWMCyZ8a8kXVMZOPDzphN3fVIzkYzWmSftCWp0rpabXPt9aRF2mfBKU+mAQ==
       }
     engines: { node: '>=6' }
     dependencies:
-      '@sentry/hub': 6.19.2
-      '@sentry/types': 6.19.2
+      '@sentry/hub': 6.19.6
+      '@sentry/types': 6.19.6
       tslib: 1.14.1
     dev: false
 
-  /@sentry/node/6.19.2:
+  /@sentry/node/6.19.6:
     resolution:
       {
-        integrity: sha512-Z1qREpTpYHxaeWjc1zMUk8ZTAp1WbxMiI2TVNc+a14DVT19Z2xNXb06MiRfeLgNc9lVGdmzR62dPmMBjVgPJYg==
+        integrity: sha512-kHQMfsy40ZxxdS9zMPmXCOOLWOJbQj6/aVSHt/L1QthYcgkAi7NJQNXnQIPWQDe8eP3DfNIWM7dc446coqjXrQ==
       }
     engines: { node: '>=6' }
     dependencies:
-      '@sentry/core': 6.19.2
-      '@sentry/hub': 6.19.2
-      '@sentry/types': 6.19.2
-      '@sentry/utils': 6.19.2
+      '@sentry/core': 6.19.6
+      '@sentry/hub': 6.19.6
+      '@sentry/types': 6.19.6
+      '@sentry/utils': 6.19.6
       cookie: 0.4.2
       https-proxy-agent: 5.0.0
       lru_map: 0.3.3
@@ -364,22 +340,22 @@ packages:
       - supports-color
     dev: false
 
-  /@sentry/types/6.19.2:
+  /@sentry/types/6.19.6:
     resolution:
       {
-        integrity: sha512-XO5qmVBdTs+7PdCz7fAwn1afWxSnRE2KLBFg5/vOdKosPSSHsSHUURSkxiEZc2QsR+JpRB4AeQ26AkIRX38qTg==
+        integrity: sha512-QH34LMJidEUPZK78l+Frt3AaVFJhEmIi05Zf8WHd9/iTt+OqvCHBgq49DDr1FWFqyYWm/QgW/3bIoikFpfsXyQ==
       }
     engines: { node: '>=6' }
     dev: false
 
-  /@sentry/utils/6.19.2:
+  /@sentry/utils/6.19.6:
     resolution:
       {
-        integrity: sha512-2DQQ2OJaxjtyxGq5FmMlqb6hptsqMs2xoBiVRMkTS/rvyTrk1oQdKZ8ePwjtgX3nJ728ni3IXIyXV+vfGp4EBw==
+        integrity: sha512-fAMWcsguL0632eWrROp/vhPgI7sBj/JROWVPzpabwVkm9z3m1rQm6iLFn4qfkZL8Ozy6NVZPXOQ7EXmeU24byg==
       }
     engines: { node: '>=6' }
     dependencies:
-      '@sentry/types': 6.19.2
+      '@sentry/types': 6.19.6
       tslib: 1.14.1
     dev: false
 
@@ -400,20 +376,20 @@ packages:
       tiny-glob: 0.2.9
     dev: true
 
-  /@sveltejs/kit/1.0.0-next.303_svelte@3.46.4:
+  /@sveltejs/kit/1.0.0-next.316_svelte@3.47.0:
     resolution:
       {
-        integrity: sha512-WdxDc8OiF1WEd/bEza7CBdzA+3qIcCi1GKBj/gieKX9I3N8iDJt/Cg2POrLo9wQoJ47nZcAd1eOhfr7XEX1aIQ==
+        integrity: sha512-oLjWOWzjriJD2t210r7ALuH/8ZADrJGsOODzRCRSJvRBCt0Q7VKVLqwKbM/RlZzD1k8Af2uRodQT11kP98hAIA==
       }
     engines: { node: '>=14.13' }
     hasBin: true
     peerDependencies:
       svelte: ^3.44.0
     dependencies:
-      '@sveltejs/vite-plugin-svelte': 1.0.0-next.33_svelte@3.46.4+vite@2.8.0
+      '@sveltejs/vite-plugin-svelte': 1.0.0-next.33_svelte@3.47.0+vite@2.9.1
       sade: 1.7.4
-      svelte: 3.46.4
-      vite: 2.8.0
+      svelte: 3.47.0
+      vite: 2.9.1
     transitivePeerDependencies:
       - diff-match-patch
       - less
@@ -422,7 +398,7 @@ packages:
       - supports-color
     dev: true
 
-  /@sveltejs/vite-plugin-svelte/1.0.0-next.33_svelte@3.46.4+vite@2.8.0:
+  /@sveltejs/vite-plugin-svelte/1.0.0-next.33_svelte@3.47.0+vite@2.9.1:
     resolution:
       {
         integrity: sha512-aj0h2+ZixgT+yoJFIs8dRRw/Cj9tgNu3+hY4CJikpa04mfhR61wXqJFfi2ZEFMUvFda5nCxKYIChFkc6wq5fJA==
@@ -441,13 +417,33 @@ packages:
       kleur: 4.1.4
       magic-string: 0.25.7
       require-relative: 0.8.7
-      svelte: 3.46.4
-      svelte-hmr: 0.14.9_svelte@3.46.4
-      vite: 2.8.0
+      svelte: 3.47.0
+      svelte-hmr: 0.14.9_svelte@3.47.0
+      vite: 2.9.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
+  /@sveltekit-i18n/base/1.1.1_svelte@3.46.4:
+    resolution:
+      {
+        integrity: sha512-J/sMU0OwS3dCLOuilHMBqu8vZHuuXiNV9vFJx8Nb4/b5BlR/KCZ4bCXI8wZR02GHeCOYKZxWus07CM1scxa/jw==
+      }
+    peerDependencies:
+      svelte: ^3.x
+    dependencies:
+      svelte: 3.46.4
+    optionalDependencies:
+      '@sveltekit-i18n/parser-default': 1.0.3
+    dev: true
+
+  /@sveltekit-i18n/parser-default/1.0.3:
+    resolution:
+      {
+        integrity: sha512-HheveklTjp3hxpYQhoHfyA6B4bQaUeSV5MQf2usIv/58UF2jY/YqhCAWj9bDBjufbuZc5pSz4BXvdX3WVT+viA==
+      }
+    dev: true
+
   /@szmarczak/http-timer/5.0.1:
     resolution:
       {
@@ -486,15 +482,6 @@ packages:
       }
     dev: true
 
-  /@types/bcrypt/5.0.0:
-    resolution:
-      {
-        integrity: sha512-agtcFKaruL8TmcvqbndlqHPSJgsolhf/qPWchFlgnW1gECTN/nKbFcoFnvKAQRFfKbh+BO6A3SWdJu9t+xF3Lw==
-      }
-    dependencies:
-      '@types/node': 17.0.23
-    dev: true
-
   /@types/cacheable-request/6.0.2:
     resolution:
       {
@@ -503,7 +490,7 @@ packages:
     dependencies:
       '@types/http-cache-semantics': 4.0.1
       '@types/keyv': 3.1.3
-      '@types/node': 17.0.23
+      '@types/node': 17.0.25
       '@types/responselike': 1.0.0
     dev: false
 
@@ -561,7 +548,7 @@ packages:
         integrity: sha512-FXCJgyyN3ivVgRoml4h94G/p3kY+u/B86La+QptcqJaWtBWtmc6TtkNfS40n9bIvyLteHh7zXOtgbobORKPbDg==
       }
     dependencies:
-      '@types/node': 17.0.23
+      '@types/node': 17.0.25
     dev: false
 
   /@types/node-forge/1.0.1:
@@ -570,22 +557,15 @@ packages:
         integrity: sha512-96ELNKv9tQJ19afdBUiM5iDw7OYEc53iUc51gAPR2aGaqRsO1DBROjqgZRjZa1tkPj7TnEOR0EnyAX6iryGkzA==
       }
     dependencies:
-      '@types/node': 17.0.23
+      '@types/node': 17.0.25
     dev: true
 
-  /@types/node/17.0.23:
+  /@types/node/17.0.25:
     resolution:
       {
-        integrity: sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw==
+        integrity: sha512-wANk6fBrUwdpY4isjWrKTufkrXdu1D2YHCot2fD/DfWxF5sMrVSA+KN7ydckvaTCh0HiqX9IVl0L5/ZoXg5M7w==
       }
 
-  /@types/parse-json/4.0.0:
-    resolution:
-      {
-        integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
-      }
-    dev: true
-
   /@types/pug/2.0.5:
     resolution:
       {
@@ -599,7 +579,7 @@ packages:
         integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==
       }
     dependencies:
-      '@types/node': 17.0.23
+      '@types/node': 17.0.25
     dev: false
 
   /@types/sass/1.16.1:
@@ -608,7 +588,7 @@ packages:
         integrity: sha512-iZUcRrGuz/Tbg3loODpW7vrQJkUtpY2fFSf4ELqqkApcS2TkZ1msk7ie8iZPB86lDOP8QOTTmuvWjc5S0R9OjQ==
       }
     dependencies:
-      '@types/node': 17.0.23
+      '@types/node': 17.0.25
     dev: true
 
   /@types/ssh2-streams/0.1.9:
@@ -763,13 +743,6 @@ packages:
       }
     dev: true
 
-  /abbrev/1.1.1:
-    resolution:
-      {
-        integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-      }
-    dev: false
-
   /acorn-jsx/5.3.2_acorn@7.4.1:
     resolution:
       {
@@ -896,17 +869,13 @@ packages:
     engines: { node: '>=0.10.0' }
     dev: true
 
-  /ansi-regex/3.0.0:
-    resolution: { integrity: sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= }
-    engines: { node: '>=4' }
-    dev: false
-
   /ansi-regex/5.0.1:
     resolution:
       {
         integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
       }
     engines: { node: '>=8' }
+    dev: true
 
   /ansi-regex/6.0.1:
     resolution:
@@ -960,24 +929,6 @@ packages:
       picomatch: 2.3.0
     dev: true
 
-  /aproba/2.0.0:
-    resolution:
-      {
-        integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
-      }
-    dev: false
-
-  /are-we-there-yet/2.0.0:
-    resolution:
-      {
-        integrity: sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==
-      }
-    engines: { node: '>=10' }
-    dependencies:
-      delegates: 1.0.0
-      readable-stream: 3.6.0
-    dev: false
-
   /arg/4.1.3:
     resolution:
       {
@@ -1697,18 +1648,8 @@ packages:
       tweetnacl: 0.14.5
     dev: false
 
-  /bcrypt/5.0.1:
-    resolution:
-      {
-        integrity: sha512-9BTgmrhZM2t1bNuDtrtIMVSmmxZBrJ71n8Wg+YgdjHuIWYF7SjjmCPZFB+/5i/o/PIeRpwVJR3P+NrpIItUjqw==
-      }
-    engines: { node: '>= 10.0.0' }
-    requiresBuild: true
-    dependencies:
-      '@mapbox/node-pre-gyp': 1.0.6
-      node-addon-api: 3.2.1
-    transitivePeerDependencies:
-      - supports-color
+  /bcryptjs/2.4.3:
+    resolution: { integrity: sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms= }
     dev: false
 
   /binary-extensions/2.2.0:
@@ -1782,16 +1723,16 @@ packages:
       ieee754: 1.2.1
     dev: false
 
-  /bullmq/1.78.1:
+  /bullmq/1.80.4:
     resolution:
       {
-        integrity: sha512-er45mM8nGhgA83EVCJ4PNxPyDSzakvoxeFGU4vdSgYeB+SbeFQAlJYmAC50Ms7YFPstm1LeinbVZ+oX/BmBzOg==
+        integrity: sha512-j3PyjU16gqmb3Md9QjMInJdbMvxIlSJx7mojtoP06LV9MfhzW75DkDrpSuJlF0H+0+u6MViV4hhaGTxky5OJWw==
       }
     dependencies:
       cron-parser: 4.2.1
       get-port: 5.1.1
       glob: 7.2.0
-      ioredis: 4.28.3
+      ioredis: 4.28.5
       lodash: 4.17.21
       msgpackr: 1.4.7
       semver: 6.3.0
@@ -1915,14 +1856,6 @@ packages:
       }
     dev: false
 
-  /chownr/2.0.0:
-    resolution:
-      {
-        integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
-      }
-    engines: { node: '>=10' }
-    dev: false
-
   /clean-stack/2.2.0:
     resolution:
       {
@@ -2007,14 +1940,6 @@ packages:
       }
     dev: true
 
-  /color-support/1.1.3:
-    resolution:
-      {
-        integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
-      }
-    hasBin: true
-    dev: false
-
   /colorette/2.0.16:
     resolution:
       {
@@ -2040,10 +1965,6 @@ packages:
   /concat-map/0.0.1:
     resolution: { integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= }
 
-  /console-control-strings/1.1.0:
-    resolution: { integrity: sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= }
-    dev: false
-
   /convert-source-map/1.8.0:
     resolution:
       {
@@ -2061,17 +1982,12 @@ packages:
     engines: { node: '>= 0.6' }
     dev: false
 
-  /cooltipz-css/2.1.0:
+  /cookie/0.5.0:
     resolution:
       {
-        integrity: sha512-howXMSGn4tYvroGUad5jg1QFKUMxxc2GiQSXrv6TQBIMmhrf8t//hz1Fx8eyc5t93SS9ZzUa5rHbPtjBTg5j1w==
+        integrity: sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
       }
-    engines: { node: '>=16', npm: '>=8' }
-    peerDependencies:
-      sass: 1.x
-    peerDependenciesMeta:
-      sass:
-        optional: true
+    engines: { node: '>= 0.6' }
     dev: false
 
   /core-js/2.6.12:
@@ -2083,20 +1999,6 @@ packages:
     requiresBuild: true
     dev: true
 
-  /cosmiconfig/7.0.1:
-    resolution:
-      {
-        integrity: sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==
-      }
-    engines: { node: '>=10' }
-    dependencies:
-      '@types/parse-json': 4.0.0
-      import-fresh: 3.3.0
-      parse-json: 5.2.0
-      path-type: 4.0.0
-      yaml: 1.10.2
-    dev: true
-
   /cpu-features/0.0.2:
     resolution:
       {
@@ -2183,10 +2085,10 @@ packages:
       }
     dev: false
 
-  /dayjs/1.11.0:
+  /dayjs/1.11.1:
     resolution:
       {
-        integrity: sha512-JLC809s6Y948/FuCZPm5IX8rRhQwOiyMb2TfVVQEixG7P8Lm/gt5S7yoQZmC8x1UehI9Pb7sksEt4xx14m+7Ug==
+        integrity: sha512-ER7EjqVAMkRRsxNCC5YqJ9d9VQYuWdGt7aiH2qA5R5wt8ZmWaP2dLUSIK6y/kVzLMlmh1Tvu5xUf4M/wdGJ5KA==
       }
     dev: false
 
@@ -2258,10 +2160,6 @@ packages:
     resolution: { integrity: sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= }
     dev: true
 
-  /delegates/1.0.0:
-    resolution: { integrity: sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= }
-    dev: false
-
   /denque/1.5.1:
     resolution:
       {
@@ -2285,12 +2183,6 @@ packages:
     engines: { node: '>=8' }
     dev: true
 
-  /detect-libc/1.0.3:
-    resolution: { integrity: sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= }
-    engines: { node: '>=0.10' }
-    hasBin: true
-    dev: false
-
   /detective/5.2.0:
     resolution:
       {
@@ -2424,6 +2316,7 @@ packages:
       {
         integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
       }
+    dev: true
 
   /emoji-regex/9.2.2:
     resolution:
@@ -2451,23 +2344,26 @@ packages:
       ansi-colors: 4.1.1
     dev: true
 
-  /error-ex/1.3.2:
-    resolution:
-      {
-        integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
-      }
-    dependencies:
-      is-arrayish: 0.2.1
-    dev: true
-
   /es6-promise/3.3.1:
     resolution: { integrity: sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM= }
     dev: true
 
-  /esbuild-android-arm64/0.14.21:
+  /esbuild-android-64/0.14.34:
     resolution:
       {
-        integrity: sha512-Bqgld1TY0wZv8TqiQmVxQFgYzz8ZmyzT7clXBDZFkOOdRybzsnj8AZuK1pwcLVA7Ya6XncHgJqIao7NFd3s0RQ==
+        integrity: sha512-XfxcfJqmMYsT/LXqrptzFxmaR3GWzXHDLdFNIhm6S00zPaQF1TBBWm+9t0RZ6LRR7iwH57DPjaOeW20vMqI4Yw==
+      }
+    engines: { node: '>=12' }
+    cpu: [x64]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-android-arm64/0.14.34:
+    resolution:
+      {
+        integrity: sha512-T02+NXTmSRL1Mc6puz+R9CB54rSPICkXKq6+tw8B6vxZFnCPzbJxgwIX4kcluz9p8nYBjF3+lSilTGWb7+Xgew==
       }
     engines: { node: '>=12' }
     cpu: [arm64]
@@ -2476,10 +2372,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-darwin-64/0.14.21:
+  /esbuild-darwin-64/0.14.34:
     resolution:
       {
-        integrity: sha512-j+Eg+e13djzyYINVvAbOo2/zvZ2DivuJJTaBrJnJHSD7kUNuGHRkHoSfFjbI80KHkn091w350wdmXDNSgRjfYQ==
+        integrity: sha512-pLRip2Bh4Ng7Bf6AMgCrSp3pPe/qZyf11h5Qo2mOfJqLWzSVjxrXW+CFRJfrOVP7TCnh/gmZSM2AFdCPB72vtw==
       }
     engines: { node: '>=12' }
     cpu: [x64]
@@ -2488,10 +2384,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-darwin-arm64/0.14.21:
+  /esbuild-darwin-arm64/0.14.34:
     resolution:
       {
-        integrity: sha512-nDNTKWDPI0RuoPj5BhcSB2z5EmZJJAyRtZLIjyXSqSpAyoB8eyAKXl4lB8U2P78Fnh4Lh1le/fmpewXE04JhBQ==
+        integrity: sha512-vpidSJEBxx6lf1NWgXC+DCmGqesJuZ5Y8aQVVsaoO4i8tRXbXb0whChRvop/zd3nfNM4dIl5EXAky0knRX5I6w==
       }
     engines: { node: '>=12' }
     cpu: [arm64]
@@ -2500,10 +2396,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-freebsd-64/0.14.21:
+  /esbuild-freebsd-64/0.14.34:
     resolution:
       {
-        integrity: sha512-zIurkCHXhxELiDZtLGiexi8t8onQc2LtuE+S7457H/pP0g0MLRKMrsn/IN4LDkNe6lvBjuoZZi2OfelOHn831g==
+        integrity: sha512-m0HBjePhe0hAQJgtMRMNV9kMgIyV4/qSnzPx42kRMQBcPhgjAq1JRu4Il26czC+9FgpMbFkUktb07f/Lwnc6CA==
       }
     engines: { node: '>=12' }
     cpu: [x64]
@@ -2512,10 +2408,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-freebsd-arm64/0.14.21:
+  /esbuild-freebsd-arm64/0.14.34:
     resolution:
       {
-        integrity: sha512-wdxMmkJfbwcN+q85MpeUEamVZ40FNsBa9mPq8tAszDn8TRT2HoJvVRADPIIBa9SWWwlDChIMjkDKAnS3KS/sPA==
+        integrity: sha512-cpRc2B94L1KvMPPYB4D6G39jLqpKlD3noAMY4/e86iXXXkhUYJJEtTuyNFTa9JRpWM0xCAp4mxjHjoIiLuoCLA==
       }
     engines: { node: '>=12' }
     cpu: [arm64]
@@ -2524,10 +2420,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-linux-32/0.14.21:
+  /esbuild-linux-32/0.14.34:
     resolution:
       {
-        integrity: sha512-fmxvyzOPPh2xiEHojpCeIQP6pXcoKsWbz3ryDDIKLOsk4xp3GbpHIEAWP0xTeuhEbendmvBDVKbAVv3PnODXLg==
+        integrity: sha512-8nQaEaoW7MH/K/RlozJa+lE1ejHIr8fuPIHhc513UebRav7HtXgQvxHQ6VZRUkWtep23M6dd7UqhwO1tMOfzQQ==
       }
     engines: { node: '>=12' }
     cpu: [ia32]
@@ -2536,10 +2432,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-linux-64/0.14.21:
+  /esbuild-linux-64/0.14.34:
     resolution:
       {
-        integrity: sha512-edZyNOv1ql+kpmlzdqzzDjRQYls+tSyi4QFi+PdBhATJFUqHsnNELWA9vMSzAaInPOEaVUTA5Ml28XFChcy4DA==
+        integrity: sha512-Y3of4qQoLLlAgf042MlrY1P+7PnN9zWj8nVtw9XQG5hcLOZLz7IKpU35oeu7n4wvyaZHwvQqDJ93gRLqdJekcQ==
       }
     engines: { node: '>=12' }
     cpu: [x64]
@@ -2548,10 +2444,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-linux-arm/0.14.21:
+  /esbuild-linux-arm/0.14.34:
     resolution:
       {
-        integrity: sha512-aSU5pUueK6afqmLQsbU+QcFBT62L+4G9hHMJDHWfxgid6hzhSmfRH9U/f+ymvxsSTr/HFRU4y7ox8ZyhlVl98w==
+        integrity: sha512-9lpq1NcJqssAF7alCO6zL3gvBVVt/lKw4oetUM7OgNnRX0OWpB+ZIO9FwCrSj/dMdmgDhPLf+119zB8QxSMmAg==
       }
     engines: { node: '>=12' }
     cpu: [arm]
@@ -2560,10 +2456,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-linux-arm64/0.14.21:
+  /esbuild-linux-arm64/0.14.34:
     resolution:
       {
-        integrity: sha512-t5qxRkq4zdQC0zXpzSB2bTtfLgOvR0C6BXYaRE/6/k8/4SrkZcTZBeNu+xGvwCU4b5dU9ST9pwIWkK6T1grS8g==
+        integrity: sha512-IlWaGtj9ir7+Nrume1DGcyzBDlK8GcnJq0ANKwcI9pVw8tqr+6GD0eqyF9SF1mR8UmAp+odrx1H5NdR2cHdFHA==
       }
     engines: { node: '>=12' }
     cpu: [arm64]
@@ -2572,10 +2468,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-linux-mips64le/0.14.21:
+  /esbuild-linux-mips64le/0.14.34:
     resolution:
       {
-        integrity: sha512-jLZLQGCNlUsmIHtGqNvBs3zN+7a4D9ckf0JZ+jQTwHdZJ1SgV9mAjbB980OFo66LoY+WeM7t3WEnq3FjI1zw4A==
+        integrity: sha512-k3or+01Rska1AjUyNjA4buEwB51eyN/xPQAoOx1CjzAQC3l8rpjUDw55kXyL63O/1MUi4ISvtNtl8gLwdyEcxw==
       }
     engines: { node: '>=12' }
     cpu: [mips64el]
@@ -2584,10 +2480,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-linux-ppc64le/0.14.21:
+  /esbuild-linux-ppc64le/0.14.34:
     resolution:
       {
-        integrity: sha512-4TWxpK391en2UBUw6GSrukToTDu6lL9vkm3Ll40HrI08WG3qcnJu7bl8e1+GzelDsiw1QmfAY/nNvJ6iaHRpCQ==
+        integrity: sha512-+qxb8M9FfM2CJaVU7GgYpJOHM1ngQOx+/VrtBjb4C8oVqaPcESCeg2anjl+HRZy8VpYc71q/iBYausPPbJ+Keg==
       }
     engines: { node: '>=12' }
     cpu: [ppc64]
@@ -2596,10 +2492,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-linux-riscv64/0.14.21:
+  /esbuild-linux-riscv64/0.14.34:
     resolution:
       {
-        integrity: sha512-fElngqOaOfTsF+u+oetDLHsPG74vB2ZaGZUqmGefAJn3a5z9Z2pNa4WpVbbKgHpaAAy5tWM1m1sbGohj6Ki6+Q==
+        integrity: sha512-Y717ltBdQ5j5sZIHdy1DV9kieo0wMip0dCmVSTceowCPYSn1Cg33Kd6981+F/3b9FDMzNWldZFOBRILViENZSA==
       }
     engines: { node: '>=12' }
     cpu: [riscv64]
@@ -2608,10 +2504,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-linux-s390x/0.14.21:
+  /esbuild-linux-s390x/0.14.34:
     resolution:
       {
-        integrity: sha512-brleZ6R5fYv0qQ7ZBwenQmP6i9TdvJCB092c/3D3pTLQHBGHJb5zWgKxOeS7bdHzmLy6a6W7GbFk6QKpjyD6QA==
+        integrity: sha512-bDDgYO4LhL4+zPs+WcBkXph+AQoPcQRTv18FzZS0WhjfH8TZx2QqlVPGhmhZ6WidrY+jKthUqO6UhGyIb4MpmA==
       }
     engines: { node: '>=12' }
     cpu: [s390x]
@@ -2620,10 +2516,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-netbsd-64/0.14.21:
+  /esbuild-netbsd-64/0.14.34:
     resolution:
       {
-        integrity: sha512-nCEgsLCQ8RoFWVV8pVI+kX66ICwbPP/M9vEa0NJGIEB/Vs5sVGMqkf67oln90XNSkbc0bPBDuo4G6FxlF7PN8g==
+        integrity: sha512-cfaFGXdRt0+vHsjNPyF0POM4BVSHPSbhLPe8mppDc7GDDxjIl08mV1Zou14oDWMp/XZMjYN1kWYRSfftiD0vvQ==
       }
     engines: { node: '>=12' }
     cpu: [x64]
@@ -2632,10 +2528,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-openbsd-64/0.14.21:
+  /esbuild-openbsd-64/0.14.34:
     resolution:
       {
-        integrity: sha512-h9zLMyVD0T73MDTVYIb/qUTokwI6EJH9O6wESuTNq6+XpMSr6C5aYZ4fvFKdNELW+Xsod+yDS2hV2JTUAbFrLA==
+        integrity: sha512-vmy9DxXVnRiI14s8GKuYBtess+EVcDALkbpTqd5jw4XITutIzyB7n4x0Tj5utAkKsgZJB22lLWGekr0ABnSLow==
       }
     engines: { node: '>=12' }
     cpu: [x64]
@@ -2644,10 +2540,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-sunos-64/0.14.21:
+  /esbuild-sunos-64/0.14.34:
     resolution:
       {
-        integrity: sha512-Kl+7Cot32qd9oqpLdB1tEGXEkjBlijrIxMJ0+vlDFaqsODutif25on0IZlFxEBtL2Gosd4p5WCV1U7UskNQfXA==
+        integrity: sha512-eNPVatNET1F7tRMhii7goL/eptfxc0ALRjrj9SPFNqp0zmxrehBFD6BaP3R4LjMn6DbMO0jOAnTLFKr8NqcJAA==
       }
     engines: { node: '>=12' }
     cpu: [x64]
@@ -2656,10 +2552,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-windows-32/0.14.21:
+  /esbuild-windows-32/0.14.34:
     resolution:
       {
-        integrity: sha512-V7vnTq67xPBUCk/9UtlolmQ798Ecjdr1ZoI1vcSgw7M82aSSt0eZdP6bh5KAFZU8pxDcx3qoHyWQfHYr11f22A==
+        integrity: sha512-EFhpXyHEcnqWYe2rAHFd8dRw8wkrd9U+9oqcyoEL84GbanAYjiiIjBZsnR8kl0sCQ5w6bLpk7vCEIA2VS32Vcg==
       }
     engines: { node: '>=12' }
     cpu: [ia32]
@@ -2668,10 +2564,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-windows-64/0.14.21:
+  /esbuild-windows-64/0.14.34:
     resolution:
       {
-        integrity: sha512-kDgHjKOHwjfJDCyRGELzVxiP/RBJBTA+wyspf78MTTJQkyPuxH2vChReNdWc+dU2S4gIZFHMdP1Qrl/k22ZmaA==
+        integrity: sha512-a8fbl8Ky7PxNEjf1aJmtxdDZj32/hC7S1OcA2ckEpCJRTjiKslI9vAdPpSjrKIWhws4Galpaawy0nB7fjHYf5Q==
       }
     engines: { node: '>=12' }
     cpu: [x64]
@@ -2680,10 +2576,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-windows-arm64/0.14.21:
+  /esbuild-windows-arm64/0.14.34:
     resolution:
       {
-        integrity: sha512-8Sbo0zpzgwWrwjQYLmHF78f7E2xg5Ve63bjB2ng3V2aManilnnTGaliq2snYg+NOX60+hEvJHRdVnuIAHW0lVw==
+        integrity: sha512-EYvmKbSa2B3sPnpC28UEu9jBK5atGV4BaVRE7CYGUci2Hlz4AvtV/LML+TcDMT6gBgibnN2gcltWclab3UutMg==
       }
     engines: { node: '>=12' }
     cpu: [arm64]
@@ -2692,34 +2588,35 @@ packages:
     dev: true
     optional: true
 
-  /esbuild/0.14.21:
+  /esbuild/0.14.34:
     resolution:
       {
-        integrity: sha512-7WEoNMBJdLN993dr9h0CpFHPRc3yFZD+EAVY9lg6syJJ12gc5fHq8d75QRExuhnMkT2DaRiIKFThRvDWP+fO+A==
+        integrity: sha512-QIWdPT/gFF6hCaf4m7kP0cJ+JIuFkdHibI7vVFvu3eJS1HpVmYHWDulyN5WXwbRA0SX/7ZDaJ/1DH8SdY9xOJg==
       }
     engines: { node: '>=12' }
     hasBin: true
     requiresBuild: true
     optionalDependencies:
-      esbuild-android-arm64: 0.14.21
-      esbuild-darwin-64: 0.14.21
-      esbuild-darwin-arm64: 0.14.21
-      esbuild-freebsd-64: 0.14.21
-      esbuild-freebsd-arm64: 0.14.21
-      esbuild-linux-32: 0.14.21
-      esbuild-linux-64: 0.14.21
-      esbuild-linux-arm: 0.14.21
-      esbuild-linux-arm64: 0.14.21
-      esbuild-linux-mips64le: 0.14.21
-      esbuild-linux-ppc64le: 0.14.21
-      esbuild-linux-riscv64: 0.14.21
-      esbuild-linux-s390x: 0.14.21
-      esbuild-netbsd-64: 0.14.21
-      esbuild-openbsd-64: 0.14.21
-      esbuild-sunos-64: 0.14.21
-      esbuild-windows-32: 0.14.21
-      esbuild-windows-64: 0.14.21
-      esbuild-windows-arm64: 0.14.21
+      esbuild-android-64: 0.14.34
+      esbuild-android-arm64: 0.14.34
+      esbuild-darwin-64: 0.14.34
+      esbuild-darwin-arm64: 0.14.34
+      esbuild-freebsd-64: 0.14.34
+      esbuild-freebsd-arm64: 0.14.34
+      esbuild-linux-32: 0.14.34
+      esbuild-linux-64: 0.14.34
+      esbuild-linux-arm: 0.14.34
+      esbuild-linux-arm64: 0.14.34
+      esbuild-linux-mips64le: 0.14.34
+      esbuild-linux-ppc64le: 0.14.34
+      esbuild-linux-riscv64: 0.14.34
+      esbuild-linux-s390x: 0.14.34
+      esbuild-netbsd-64: 0.14.34
+      esbuild-openbsd-64: 0.14.34
+      esbuild-sunos-64: 0.14.34
+      esbuild-windows-32: 0.14.34
+      esbuild-windows-64: 0.14.34
+      esbuild-windows-arm64: 0.14.34
     dev: true
 
   /escalade/3.1.1:
@@ -2755,7 +2652,7 @@ packages:
       eslint: 7.32.0
     dev: true
 
-  /eslint-plugin-svelte3/3.4.1_eslint@7.32.0+svelte@3.46.4:
+  /eslint-plugin-svelte3/3.4.1_eslint@7.32.0+svelte@3.47.0:
     resolution:
       {
         integrity: sha512-7p59WG8qV8L6wLdl4d/c3mdjkgVglQCdv5XOTk/iNPBKXuuV+Q0eFP5Wa6iJd/G2M1qR3BkLPEzaANOqKAZczw==
@@ -2766,7 +2663,7 @@ packages:
       svelte: ^3.2.0
     dependencies:
       eslint: 7.32.0
-      svelte: 3.46.4
+      svelte: 3.47.0
     dev: true
 
   /eslint-scope/5.1.1:
@@ -3066,16 +2963,6 @@ packages:
       }
     dev: false
 
-  /fs-minipass/2.1.0:
-    resolution:
-      {
-        integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
-      }
-    engines: { node: '>= 8' }
-    dependencies:
-      minipass: 3.1.5
-    dev: false
-
   /fs.realpath/1.0.0:
     resolution: { integrity: sha1-FQStJSMVjKpA20onh8sBQRmU6k8= }
 
@@ -3110,24 +2997,6 @@ packages:
     resolution: { integrity: sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= }
     dev: true
 
-  /gauge/3.0.1:
-    resolution:
-      {
-        integrity: sha512-6STz6KdQgxO4S/ko+AbjlFGGdGcknluoqU+79GOFCDqqyYj5OanQf9AjxwN0jCidtT+ziPMmPSt9E4hfQ0CwIQ==
-      }
-    engines: { node: '>=10' }
-    dependencies:
-      aproba: 2.0.0
-      color-support: 1.1.3
-      console-control-strings: 1.1.0
-      has-unicode: 2.0.1
-      object-assign: 4.1.1
-      signal-exit: 3.0.5
-      string-width: 2.1.1
-      strip-ansi: 4.0.0
-      wide-align: 1.1.5
-    dev: false
-
   /generate-password/1.7.0:
     resolution:
       {
@@ -3248,10 +3117,10 @@ packages:
       }
     dev: true
 
-  /got/12.0.2:
+  /got/12.0.3:
     resolution:
       {
-        integrity: sha512-Zi4yHiqCgaorUbknr/RHFBsC3XqjSodaw0F3qxlqAqyj+OGYZl37/uy01R0qz++KANKQYdY5FHJ0okXZpEzwWQ==
+        integrity: sha512-hmdcXi/S0gcAtDg4P8j/rM7+j3o1Aq6bXhjxkDhRY2ipe7PHpvx/14DgTY2czHOLaGeU8VRvRecidwfu9qdFug==
       }
     engines: { node: '>=14.16' }
     dependencies:
@@ -3297,10 +3166,6 @@ packages:
     engines: { node: '>=8' }
     dev: true
 
-  /has-unicode/2.0.1:
-    resolution: { integrity: sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= }
-    dev: false
-
   /has/1.0.3:
     resolution:
       {
@@ -3390,16 +3255,6 @@ packages:
     engines: { node: '>= 4' }
     dev: true
 
-  /import-cwd/3.0.0:
-    resolution:
-      {
-        integrity: sha512-4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg==
-      }
-    engines: { node: '>=8' }
-    dependencies:
-      import-from: 3.0.0
-    dev: true
-
   /import-fresh/3.3.0:
     resolution:
       {
@@ -3411,16 +3266,6 @@ packages:
       resolve-from: 4.0.0
     dev: true
 
-  /import-from/3.0.0:
-    resolution:
-      {
-        integrity: sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ==
-      }
-    engines: { node: '>=8' }
-    dependencies:
-      resolve-from: 5.0.0
-    dev: true
-
   /imurmurhash/0.1.4:
     resolution: { integrity: sha1-khi5srkoojixPcT7a21XbyMUU+o= }
     engines: { node: '>=0.8.19' }
@@ -3455,10 +3300,10 @@ packages:
       loose-envify: 1.4.0
     dev: true
 
-  /ioredis/4.28.3:
+  /ioredis/4.28.5:
     resolution:
       {
-        integrity: sha512-9JOWVgBnuSxpIgfpjc1OeY1OLmA4t2KOWWURTDRXky+eWO0LZhI33pQNT9gYxANUXfh5p/zYephYni6GPRsksQ==
+        integrity: sha512-3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A==
       }
     engines: { node: '>=6' }
     dependencies:
@@ -3477,10 +3322,6 @@ packages:
       - supports-color
     dev: false
 
-  /is-arrayish/0.2.1:
-    resolution: { integrity: sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= }
-    dev: true
-
   /is-binary-path/2.1.0:
     resolution:
       {
@@ -3513,17 +3354,13 @@ packages:
     engines: { node: '>=0.10.0' }
     dev: true
 
-  /is-fullwidth-code-point/2.0.0:
-    resolution: { integrity: sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= }
-    engines: { node: '>=4' }
-    dev: false
-
   /is-fullwidth-code-point/3.0.0:
     resolution:
       {
         integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
       }
     engines: { node: '>=8' }
+    dev: true
 
   /is-fullwidth-code-point/4.0.0:
     resolution:
@@ -3619,13 +3456,6 @@ packages:
       }
     dev: false
 
-  /json-parse-even-better-errors/2.3.1:
-    resolution:
-      {
-        integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
-      }
-    dev: true
-
   /json-schema-traverse/0.4.1:
     resolution:
       {
@@ -3725,14 +3555,18 @@ packages:
     engines: { node: '>=10' }
     dev: true
 
-  /lines-and-columns/1.1.6:
-    resolution: { integrity: sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= }
-    dev: true
-
-  /lint-staged/12.3.7:
+  /lilconfig/2.0.5:
     resolution:
       {
-        integrity: sha512-/S4D726e2GIsDVWIk1XGvheCaDm1SJRQp8efamZFWJxQMVEbOwSysp7xb49Oo73KYCdy97mIWinhlxcoNqIfIQ==
+        integrity: sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==
+      }
+    engines: { node: '>=10' }
+    dev: true
+
+  /lint-staged/12.4.0:
+    resolution:
+      {
+        integrity: sha512-3X7MR0h9b7qf4iXf/1n7RlVAx+EzpAZXoCEMhVSpaBlgKDfH2ewf+QUm7BddFyq29v4dgPP+8+uYpWuSWx035A==
       }
     engines: { node: ^12.20.0 || ^14.13.1 || >=16.0.0 }
     hasBin: true
@@ -3895,6 +3729,7 @@ packages:
     engines: { node: '>=10' }
     dependencies:
       yallist: 4.0.0
+    dev: true
 
   /lru_map/0.3.3:
     resolution: { integrity: sha1-tcg1G5Rky9dQM1p5ZQoOwOVhGN0= }
@@ -3916,16 +3751,6 @@ packages:
       sourcemap-codec: 1.4.8
     dev: true
 
-  /make-dir/3.1.0:
-    resolution:
-      {
-        integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
-      }
-    engines: { node: '>=8' }
-    dependencies:
-      semver: 6.3.0
-    dev: false
-
   /make-error/1.3.6:
     resolution:
       {
@@ -4006,27 +3831,6 @@ packages:
       }
     dev: true
 
-  /minipass/3.1.5:
-    resolution:
-      {
-        integrity: sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==
-      }
-    engines: { node: '>=8' }
-    dependencies:
-      yallist: 4.0.0
-    dev: false
-
-  /minizlib/2.1.2:
-    resolution:
-      {
-        integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
-      }
-    engines: { node: '>= 8' }
-    dependencies:
-      minipass: 3.1.5
-      yallist: 4.0.0
-    dev: false
-
   /mkdirp-classic/0.5.3:
     resolution:
       {
@@ -4044,15 +3848,6 @@ packages:
       minimist: 1.2.5
     dev: true
 
-  /mkdirp/1.0.4:
-    resolution:
-      {
-        integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-      }
-    engines: { node: '>=10' }
-    hasBin: true
-    dev: false
-
   /mri/1.2.0:
     resolution:
       {
@@ -4121,27 +3916,10 @@ packages:
     resolution: { integrity: sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= }
     dev: true
 
-  /node-addon-api/3.2.1:
+  /node-forge/1.3.1:
     resolution:
       {
-        integrity: sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
-      }
-    dev: false
-
-  /node-fetch/2.6.6:
-    resolution:
-      {
-        integrity: sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==
-      }
-    engines: { node: 4.x || >=6.0.0 }
-    dependencies:
-      whatwg-url: 5.0.0
-    dev: false
-
-  /node-forge/1.3.0:
-    resolution:
-      {
-        integrity: sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA==
+        integrity: sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
       }
     engines: { node: '>= 6.13.0' }
     dev: false
@@ -4169,17 +3947,6 @@ packages:
       }
     dev: false
 
-  /nopt/5.0.0:
-    resolution:
-      {
-        integrity: sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==
-      }
-    engines: { node: '>=6' }
-    hasBin: true
-    dependencies:
-      abbrev: 1.1.1
-    dev: false
-
   /normalize-path/3.0.0:
     resolution:
       {
@@ -4211,27 +3978,10 @@ packages:
       path-key: 3.1.1
     dev: true
 
-  /npmlog/5.0.1:
+  /object-hash/3.0.0:
     resolution:
       {
-        integrity: sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==
-      }
-    dependencies:
-      are-we-there-yet: 2.0.0
-      console-control-strings: 1.1.0
-      gauge: 3.0.1
-      set-blocking: 2.0.0
-    dev: false
-
-  /object-assign/4.1.1:
-    resolution: { integrity: sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= }
-    engines: { node: '>=0.10.0' }
-    dev: false
-
-  /object-hash/2.2.0:
-    resolution:
-      {
-        integrity: sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==
+        integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==
       }
     engines: { node: '>= 6' }
     dev: true
@@ -4329,19 +4079,6 @@ packages:
       callsites: 3.1.0
     dev: true
 
-  /parse-json/5.2.0:
-    resolution:
-      {
-        integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
-      }
-    engines: { node: '>=8' }
-    dependencies:
-      '@babel/code-frame': 7.12.11
-      error-ex: 1.3.2
-      json-parse-even-better-errors: 2.3.1
-      lines-and-columns: 1.1.6
-    dev: true
-
   /path-is-absolute/1.0.1:
     resolution: { integrity: sha1-F0uSaHNVNP+8es5r9TpanhtcX18= }
     engines: { node: '>=0.10.0' }
@@ -4405,21 +4142,24 @@ packages:
       postcss: 8.4.12
     dev: true
 
-  /postcss-load-config/3.1.0_ts-node@10.7.0:
+  /postcss-load-config/3.1.4_postcss@8.4.12+ts-node@10.7.0:
     resolution:
       {
-        integrity: sha512-ipM8Ds01ZUophjDTQYSVP70slFSYg3T0/zyfII5vzhN6V57YSxMgG5syXuwi5VtS8wSf3iL30v0uBdoIVx4Q0g==
+        integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==
       }
     engines: { node: '>= 10' }
     peerDependencies:
+      postcss: '>=8.0.9'
       ts-node: '>=9.0.0'
     peerDependenciesMeta:
+      postcss:
+        optional: true
       ts-node:
         optional: true
     dependencies:
-      import-cwd: 3.0.0
-      lilconfig: 2.0.4
-      ts-node: 10.7.0_ee885bc7281b682b6adbed6ae09ee090
+      lilconfig: 2.0.5
+      postcss: 8.4.12
+      ts-node: 10.7.0_de7c86b0cde507c63a0402da5b982bd3
       yaml: 1.10.2
     dev: true
 
@@ -4433,13 +4173,13 @@ packages:
       postcss: ^8.2.14
     dependencies:
       postcss: 8.4.12
-      postcss-selector-parser: 6.0.9
+      postcss-selector-parser: 6.0.10
     dev: true
 
-  /postcss-selector-parser/6.0.9:
+  /postcss-selector-parser/6.0.10:
     resolution:
       {
-        integrity: sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ==
+        integrity: sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==
       }
     engines: { node: '>=4' }
     dependencies:
@@ -4474,35 +4214,35 @@ packages:
     engines: { node: '>= 0.8.0' }
     dev: true
 
-  /prettier-plugin-svelte/2.6.0_prettier@2.6.1+svelte@3.46.4:
+  /prettier-plugin-svelte/2.7.0_prettier@2.6.2+svelte@3.47.0:
     resolution:
       {
-        integrity: sha512-NPSRf6Y5rufRlBleok/pqg4+1FyGsL0zYhkYP6hnueeL1J/uCm3OfOZPsLX4zqD9VAdcXfyEL2PYqGv8ZoOSfA==
+        integrity: sha512-fQhhZICprZot2IqEyoiUYLTRdumULGRvw0o4dzl5jt0jfzVWdGqeYW27QTWAeXhoupEZJULmNoH3ueJwUWFLIA==
       }
     peerDependencies:
       prettier: ^1.16.4 || ^2.0.0
       svelte: ^3.2.0
     dependencies:
-      prettier: 2.6.1
-      svelte: 3.46.4
+      prettier: 2.6.2
+      svelte: 3.47.0
     dev: true
 
-  /prettier-plugin-tailwindcss/0.1.8_prettier@2.6.1:
+  /prettier-plugin-tailwindcss/0.1.10_prettier@2.6.2:
     resolution:
       {
-        integrity: sha512-hwarSBCswAXa+kqYtaAkFr3Vop9o04WOyZs0qo3NyvW8L7f1rif61wRyq0+ArmVThOuRBcJF5hjGXYk86cwemg==
+        integrity: sha512-ooDGNuXUjgCXfShliVYQ6+0iXqUFXn+zdNInPe0WZN9qINt9srbLGFGY5jeVL4MXtY20/4S8JaBcd8l6N6NfCQ==
       }
     engines: { node: '>=12.17.0' }
     peerDependencies:
       prettier: '>=2.2.0'
     dependencies:
-      prettier: 2.6.1
+      prettier: 2.6.2
     dev: true
 
-  /prettier/2.6.1:
+  /prettier/2.6.2:
     resolution:
       {
-        integrity: sha512-8UVbTBYGwN37Bs9LERmxCPjdvPxlEowx2urIL6urHzdb3SDq4B/Z6xLFCblrSnE4iKWcS6ziJ3aOYrc1kz/E2A==
+        integrity: sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==
       }
     engines: { node: '>=10.13.0' }
     hasBin: true
@@ -4699,14 +4439,6 @@ packages:
     engines: { node: '>=4' }
     dev: true
 
-  /resolve-from/5.0.0:
-    resolution:
-      {
-        integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
-      }
-    engines: { node: '>=8' }
-    dev: true
-
   /resolve/1.22.0:
     resolution:
       {
@@ -4772,6 +4504,7 @@ packages:
     hasBin: true
     dependencies:
       glob: 7.2.0
+    dev: true
 
   /rollup/2.61.1:
     resolution:
@@ -4867,10 +4600,7 @@ packages:
     hasBin: true
     dependencies:
       lru-cache: 6.0.0
-
-  /set-blocking/2.0.0:
-    resolution: { integrity: sha1-BF+XgtARrppoA93TgrJDkrPYkPc= }
-    dev: false
+    dev: true
 
   /shebang-command/1.2.0:
     resolution: { integrity: sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= }
@@ -4905,6 +4635,7 @@ packages:
       {
         integrity: sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==
       }
+    dev: true
 
   /slash/1.0.0:
     resolution: { integrity: sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU= }
@@ -5039,17 +4770,6 @@ packages:
     engines: { node: '>=0.6.19' }
     dev: true
 
-  /string-width/2.1.1:
-    resolution:
-      {
-        integrity: sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
-      }
-    engines: { node: '>=4' }
-    dependencies:
-      is-fullwidth-code-point: 2.0.0
-      strip-ansi: 4.0.0
-    dev: false
-
   /string-width/4.2.3:
     resolution:
       {
@@ -5060,6 +4780,7 @@ packages:
       emoji-regex: 8.0.0
       is-fullwidth-code-point: 3.0.0
       strip-ansi: 6.0.1
+    dev: true
 
   /string-width/5.1.0:
     resolution:
@@ -5089,13 +4810,6 @@ packages:
       ansi-regex: 2.1.1
     dev: true
 
-  /strip-ansi/4.0.0:
-    resolution: { integrity: sha1-qEeQIusaw2iocTibY1JixQXuNo8= }
-    engines: { node: '>=4' }
-    dependencies:
-      ansi-regex: 3.0.0
-    dev: false
-
   /strip-ansi/6.0.1:
     resolution:
       {
@@ -5104,6 +4818,7 @@ packages:
     engines: { node: '>=8' }
     dependencies:
       ansi-regex: 5.0.1
+    dev: true
 
   /strip-ansi/7.0.1:
     resolution:
@@ -5182,10 +4897,10 @@ packages:
     engines: { node: '>= 0.4' }
     dev: true
 
-  /svelte-check/2.4.6_postcss@8.4.12+svelte@3.46.4:
+  /svelte-check/2.7.0_postcss@8.4.12+svelte@3.47.0:
     resolution:
       {
-        integrity: sha512-luzdly7RJhyXucQe8ID/7CqDgXdMrPYXmyZBjCbp+cixzTopZotuWevrB5hWDOnOU19m2cyetigIIa7WDHnCmQ==
+        integrity: sha512-GrvG24j0+i8AOm0k0KyJ6Dqc+TAR2yzB7rtS4nljHStunVxCTr/1KYlv4EsOeoqtHLzeWMOd5D2O6nDdP/yw4A==
       }
     hasBin: true
     peerDependencies:
@@ -5194,12 +4909,11 @@ packages:
       chokidar: 3.5.3
       fast-glob: 3.2.11
       import-fresh: 3.3.0
-      minimist: 1.2.5
       picocolors: 1.0.0
       sade: 1.7.4
       source-map: 0.7.3
-      svelte: 3.46.4
-      svelte-preprocess: 4.10.4_296873641a0ad9f42fe92172d27bcedd
+      svelte: 3.47.0
+      svelte-preprocess: 4.10.6_41810887ae6c6d59323116f47e33fa38
       typescript: 4.6.3
     transitivePeerDependencies:
       - '@babel/core'
@@ -5214,7 +4928,7 @@ packages:
       - sugarss
     dev: true
 
-  /svelte-hmr/0.14.9_svelte@3.46.4:
+  /svelte-hmr/0.14.9_svelte@3.47.0:
     resolution:
       {
         integrity: sha512-bKE9+4qb4sAnA+TKHiYurUl970rjA0XmlP9TEP7K/ncyWz3m81kA4HOgmlZK/7irGK7gzZlaPDI3cmf8fp/+tg==
@@ -5222,20 +4936,20 @@ packages:
     peerDependencies:
       svelte: '>=3.19.0'
     dependencies:
-      svelte: 3.46.4
+      svelte: 3.47.0
     dev: true
 
-  /svelte-kit-cookie-session/2.1.2:
+  /svelte-kit-cookie-session/2.1.3:
     resolution:
       {
-        integrity: sha512-PfxIWDhiyYWu7iKlL0GHpmwDrdFh+rX/WmBzOuvctF25UqngIo9MCiegWBSBLE1RBwNs5UqaIeI8+vligmY07g==
+        integrity: sha512-7Xk3CNbpLAi1KodlsV5W5jULQ2NxQunaXtAYqAuzIEXIq2EwC4oDa25kdmHjNe33epV0t4r0WwxZOuSdJPsapg==
       }
     dev: false
 
-  /svelte-preprocess/4.10.4_296873641a0ad9f42fe92172d27bcedd:
+  /svelte-preprocess/4.10.6_41810887ae6c6d59323116f47e33fa38:
     resolution:
       {
-        integrity: sha512-fuwol0N4UoHsNQolLFbMqWivqcJ9N0vfWO9IuPAiX/5okfoGXURyJ6nECbuEIv0nU3M8Xe2I1ONNje2buk7l6A==
+        integrity: sha512-I2SV1w/AveMvgIQlUF/ZOO3PYVnhxfcpNyGt8pxpUVhPfyfL/CZBkkw/KPfuFix5FJ9TnnNYMhACK3DtSaYVVQ==
       }
     engines: { node: '>= 9.11.2' }
     requiresBuild: true
@@ -5283,7 +4997,7 @@ packages:
       postcss: 8.4.12
       sorcery: 0.10.0
       strip-indent: 3.0.0
-      svelte: 3.46.4
+      svelte: 3.47.0
       typescript: 4.6.3
     dev: true
 
@@ -5294,14 +5008,27 @@ packages:
       }
     dev: true
 
-  /svelte/3.46.4:
+  /svelte/3.47.0:
     resolution:
       {
-        integrity: sha512-qKJzw6DpA33CIa+C/rGp4AUdSfii0DOTCzj/2YpSKKayw5WGSS624Et9L1nU1k2OVRS9vaENQXp2CVZNU+xvIg==
+        integrity: sha512-4JaJp3HEoTCGARRWZQIZDUanhYv0iyoHikklVHVLH9xFE9db22g4TDv7CPeNA8HD1JgjXI1vlhR1JZvvhaTu2Q==
       }
     engines: { node: '>= 8' }
     dev: true
 
+  /sveltekit-i18n/2.1.2_svelte@3.46.4:
+    resolution:
+      {
+        integrity: sha512-s5YxcbNd2EWNZaZR1A4Drt8s53E4fpUkN4XIWd3VRpw1pihZVWssqmBW1qkjQ6AB0kiu1Qwule+vt1HkbQOjrg==
+      }
+    peerDependencies:
+      svelte: ^3.x
+    dependencies:
+      '@sveltekit-i18n/base': 1.1.1_svelte@3.46.4
+      '@sveltekit-i18n/parser-default': 1.0.3
+      svelte: 3.46.4
+    dev: true
+
   /table/6.7.2:
     resolution:
       {
@@ -5317,7 +5044,7 @@ packages:
       strip-ansi: 6.0.1
     dev: true
 
-  /tailwindcss-scrollbar/0.1.0_tailwindcss@3.0.23:
+  /tailwindcss-scrollbar/0.1.0_tailwindcss@3.0.24:
     resolution:
       {
         integrity: sha512-egipxw4ooQDh94x02XQpPck0P0sfwazwoUGfA9SedPATIuYDR+6qe8d31Gl7YsSMRiOKDkkqfI0kBvEw9lT/Hg==
@@ -5325,38 +5052,35 @@ packages:
     peerDependencies:
       tailwindcss: '>= 2.x.x'
     dependencies:
-      tailwindcss: 3.0.23_b89136460714832cdda11d1e9d57d1ff
+      tailwindcss: 3.0.24_ts-node@10.7.0
     dev: false
 
-  /tailwindcss/3.0.23_b89136460714832cdda11d1e9d57d1ff:
+  /tailwindcss/3.0.24_ts-node@10.7.0:
     resolution:
       {
-        integrity: sha512-+OZOV9ubyQ6oI2BXEhzw4HrqvgcARY38xv3zKcjnWtMIZstEsXdI9xftd1iB7+RbOnj2HOEzkA0OyB5BaSxPQA==
+        integrity: sha512-H3uMmZNWzG6aqmg9q07ZIRNIawoiEcNFKDfL+YzOPuPsXuDXxJxB9icqzLgdzKNwjG3SAro2h9SYav8ewXNgig==
       }
     engines: { node: '>=12.13.0' }
     hasBin: true
-    peerDependencies:
-      autoprefixer: ^10.0.2
     dependencies:
       arg: 5.0.1
-      autoprefixer: 10.4.4_postcss@8.4.12
-      chalk: 4.1.2
       chokidar: 3.5.3
       color-name: 1.1.4
-      cosmiconfig: 7.0.1
       detective: 5.2.0
       didyoumean: 1.2.2
       dlv: 1.1.3
       fast-glob: 3.2.11
       glob-parent: 6.0.2
       is-glob: 4.0.3
+      lilconfig: 2.0.5
       normalize-path: 3.0.0
-      object-hash: 2.2.0
+      object-hash: 3.0.0
+      picocolors: 1.0.0
       postcss: 8.4.12
       postcss-js: 4.0.0_postcss@8.4.12
-      postcss-load-config: 3.1.0_ts-node@10.7.0
+      postcss-load-config: 3.1.4_postcss@8.4.12+ts-node@10.7.0
       postcss-nested: 5.0.6_postcss@8.4.12
-      postcss-selector-parser: 6.0.9
+      postcss-selector-parser: 6.0.10
       postcss-value-parser: 4.2.0
       quick-lru: 5.1.1
       resolve: 1.22.0
@@ -5390,21 +5114,6 @@ packages:
       readable-stream: 3.6.0
     dev: false
 
-  /tar/6.1.11:
-    resolution:
-      {
-        integrity: sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
-      }
-    engines: { node: '>= 10' }
-    dependencies:
-      chownr: 2.0.0
-      fs-minipass: 2.1.0
-      minipass: 3.1.5
-      minizlib: 2.1.2
-      mkdirp: 1.0.4
-      yallist: 4.0.0
-    dev: false
-
   /text-table/0.2.0:
     resolution: { integrity: sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= }
     dev: true
@@ -5438,16 +5147,12 @@ packages:
       is-number: 7.0.0
     dev: true
 
-  /tr46/0.0.3:
-    resolution: { integrity: sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= }
-    dev: false
-
   /trim-right/1.0.1:
     resolution: { integrity: sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= }
     engines: { node: '>=0.10.0' }
     dev: true
 
-  /ts-node/10.7.0_ee885bc7281b682b6adbed6ae09ee090:
+  /ts-node/10.7.0_de7c86b0cde507c63a0402da5b982bd3:
     resolution:
       {
         integrity: sha512-TbIGS4xgJoX2i3do417KSaep1uRAW/Lu+WAL2doDHC0D6ummjirVOXU5/7aiZotbQ5p1Zp9tP7U6cYhA0O7M8A==
@@ -5469,7 +5174,7 @@ packages:
       '@tsconfig/node12': 1.0.9
       '@tsconfig/node14': 1.0.1
       '@tsconfig/node16': 1.0.2
-      '@types/node': 17.0.23
+      '@types/node': 17.0.25
       acorn: 8.5.0
       acorn-walk: 8.2.0
       arg: 4.1.3
@@ -5597,10 +5302,10 @@ packages:
       }
     dev: true
 
-  /vite/2.8.0:
+  /vite/2.9.1:
     resolution:
       {
-        integrity: sha512-ed5rjyeysttuPJX/aKSA0gTB/8ZKLM5xF6FtEuKy1B9DiQbDNFMVMQxnb9JesgBPUMMIJxC8w5KZ/KNWLKFXoA==
+        integrity: sha512-vSlsSdOYGcYEJfkQ/NeLXgnRv5zZfpAsdztkIrs7AZHV8RCMZQkwjo4DS5BnrYTqoWqLoUe1Cah4aVO4oNNqCQ==
       }
     engines: { node: '>=12.2.0' }
     hasBin: true
@@ -5616,7 +5321,7 @@ packages:
       stylus:
         optional: true
     dependencies:
-      esbuild: 0.14.21
+      esbuild: 0.14.34
       postcss: 8.4.12
       resolve: 1.22.0
       rollup: 2.61.1
@@ -5624,17 +5329,6 @@ packages:
       fsevents: 2.3.2
     dev: true
 
-  /webidl-conversions/3.0.1:
-    resolution: { integrity: sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= }
-    dev: false
-
-  /whatwg-url/5.0.0:
-    resolution: { integrity: sha1-lmRU6HZUYuN2RNNib2dCzotwll0= }
-    dependencies:
-      tr46: 0.0.3
-      webidl-conversions: 3.0.1
-    dev: false
-
   /which/1.3.1:
     resolution:
       {
@@ -5655,15 +5349,6 @@ packages:
     dependencies:
       isexe: 2.0.0
 
-  /wide-align/1.1.5:
-    resolution:
-      {
-        integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
-      }
-    dependencies:
-      string-width: 4.2.3
-    dev: false
-
   /word-wrap/1.2.3:
     resolution:
       {
@@ -5716,6 +5401,7 @@ packages:
       {
         integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
       }
+    dev: true
 
   /yaml/1.10.2:
     resolution:
diff --git a/prisma/migrations/20220418214843_persistent_storage_services/migration.sql b/prisma/migrations/20220418214843_persistent_storage_services/migration.sql
new file mode 100644
index 000000000..f85fd31df
--- /dev/null
+++ b/prisma/migrations/20220418214843_persistent_storage_services/migration.sql
@@ -0,0 +1,12 @@
+-- CreateTable
+CREATE TABLE "ServicePersistentStorage" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "serviceId" TEXT NOT NULL,
+    "path" TEXT NOT NULL,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "ServicePersistentStorage_serviceId_fkey" FOREIGN KEY ("serviceId") REFERENCES "Service" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "ServicePersistentStorage_serviceId_path_key" ON "ServicePersistentStorage"("serviceId", "path");
diff --git a/prisma/migrations/20220419203408_multiply_dockerfile_locations/migration.sql b/prisma/migrations/20220419203408_multiply_dockerfile_locations/migration.sql
new file mode 100644
index 000000000..ce32f0844
--- /dev/null
+++ b/prisma/migrations/20220419203408_multiply_dockerfile_locations/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Application" ADD COLUMN "dockerFileLocation" TEXT;
diff --git a/prisma/migrations/20220420202031_deno_configurations/migration.sql b/prisma/migrations/20220420202031_deno_configurations/migration.sql
new file mode 100644
index 000000000..9d0e832dc
--- /dev/null
+++ b/prisma/migrations/20220420202031_deno_configurations/migration.sql
@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE "Application" ADD COLUMN "denoMainFile" TEXT;
+ALTER TABLE "Application" ADD COLUMN "denoOptions" TEXT;
diff --git a/prisma/migrations/20220420210057_branch_for_builds/migration.sql b/prisma/migrations/20220420210057_branch_for_builds/migration.sql
new file mode 100644
index 000000000..8cd8e653d
--- /dev/null
+++ b/prisma/migrations/20220420210057_branch_for_builds/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Build" ADD COLUMN "branch" TEXT;
diff --git a/prisma/migrations/20220425071132_umami/migration.sql b/prisma/migrations/20220425071132_umami/migration.sql
new file mode 100644
index 000000000..259fb76cd
--- /dev/null
+++ b/prisma/migrations/20220425071132_umami/migration.sql
@@ -0,0 +1,17 @@
+-- CreateTable
+CREATE TABLE "Umami" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "serviceId" TEXT NOT NULL,
+    "postgresqlUser" TEXT NOT NULL,
+    "postgresqlPassword" TEXT NOT NULL,
+    "postgresqlDatabase" TEXT NOT NULL,
+    "postgresqlPublicPort" INTEGER,
+    "umamiAdminPassword" TEXT NOT NULL,
+    "hashSalt" TEXT NOT NULL,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "Umami_serviceId_fkey" FOREIGN KEY ("serviceId") REFERENCES "Service" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Umami_serviceId_key" ON "Umami"("serviceId");
diff --git a/prisma/migrations/20220425075326_auto_update_coolify/migration.sql b/prisma/migrations/20220425075326_auto_update_coolify/migration.sql
new file mode 100644
index 000000000..a102973ee
--- /dev/null
+++ b/prisma/migrations/20220425075326_auto_update_coolify/migration.sql
@@ -0,0 +1,22 @@
+-- RedefineTables
+PRAGMA foreign_keys=OFF;
+CREATE TABLE "new_Setting" (
+    "id" TEXT NOT NULL PRIMARY KEY,
+    "fqdn" TEXT,
+    "isRegistrationEnabled" BOOLEAN NOT NULL DEFAULT false,
+    "dualCerts" BOOLEAN NOT NULL DEFAULT false,
+    "minPort" INTEGER NOT NULL DEFAULT 9000,
+    "maxPort" INTEGER NOT NULL DEFAULT 9100,
+    "proxyPassword" TEXT NOT NULL,
+    "proxyUser" TEXT NOT NULL,
+    "proxyHash" TEXT,
+    "isAutoUpdateEnabled" BOOLEAN NOT NULL DEFAULT false,
+    "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" DATETIME NOT NULL
+);
+INSERT INTO "new_Setting" ("createdAt", "dualCerts", "fqdn", "id", "isRegistrationEnabled", "maxPort", "minPort", "proxyHash", "proxyPassword", "proxyUser", "updatedAt") SELECT "createdAt", "dualCerts", "fqdn", "id", "isRegistrationEnabled", "maxPort", "minPort", "proxyHash", "proxyPassword", "proxyUser", "updatedAt" FROM "Setting";
+DROP TABLE "Setting";
+ALTER TABLE "new_Setting" RENAME TO "Setting";
+CREATE UNIQUE INDEX "Setting_fqdn_key" ON "Setting"("fqdn");
+PRAGMA foreign_key_check;
+PRAGMA foreign_keys=ON;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 6df6f549e..6cd94b395 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -1,5 +1,6 @@
 generator client {
-  provider = "prisma-client-js"
+  provider      = "prisma-client-js"
+  binaryTargets = ["native", "linux-musl"]
 }
 
 datasource db {
@@ -17,6 +18,7 @@ model Setting {
   proxyPassword         String
   proxyUser             String
   proxyHash             String?
+  isAutoUpdateEnabled   Boolean  @default(false)
   createdAt             DateTime @default(now())
   updatedAt             DateTime @updatedAt
 }
@@ -91,6 +93,9 @@ model Application {
   pythonWSGI          String?
   pythonModule        String?
   pythonVariable      String?
+  dockerFileLocation  String?
+  denoMainFile        String?
+  denoOptions         String?
   createdAt           DateTime                       @default(now())
   updatedAt           DateTime                       @updatedAt
   settings            ApplicationSettings?
@@ -118,14 +123,25 @@ model ApplicationSettings {
 model ApplicationPersistentStorage {
   id            String      @id @default(cuid())
   application   Application @relation(fields: [applicationId], references: [id])
-  applicationId String      
-  path          String      
+  applicationId String
+  path          String
   createdAt     DateTime    @default(now())
   updatedAt     DateTime    @updatedAt
 
   @@unique([applicationId, path])
 }
 
+model ServicePersistentStorage {
+  id        String   @id @default(cuid())
+  service   Service  @relation(fields: [serviceId], references: [id])
+  serviceId String
+  path      String
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  @@unique([serviceId, path])
+}
+
 model Secret {
   id            String      @id @default(cuid())
   name          String
@@ -169,6 +185,7 @@ model Build {
   githubAppId         String?
   gitlabAppId         String?
   commit              String?
+  branch              String?
   status              String?  @default("queued")
   createdAt           DateTime @default(now())
   updatedAt           DateTime @updatedAt
@@ -267,17 +284,17 @@ model DatabaseSettings {
 }
 
 model Service {
-  id                  String              @id @default(cuid())
+  id                  String                     @id @default(cuid())
   name                String
   fqdn                String?
-  dualCerts           Boolean             @default(false)
+  dualCerts           Boolean                    @default(false)
   type                String?
   version             String?
   teams               Team[]
   destinationDockerId String?
-  destinationDocker   DestinationDocker?  @relation(fields: [destinationDockerId], references: [id])
-  createdAt           DateTime            @default(now())
-  updatedAt           DateTime            @updatedAt
+  destinationDocker   DestinationDocker?         @relation(fields: [destinationDockerId], references: [id])
+  createdAt           DateTime                   @default(now())
+  updatedAt           DateTime                   @updatedAt
   plausibleAnalytics  PlausibleAnalytics?
   minio               Minio?
   vscodeserver        Vscodeserver?
@@ -285,6 +302,8 @@ model Service {
   ghost               Ghost?
   serviceSecret       ServiceSecret[]
   meiliSearch         MeiliSearch?
+  persistentStorage   ServicePersistentStorage[]
+  umami               Umami?
 }
 
 model PlausibleAnalytics {
@@ -369,3 +388,17 @@ model MeiliSearch {
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 }
+
+model Umami {
+  id                   String   @id @default(cuid())
+  serviceId            String   @unique
+  postgresqlUser       String
+  postgresqlPassword   String
+  postgresqlDatabase   String
+  postgresqlPublicPort Int?
+  umamiAdminPassword   String
+  hashSalt             String
+  service              Service  @relation(fields: [serviceId], references: [id])
+  createdAt            DateTime @default(now())
+  updatedAt            DateTime @updatedAt
+}
diff --git a/prisma/seed.cjs b/prisma/seed.cjs
index 61f3928f6..1e6b160c6 100644
--- a/prisma/seed.cjs
+++ b/prisma/seed.cjs
@@ -50,6 +50,20 @@ async function main() {
 			}
 		});
 	}
+
+	// Set auto-update based on env variable
+	const isAutoUpdateEnabled = process.env['COOLIFY_AUTO_UPDATE'] === 'true';
+	const settings = await prisma.setting.findFirst({});
+	if (settings) {
+		await prisma.setting.update({
+			where: {
+				id: settings.id
+			},
+			data: {
+				isAutoUpdateEnabled
+			}
+		});
+	}
 }
 main()
 	.catch((e) => {
diff --git a/src/app.d.ts b/src/app.d.ts
index d432aef4a..ccdea3cee 100644
--- a/src/app.d.ts
+++ b/src/app.d.ts
@@ -6,7 +6,11 @@ declare namespace App {
 		cookies: Record<string, string>;
 	}
 	interface Platform {}
-	interface Session extends SessionData {}
+	interface Session extends SessionData {
+		whiteLabelDetails: {
+			icon: string | null;
+		};
+	}
 	interface Stuff {
 		service: any;
 		application: any;
@@ -27,6 +31,7 @@ interface SessionData {
 	userId?: string | null;
 	teamId?: string | null;
 	permission?: string;
+	lang?: string;
 	isAdmin?: boolean;
 	expires?: string | null;
 }
diff --git a/src/hooks.ts b/src/hooks.ts
index c72c7fd6c..50624b22f 100644
--- a/src/hooks.ts
+++ b/src/hooks.ts
@@ -6,8 +6,12 @@ import { getUserDetails, sentry } from '$lib/common';
 import { version } from '$lib/common';
 import cookie from 'cookie';
 import { dev } from '$app/env';
+import { locales } from '$lib/translations';
 
 const whiteLabeled = process.env['COOLIFY_WHITE_LABELED'] === 'true';
+const whiteLabelDetails = {
+	icon: (whiteLabeled && process.env['COOLIFY_WHITE_LABELED_ICON']) || null
+};
 
 export const handle = handleSession(
 	{
@@ -17,6 +21,24 @@ export const handle = handleSession(
 	},
 	async function ({ event, resolve }) {
 		let response;
+
+		const { url, request } = event;
+
+		// Get defined locales
+		const supportedLocales = locales.get();
+		let locale;
+
+		if (event.locals.cookies['lang']) {
+			locale = event.locals.cookies['lang'];
+		} else if (!locale) {
+			locale = `${`${request.headers.get('accept-language')}`.match(
+				/[a-zA-Z]+?(?=-|_|,|;)/
+			)}`.toLowerCase();
+		}
+
+		// Set default locale if user preferred locale does not match
+		if (!supportedLocales.includes(locale)) locale = 'en';
+
 		try {
 			if (event.locals.cookies) {
 				if (event.locals.cookies['kit.session']) {
@@ -36,12 +58,14 @@ export const handle = handleSession(
 			}
 
 			response = await resolve(event, {
-				ssr: !event.url.pathname.startsWith('/webhooks/success')
+				ssr: !event.url.pathname.startsWith('/webhooks/success'),
+				transformPage: ({ html }) => html.replace(/<html.*>/, `<html lang="${locale}">`)
 			});
 		} catch (error) {
 			console.log(error);
 			response = await resolve(event, {
-				ssr: !event.url.pathname.startsWith('/webhooks/success')
+				ssr: !event.url.pathname.startsWith('/webhooks/success'),
+				transformPage: ({ html }) => html.replace(/<html.*>/, `<html lang="${locale}">`)
 			});
 			response.headers.append(
 				'Set-Cookie',
@@ -64,16 +88,27 @@ export const handle = handleSession(
 					expires: new Date('Thu, 01 Jan 1970 00:00:01 GMT')
 				})
 			);
-		} finally {
-			return response;
 		}
+
+		response.headers.append(
+			'Set-Cookie',
+			cookie.serialize('lang', locale, {
+				path: '/',
+				sameSite: 'strict',
+				maxAge: 30 * 24 * 60 * 60
+			})
+		);
+
+		return response;
 	}
 );
 
 export const getSession: GetSession = function ({ locals }) {
 	return {
+		lang: locals.cookies.lang,
 		version,
 		whiteLabeled,
+		whiteLabelDetails,
 		...locals.session.data
 	};
 };
diff --git a/src/lib/api.ts b/src/lib/api.ts
index 42fe10a1e..ab145a2f7 100644
--- a/src/lib/api.ts
+++ b/src/lib/api.ts
@@ -1,9 +1,15 @@
-async function send({ method, path, data = {}, headers, timeout = 30000 }) {
+async function send({
+	method,
+	path,
+	data = {},
+	headers,
+	timeout = 120000
+}): Promise<Record<string, unknown>> {
 	const controller = new AbortController();
 	const id = setTimeout(() => controller.abort(), timeout);
 	const opts = { method, headers: {}, body: null, signal: controller.signal };
 	if (Object.keys(data).length > 0) {
-		let parsedData = data;
+		const parsedData = data;
 		for (const [key, value] of Object.entries(data)) {
 			if (value === '') {
 				parsedData[key] = null;
@@ -43,18 +49,33 @@ async function send({ method, path, data = {}, headers, timeout = 30000 }) {
 	return responseData;
 }
 
-export function get(path, headers = {}): Promise<any> {
+export function get(
+	path: string,
+	headers?: Record<string, unknown>
+): Promise<Record<string, unknown>> {
 	return send({ method: 'GET', path, headers });
 }
 
-export function del(path, data = {}, headers = {}): Promise<any> {
+export function del(
+	path: string,
+	data: Record<string, unknown>,
+	headers?: Record<string, unknown>
+): Promise<Record<string, unknown>> {
 	return send({ method: 'DELETE', path, data, headers });
 }
 
-export function post(path, data, headers = {}): Promise<any> {
+export function post(
+	path: string,
+	data: Record<string, unknown>,
+	headers?: Record<string, unknown>
+): Promise<Record<string, unknown>> {
 	return send({ method: 'POST', path, data, headers });
 }
 
-export function put(path, data, headers = {}): Promise<any> {
+export function put(
+	path: string,
+	data: Record<string, unknown>,
+	headers?: Record<string, unknown>
+): Promise<Record<string, unknown>> {
 	return send({ method: 'PUT', path, data, headers });
 }
diff --git a/src/lib/buildPacks/common.ts b/src/lib/buildPacks/common.ts
index 65f4d6903..05313a3d2 100644
--- a/src/lib/buildPacks/common.ts
+++ b/src/lib/buildPacks/common.ts
@@ -91,7 +91,9 @@ export const setDefaultConfiguration = async (data) => {
 		startCommand,
 		buildCommand,
 		publishDirectory,
-		baseDirectory
+		baseDirectory,
+		dockerFileLocation,
+		denoMainFile
 	} = data;
 	const template = scanningTemplates[buildPack];
 	if (!port) {
@@ -102,14 +104,25 @@ export const setDefaultConfiguration = async (data) => {
 		else if (buildPack === 'php') port = 80;
 		else if (buildPack === 'python') port = 8000;
 	}
-	if (!installCommand) installCommand = template?.installCommand || 'yarn install';
-	if (!startCommand) startCommand = template?.startCommand || 'yarn start';
-	if (!buildCommand) buildCommand = template?.buildCommand || null;
+	if (!installCommand && buildPack !== 'static')
+		installCommand = template?.installCommand || 'yarn install';
+	if (!startCommand && buildPack !== 'static')
+		startCommand = template?.startCommand || 'yarn start';
+	if (!buildCommand && buildPack !== 'static') buildCommand = template?.buildCommand || null;
 	if (!publishDirectory) publishDirectory = template?.publishDirectory || null;
 	if (baseDirectory) {
 		if (!baseDirectory.startsWith('/')) baseDirectory = `/${baseDirectory}`;
 		if (!baseDirectory.endsWith('/')) baseDirectory = `${baseDirectory}/`;
 	}
+	if (dockerFileLocation) {
+		if (!dockerFileLocation.startsWith('/')) dockerFileLocation = `/${dockerFileLocation}`;
+		if (dockerFileLocation.endsWith('/')) dockerFileLocation = dockerFileLocation.slice(0, -1);
+	} else {
+		dockerFileLocation = '/Dockerfile';
+	}
+	if (!denoMainFile) {
+		denoMainFile = 'main.ts';
+	}
 
 	return {
 		buildPack,
@@ -118,7 +131,9 @@ export const setDefaultConfiguration = async (data) => {
 		startCommand,
 		buildCommand,
 		publishDirectory,
-		baseDirectory
+		baseDirectory,
+		dockerFileLocation,
+		denoMainFile
 	};
 };
 
@@ -184,7 +199,11 @@ export async function copyBaseConfigurationFiles(buildPack, workdir, buildId, ap
             }
             `
 			);
-			await saveBuildLog({ line: 'Copied default configuration file.', buildId, applicationId });
+			await saveBuildLog({
+				line: 'Copied default configuration file for Nginx.',
+				buildId,
+				applicationId
+			});
 		}
 	} catch (error) {
 		console.log(error);
diff --git a/src/lib/buildPacks/deno.ts b/src/lib/buildPacks/deno.ts
new file mode 100644
index 000000000..2e5569438
--- /dev/null
+++ b/src/lib/buildPacks/deno.ts
@@ -0,0 +1,54 @@
+import { buildImage } from '$lib/docker';
+import { promises as fs } from 'fs';
+
+const createDockerfile = async (data, image): Promise<void> => {
+	const { workdir, port, baseDirectory, secrets, pullmergeRequestId, denoMainFile, denoOptions } =
+		data;
+	const Dockerfile: Array<string> = [];
+
+	let depsFound = false;
+	try {
+		await fs.readFile(`${workdir}${baseDirectory || ''}/deps.ts`);
+		depsFound = true;
+	} catch (error) {}
+
+	Dockerfile.push(`FROM ${image}`);
+	Dockerfile.push('WORKDIR /app');
+	Dockerfile.push(`LABEL coolify.image=true`);
+	if (secrets.length > 0) {
+		secrets.forEach((secret) => {
+			if (secret.isBuildSecret) {
+				if (pullmergeRequestId) {
+					if (secret.isPRMRSecret) {
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
+					}
+				} else {
+					if (!secret.isPRMRSecret) {
+						Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
+					}
+				}
+			}
+		});
+	}
+	if (depsFound) {
+		Dockerfile.push(`COPY .${baseDirectory || ''}/deps.ts /app`);
+		Dockerfile.push(`RUN deno cache deps.ts`);
+	}
+	Dockerfile.push(`COPY ${denoMainFile} /app`);
+	Dockerfile.push(`RUN deno cache ${denoMainFile}`);
+	Dockerfile.push(`COPY .${baseDirectory || ''} ./`);
+	Dockerfile.push(`ENV NO_COLOR true`);
+	Dockerfile.push(`EXPOSE ${port}`);
+	Dockerfile.push(`CMD deno run ${denoOptions ? denoOptions.split(' ') : ''} ${denoMainFile}`);
+	await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile.join('\n'));
+};
+
+export default async function (data) {
+	try {
+		const image = 'denoland/deno:latest';
+		await createDockerfile(data, image);
+		await buildImage(data);
+	} catch (error) {
+		throw error;
+	}
+}
diff --git a/src/lib/buildPacks/docker.ts b/src/lib/buildPacks/docker.ts
index 371ffed82..1ddf81a60 100644
--- a/src/lib/buildPacks/docker.ts
+++ b/src/lib/buildPacks/docker.ts
@@ -10,15 +10,16 @@ export default async function ({
 	buildId,
 	baseDirectory,
 	secrets,
-	pullmergeRequestId
+	pullmergeRequestId,
+	dockerFileLocation
 }) {
 	try {
-		let file = `${workdir}/Dockerfile`;
+		const file = `${workdir}${dockerFileLocation}`;
+		let dockerFileOut = `${workdir}`;
 		if (baseDirectory) {
-			file = `${workdir}/${baseDirectory}/Dockerfile`;
-			workdir = `${workdir}/${baseDirectory}`;
+			dockerFileOut = `${workdir}${baseDirectory}`;
+			workdir = `${workdir}${baseDirectory}`;
 		}
-
 		const Dockerfile: Array<string> = (await fs.readFile(`${file}`, 'utf8'))
 			.toString()
 			.trim()
@@ -26,20 +27,23 @@ export default async function ({
 		if (secrets.length > 0) {
 			secrets.forEach((secret) => {
 				if (secret.isBuildSecret) {
-					if (pullmergeRequestId) {
-						if (secret.isPRMRSecret) {
-							Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
-						}
-					} else {
-						if (!secret.isPRMRSecret) {
-							Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
-						}
+					if (
+						(pullmergeRequestId && secret.isPRMRSecret) ||
+						(!pullmergeRequestId && !secret.isPRMRSecret)
+					) {
+						Dockerfile.unshift(`ARG ${secret.name}=${secret.value}`);
+
+						Dockerfile.forEach((line, index) => {
+							if (line.startsWith('FROM')) {
+								Dockerfile.splice(index + 1, 0, `ARG ${secret.name}`);
+							}
+						});
 					}
 				}
 			});
 		}
-		await fs.writeFile(`${file}`, Dockerfile.join('\n'));
-		await buildImage({ applicationId, tag, workdir, docker, buildId, debug });
+		await fs.writeFile(`${dockerFileOut}${dockerFileLocation}`, Dockerfile.join('\n'));
+		await buildImage({ applicationId, tag, workdir, docker, buildId, debug, dockerFileLocation });
 	} catch (error) {
 		throw error;
 	}
diff --git a/src/lib/buildPacks/index.ts b/src/lib/buildPacks/index.ts
index babbe8f17..ac31afc16 100644
--- a/src/lib/buildPacks/index.ts
+++ b/src/lib/buildPacks/index.ts
@@ -13,6 +13,7 @@ import rust from './rust';
 import astro from './static';
 import eleventy from './static';
 import python from './python';
+import deno from './deno';
 
 export {
 	node,
@@ -29,5 +30,6 @@ export {
 	rust,
 	astro,
 	eleventy,
-	python
+	python,
+	deno
 };
diff --git a/src/lib/common.ts b/src/lib/common.ts
index 57cdabba2..acbe6c88c 100644
--- a/src/lib/common.ts
+++ b/src/lib/common.ts
@@ -12,7 +12,8 @@ import { version as currentVersion } from '../../package.json';
 import dayjs from 'dayjs';
 import Cookie from 'cookie';
 import os from 'os';
-import cuid from 'cuid';
+import type { RequestEvent } from '@sveltejs/kit/types/internal';
+import type { Job } from 'bullmq';
 
 try {
 	if (!dev) {
@@ -25,7 +26,7 @@ try {
 			initialScope: {
 				tags: {
 					appId: process.env['COOLIFY_APP_ID'],
-					'os.arch': os.arch(),
+					'os.arch': getOsArch(),
 					'os.platform': os.platform(),
 					'os.release': os.release()
 				}
@@ -45,37 +46,30 @@ const customConfig: Config = {
 
 export const version = currentVersion;
 export const asyncExecShell = util.promisify(child.exec);
-export const asyncSleep = (delay) => new Promise((resolve) => setTimeout(resolve, delay));
-
+export const asyncSleep = (delay: number): Promise<unknown> =>
+	new Promise((resolve) => setTimeout(resolve, delay));
 export const sentry = Sentry;
 
-export const uniqueName = () => uniqueNamesGenerator(customConfig);
+export const uniqueName = (): string => uniqueNamesGenerator(customConfig);
 
-export const saveBuildLog = async ({ line, buildId, applicationId }) => {
-	if (line) {
-		if (line.includes('ghs_')) {
-			const regex = /ghs_.*@/g;
-			line = line.replace(regex, '<SENSITIVE_DATA_DELETED>@');
-		}
-		const addTimestamp = `${generateTimestamp()} ${line}`;
-		return await buildLogQueue.add(buildId, { buildId, line: addTimestamp, applicationId });
+export const saveBuildLog = async ({
+	line,
+	buildId,
+	applicationId
+}: {
+	line: string;
+	buildId: string;
+	applicationId: string;
+}): Promise<Job> => {
+	if (line && typeof line === 'string' && line.includes('ghs_')) {
+		const regex = /ghs_.*@/g;
+		line = line.replace(regex, '<SENSITIVE_DATA_DELETED>@');
 	}
+	const addTimestamp = `${generateTimestamp()} ${line}`;
+	return await buildLogQueue.add(buildId, { buildId, line: addTimestamp, applicationId });
 };
 
-export const isTeamIdTokenAvailable = (request) => {
-	const cookie = request.headers.cookie
-		?.split(';')
-		.map((s) => s.trim())
-		.find((s) => s.startsWith('teamId='))
-		?.split('=')[1];
-	if (!cookie) {
-		return getTeam(request);
-	} else {
-		return cookie;
-	}
-};
-
-export const getTeam = (event) => {
+export const getTeam = (event: RequestEvent): string | null => {
 	const cookies = Cookie.parse(event.request.headers.get('cookie'));
 	if (cookies?.teamId) {
 		return cookies.teamId;
@@ -85,14 +79,28 @@ export const getTeam = (event) => {
 	return null;
 };
 
-export const getUserDetails = async (event, isAdminRequired = true) => {
+export const getUserDetails = async (
+	event: RequestEvent,
+	isAdminRequired = true
+): Promise<{
+	teamId: string;
+	userId: string;
+	permission: string;
+	status: number;
+	body: { message: string };
+}> => {
 	const teamId = getTeam(event);
 	const userId = event?.locals?.session?.data?.userId || null;
-	const { permission = 'read' } = await db.prisma.permission.findFirst({
-		where: { teamId, userId },
-		select: { permission: true },
-		rejectOnNotFound: true
-	});
+	let permission = 'read';
+	if (teamId && userId) {
+		const data = await db.prisma.permission.findFirst({
+			where: { teamId, userId },
+			select: { permission: true },
+			rejectOnNotFound: true
+		});
+		if (data.permission) permission = data.permission;
+	}
+
 	const payload = {
 		teamId,
 		userId,
@@ -112,11 +120,11 @@ export const getUserDetails = async (event, isAdminRequired = true) => {
 	return payload;
 };
 
-export function getEngine(engine) {
+export function getEngine(engine: string): string {
 	return engine === '/var/run/docker.sock' ? 'unix:///var/run/docker.sock' : engine;
 }
 
-export async function removeContainer(id, engine) {
+export async function removeContainer(id: string, engine: string): Promise<void> {
 	const host = getEngine(engine);
 	try {
 		const { stdout } = await asyncExecShell(
@@ -132,11 +140,23 @@ export async function removeContainer(id, engine) {
 	}
 }
 
-export const removeDestinationDocker = async ({ id, engine }) => {
+export const removeDestinationDocker = async ({
+	id,
+	engine
+}: {
+	id: string;
+	engine: string;
+}): Promise<void> => {
 	return await removeContainer(id, engine);
 };
 
-export const createDirectories = async ({ repository, buildId }) => {
+export const createDirectories = async ({
+	repository,
+	buildId
+}: {
+	repository: string;
+	buildId: string;
+}): Promise<{ workdir: string; repodir: string }> => {
 	const repodir = `/tmp/build-sources/${repository}/`;
 	const workdir = `/tmp/build-sources/${repository}/${buildId}`;
 
@@ -148,20 +168,14 @@ export const createDirectories = async ({ repository, buildId }) => {
 	};
 };
 
-export function generateTimestamp() {
+export function generateTimestamp(): string {
 	return `${dayjs().format('HH:mm:ss.SSS')} `;
 }
 
-export function getDomain(domain) {
+export function getDomain(domain: string): string {
 	return domain?.replace('https://', '').replace('http://', '');
 }
 
-export function dashify(str: string, options?: any): string {
-	if (typeof str !== 'string') return str;
-	return str
-		.trim()
-		.replace(/\W/g, (m) => (/[À-ž]/.test(m) ? m : '-'))
-		.replace(/^-+|-+$/g, '')
-		.replace(/-{2,}/g, (m) => (options && options.condense ? '-' : m))
-		.toLowerCase();
+export function getOsArch() {
+	return os.arch();
 }
diff --git a/src/lib/components/ServiceLinks.svelte b/src/lib/components/ServiceLinks.svelte
index a3b4ce2cd..980505119 100644
--- a/src/lib/components/ServiceLinks.svelte
+++ b/src/lib/components/ServiceLinks.svelte
@@ -6,6 +6,7 @@
 	import N8n from './svg/services/N8n.svelte';
 	import NocoDb from './svg/services/NocoDB.svelte';
 	import PlausibleAnalytics from './svg/services/PlausibleAnalytics.svelte';
+	import Umami from './svg/services/Umami.svelte';
 	import UptimeKuma from './svg/services/UptimeKuma.svelte';
 	import VaultWarden from './svg/services/VaultWarden.svelte';
 	import VsCodeServer from './svg/services/VSCodeServer.svelte';
@@ -52,4 +53,8 @@
 	<a href="https://ghost.org" target="_blank">
 		<Ghost />
 	</a>
+{:else if service.type === 'umami'}
+	<a href="https://umami.is" target="_blank">
+		<Umami />
+	</a>
 {/if}
diff --git a/src/lib/components/common.ts b/src/lib/components/common.ts
index 2bd962c4c..760653cfa 100644
--- a/src/lib/components/common.ts
+++ b/src/lib/components/common.ts
@@ -19,7 +19,7 @@ export const staticDeployments = [
 	'astro',
 	'eleventy'
 ];
-export const notNodeDeployments = ['php', 'docker', 'rust', 'python'];
+export const notNodeDeployments = ['php', 'docker', 'rust', 'python', 'deno'];
 
 export function getDomain(domain) {
 	return domain?.replace('https://', '').replace('http://', '');
@@ -180,5 +180,16 @@ export const supportedServiceTypesAndVersions = [
 		ports: {
 			main: 7700
 		}
+	},
+	{
+		name: 'umami',
+		fancyName: 'Umami',
+		baseImage: 'ghcr.io/mikecao/umami',
+		images: ['postgres:12-alpine'],
+		versions: ['postgresql-latest'],
+		recommendedVersion: 'postgresql-latest',
+		ports: {
+			main: 3000
+		}
 	}
 ];
diff --git a/src/lib/components/svg/applications/Deno.svelte b/src/lib/components/svg/applications/Deno.svelte
new file mode 100644
index 000000000..4e1794226
--- /dev/null
+++ b/src/lib/components/svg/applications/Deno.svelte
@@ -0,0 +1,24 @@
+<svg
+	class="text-white-500 absolute top-0 left-0 -m-4 h-10 w-10"
+	xmlns="http://www.w3.org/2000/svg"
+	aria-hidden="true"
+	focusable="false"
+	data-prefix="fab"
+	data-icon="deno"
+	role="img"
+	width="256.000000pt"
+	height="256.000000pt"
+	viewBox="0 0 1024.000000 1024.000000"
+	preserveAspectRatio="xMidYMid meet"
+>
+	<metadata> Created by potrace 1.15, written by Peter Selinger 2001-2017 </metadata>
+	<g transform="translate(0.000000,1024.000000) scale(0.100000,-0.100000)" fill="#ffffff">
+		<path
+			d="M4720 9174 c-19 -2 -80 -9 -135 -14 -782 -82 -1552 -413 -2180 -939 -116 -96 -380 -360 -476 -476 -520 -621 -824 -1318 -936 -2143 -25 -183 -25 -801 0 -984 112 -825 416 -1522 936 -2143 96 -116 360 -380 476 -476 621 -520 1318 -824 2143 -936 183 -25 801 -25 984 0 825 112 1522 416 2143 936 116 96 380 360 476 476 520 621 824 1318 936 2143 25 183 25 801 0 984 -112 825 -416 1522 -936 2143 -96 116 -360 380 -476 476 -619 518 -1323 826 -2137 935 -88 12 -216 17 -453 19 -181 2 -346 1 -365 -1z m50 -432 c0 -117 8 -371 19 -612 6 -118 13 -287 16 -375 11 -312 44 -1131 49 -1204 l5 -73 -45 5 c-25 2 -48 8 -52 11 -3 4 -10 73 -14 154 -18 356 -77 1737 -83 1939 l-6 222 28 4 c15 2 40 5 56 6 l27 1 0 -78z m957 24 c1 -1 4 -303 7 -671 4 -369 9 -700 12 -736 3 -37 2 -69 -3 -71 -4 -3 -29 -3 -54 0 l-46 4 -7 291 c-4 161 -9 339 -11 397 -8 177 -15 778 -9 793 4 11 15 12 57 5 29 -6 53 -11 54 -12z m-2313 -335 c6 -9 53 -560 111 -1281 19 -245 38 -469 41 -497 5 -51 4 -53 -28 -73 -18 -11 -36 -20 -40 -20 -3 0 -9 26 -12 58 -14 130 -68 758 -106 1212 -22 267 -42 506 -45 532 -5 44 -4 48 22 62 32 17 50 20 57 7z m2753 -201 c28 -10 31 -15 37 -72 10 -100 7 -578 -4 -578 -29 0 -89 34 -94 53 -3 12 -6 154 -6 315 0 325 -4 306 67 282z m-1847 -47 c0 -27 7 -176 15 -333 8 -157 17 -356 21 -442 7 -174 9 -168 -58 -172 -33 -1 -33 -1 -35 49 -2 28 -7 115 -13 195 -5 80 -17 253 -25 385 -8 132 -18 263 -21 291 -6 50 -5 52 22 62 16 6 44 11 62 11 32 1 32 1 32 -46z m2774 -137 l34 -14 7 -134 c3 -73 5 -231 3 -350 l-3 -218 -42 21 -42 20 -3 332 c-2 183 -1 338 1 345 4 15 4 15 45 -2z m-1826 -131 c6 -6 20 -491 21 -737 l1 -148 -47 7 c-27 3 -49 6 -50 7 -3 2 -33 743 -33 815 l0 74 51 -6 c29 -4 54 -9 57 -12z m2303 -71 c12 -14 14 -233 17 -1441 3 -1387 3 -1423 -15 -1423 -11 0 -26 6 -35 13 -15 11 -17 132 -22 1317 -4 718 -9 1370 -12 1449 l-6 144 29 -21 c17 -12 36 -29 44 -38z m-897 -205 c5 -4 10 -61 11 -126 5 -221 6 -1576 1 -1580 -2 -2 -20 3 -40 11 l-36 15 0 851 0 850 28 -6 c15 -4 31 -10 36 -15z m-2760 -56 c3 -27 8 -88 11 -138 3 -49 10 -161 16 -248 12 -176 10 -187 -47 -187 -30 0 -34 3 -38 33 -10 59 -45 551 -40 559 5 7 57 25 81 27 6 1 14 -20 17 -46z m-1654 -255 c11 -106 33 -328 49 -493 17 -165 31 -305 31 -311 0 -12 -77 -50 -85 -42 -5 5 -105 890 -105 930 0 24 77 125 87 114 3 -2 13 -91 23 -198z m3921 -105 l29 -17 1 -216 c1 -118 3 -250 3 -293 2 -90 -9 -105 -63 -86 l-31 11 0 86 c0 48 -3 187 -7 310 l-6 222 23 0 c12 0 35 -8 51 -17z m-3482 -388 c18 -192 47 -516 66 -720 l34 -370 -39 -39 -38 -39 -7 79 c-4 44 -24 248 -45 454 -21 206 -51 505 -66 664 l-28 288 39 36 c35 33 39 34 46 16 4 -10 21 -176 38 -369z m-749 -121 c22 -197 80 -721 130 -1164 50 -443 97 -870 106 -950 8 -80 22 -201 30 -270 14 -117 14 -125 -2 -137 -24 -18 -34 -16 -34 5 0 9 -9 85 -20 167 -18 137 -48 369 -115 890 -14 105 -41 314 -60 465 -20 151 -49 376 -65 500 -16 124 -43 336 -60 473 -18 136 -29 257 -26 270 7 27 66 121 72 115 2 -3 22 -166 44 -364z m-306 -431 c15 -120 43 -339 62 -488 19 -148 43 -333 54 -410 l19 -140 -21 -18 c-12 -10 -24 -14 -28 -10 -4 4 -12 44 -18 88 -6 44 -43 301 -83 570 l-71 490 23 68 c12 37 25 67 28 67 4 0 19 -98 35 -217z m5490 131 c14 -14 16 -76 16 -535 l0 -519 -28 0 c-61 0 -60 -15 -64 553 l-3 517 32 0 c17 0 39 -7 47 -16z m-2189 -179 c226 -34 423 -97 618 -197 126 -65 186 -110 326 -244 208 -199 336 -373 456 -619 175 -358 243 -675 329 -1525 39 -381 90 -1072 101 -1355 3 -82 10 -217 16 -300 11 -176 24 -152 -131 -227 -215 -104 -422 -176 -695 -243 -334 -82 -550 -108 -880 -109 l-240 -1 2 115 c0 63 6 210 12 325 30 557 24 1260 -15 1650 -22 224 -65 496 -89 556 -5 13 18 24 117 58 181 63 338 142 362 181 43 74 -34 180 -132 180 -17 0 -68 -18 -115 -39 -224 -103 -673 -224 -932 -251 -179 -19 -457 -8 -650 27 -105 19 -293 90 -450 171 -181 94 -292 219 -325 367 -18 80 -13 240 10 330 25 99 95 243 159 327 285 375 873 700 1476 814 192 36 464 40 670 9z m3085 -31 c36 -15 40 -19 40 -53 2 -273 -4 -897 -9 -923 -1 -9 -53 -10 -75 -2 -14 5 -16 59 -16 500 0 316 4 494 10 494 5 0 28 -7 50 -16z m437 -549 l36 -15 -7 -828 c-8 -1055 -9 -1086 -47 -1177 -62 -149 -59 -179 -53 475 2 327 7 658 9 735 2 77 4 294 5 483 0 228 3 342 10 342 6 0 27 -7 47 -15z m-6014 -249 c6 -81 4 -89 -25 -153 l-32 -68 -12 100 c-19 160 -19 167 19 191 17 12 35 20 38 18 3 -2 9 -42 12 -88z m-618 -603 c9 -82 79 -626 115 -893 54 -413 58 -472 34 -447 -3 3 -26 142 -50 309 -156 1078 -155 1071 -142 1079 27 18 36 8 43 -48z m720 -458 c6 -25 35 -296 35 -329 0 -28 -36 -54 -52 -38 -5 5 -18 90 -28 188 -11 99 -22 202 -25 229 l-6 50 35 -40 c20 -22 38 -49 41 -60z m807 -377 c11 -10 18 -50 27 -158 15 -195 17 -180 -24 -180 -42 0 -41 -3 -55 173 -14 179 -14 177 13 177 13 0 30 -6 39 -12z m792 -15 c2 -10 7 -70 11 -133 3 -63 12 -205 20 -315 28 -404 29 -455 12 -455 -19 0 -21 15 -43 300 -8 118 -23 304 -33 413 -9 109 -15 200 -12 202 11 12 40 3 45 -12z m-1880 -192 c6 -9 44 -329 91 -766 14 -132 28 -259 31 -283 l5 -43 -25 16 c-19 13 -26 26 -26 49 0 63 -43 478 -76 732 -19 144 -34 271 -34 283 0 21 24 29 34 12z m5771 -418 l-7 -418 -25 -37 c-57 -84 -54 -100 -51 368 l2 429 37 38 c20 20 40 37 44 37 3 0 3 -188 0 -417z m-925 -663 c5 -581 4 -626 -12 -644 -10 -11 -19 -18 -22 -15 -7 8 -17 1275 -9 1282 4 4 14 6 23 5 13 -3 16 -74 20 -628z m-3266 398 c7 -62 32 -359 42 -499 6 -94 6 -97 -16 -104 -12 -4 -26 -3 -30 2 -7 7 -29 229 -56 571 l-7 82 31 0 c29 0 31 -2 36 -52z m-786 -350 c7 -7 12 -32 12 -57 0 -26 12 -161 25 -301 38 -383 41 -435 24 -425 -26 15 -49 38 -44 44 2 4 -2 54 -10 111 -7 58 -16 152 -20 210 -4 58 -13 164 -21 235 -19 175 -18 195 4 195 10 0 23 -5 30 -12z m473 -673 c3 -22 9 -104 13 -182 7 -150 4 -161 -37 -130 -12 9 -20 47 -32 161 -21 206 -22 198 17 194 29 -3 33 -7 39 -43z"
+		/>
+		<path
+			d="M3184 5756 c-104 -45 -112 -186 -14 -236 71 -36 143 -19 180 43 70 114 -44 246 -166 193z"
+		/>
+		<path d="M3862 5660 c-96 -59 -96 -201 0 -260 95 -57 218 18 218 132 0 110 -126 184 -218 128z" />
+	</g>
+</svg>
diff --git a/src/lib/components/svg/services/Umami.svelte b/src/lib/components/svg/services/Umami.svelte
new file mode 100644
index 000000000..ac0df85af
--- /dev/null
+++ b/src/lib/components/svg/services/Umami.svelte
@@ -0,0 +1,85 @@
+<script lang="ts">
+	export let isAbsolute = false;
+</script>
+
+<svg
+	version="1.0"
+	xmlns="http://www.w3.org/2000/svg"
+	width="856.000000pt"
+	height="856.000000pt"
+	viewBox="0 0 856.000000 856.000000"
+	preserveAspectRatio="xMidYMid meet"
+	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
+>
+	<metadata> Created by potrace 1.11, written by Peter Selinger 2001-2013 </metadata>
+	<g
+		transform="translate(0.000000,856.000000) scale(0.100000,-0.100000)"
+		fill="currentColor"
+		stroke="none"
+	>
+		<path
+			d="M4027 8163 c-2 -2 -28 -5 -58 -7 -50 -4 -94 -9 -179 -22 -19 -2 -48
+-6 -65 -9 -47 -6 -236 -44 -280 -55 -22 -6 -49 -12 -60 -15 -34 -6 -58 -13
+-130 -36 -38 -13 -72 -23 -75 -24 -29 -6 -194 -66 -264 -96 -49 -22 -95 -39
+-102 -39 -7 0 -19 -7 -28 -15 -8 -9 -18 -15 -21 -14 -7 1 -197 -92 -205 -101
+-3 -3 -21 -13 -40 -24 -79 -42 -123 -69 -226 -137 -94 -62 -246 -173 -280
+-204 -6 -5 -29 -25 -52 -43 -136 -111 -329 -305 -457 -462 -21 -25 -41 -47
+-44 -50 -4 -3 -22 -26 -39 -52 -18 -25 -38 -52 -45 -60 -34 -35 -207 -308
+-259 -408 -13 -25 -25 -47 -28 -50 -11 -11 -121 -250 -159 -346 -42 -105 -114
+-321 -126 -374 l-7 -30 -263 0 c-245 0 -268 -2 -321 -21 -94 -35 -171 -122
+-191 -216 -9 -39 -8 -852 0 -938 9 -87 16 -150 23 -195 3 -19 6 -48 8 -65 3
+-29 14 -97 22 -140 3 -11 7 -36 10 -55 3 -19 9 -51 14 -70 5 -19 11 -46 14
+-60 29 -138 104 -401 145 -505 5 -11 23 -58 42 -105 18 -47 42 -105 52 -130
+11 -25 21 -49 22 -55 3 -10 109 -224 164 -330 18 -33 50 -89 71 -124 22 -34
+40 -64 40 -66 0 -8 104 -161 114 -167 6 -4 7 -8 3 -8 -4 0 4 -12 18 -27 14
+-15 25 -32 25 -36 0 -5 6 -14 13 -21 6 -7 21 -25 32 -41 11 -15 34 -44 50 -64
+17 -21 41 -52 55 -70 13 -18 33 -43 45 -56 11 -13 42 -49 70 -81 100 -118 359
+-369 483 -469 34 -27 62 -53 62 -57 0 -5 6 -8 13 -8 7 0 19 -9 27 -20 8 -11
+19 -20 26 -20 6 0 19 -9 29 -20 10 -11 22 -20 27 -20 5 0 23 -13 41 -30 18
+-16 37 -30 44 -30 6 0 13 -4 15 -8 3 -8 186 -132 194 -132 2 0 27 -15 56 -34
+132 -83 377 -207 558 -280 36 -15 74 -31 85 -36 62 -26 220 -81 320 -109 79
+-23 191 -53 214 -57 14 -3 28 -7 31 -9 4 -2 20 -7 36 -9 16 -3 40 -8 54 -11
+14 -3 36 -8 50 -11 14 -2 36 -7 50 -10 13 -3 40 -8 60 -10 19 -2 46 -7 60 -10
+54 -10 171 -25 320 -40 90 -9 613 -12 636 -4 11 5 28 4 37 -1 9 -6 17 -6 17
+-1 0 4 10 8 23 9 29 0 154 12 192 18 17 3 46 7 65 9 70 10 131 20 183 32 16 3
+38 7 50 9 45 7 165 36 252 60 50 14 100 28 112 30 12 3 34 10 48 15 14 5 25 7
+25 4 0 -4 6 -2 13 3 6 6 30 16 52 22 22 7 47 15 55 18 8 4 17 7 20 7 10 2 179
+68 240 94 96 40 342 159 395 191 17 10 53 30 80 46 28 15 81 47 118 71 37 24
+72 44 76 44 5 0 11 3 13 8 2 4 30 25 63 47 33 22 62 42 65 45 3 3 50 38 105
+79 55 40 105 79 110 85 6 6 24 22 40 34 85 65 465 430 465 447 0 3 8 13 18 23
+9 10 35 40 57 66 22 27 47 56 55 65 8 9 42 52 74 96 32 44 71 96 85 115 140
+183 358 576 461 830 12 30 28 69 36 85 24 56 123 355 117 355 -3 0 -1 6 5 13
+6 6 14 30 18 52 10 48 9 46 17 65 5 13 37 155 52 230 9 42 35 195 40 231 34
+235 40 357 40 804 l0 420 -24 44 c-46 87 -143 157 -231 166 -19 2 -144 4 -276
+4 l-242 1 -36 118 c-21 64 -46 139 -56 166 -11 27 -20 52 -20 57 0 5 -11 33
+-25 63 -14 30 -25 58 -25 61 0 18 -152 329 -162 333 -5 2 -8 10 -8 18 0 8 -4
+14 -10 14 -5 0 -9 3 -8 8 3 9 -40 82 -128 217 -63 97 -98 145 -187 259 -133
+171 -380 420 -559 564 -71 56 -132 102 -138 102 -5 0 -10 3 -10 8 0 4 -25 23
+-55 42 -30 19 -55 38 -55 43 0 4 -6 7 -13 7 -7 0 -22 8 -33 18 -11 9 -37 26
+-59 37 -21 11 -44 25 -50 30 -41 37 -413 220 -540 266 -27 9 -61 22 -75 27
+-14 5 -28 10 -32 11 -4 1 -28 10 -53 21 -25 11 -46 19 -48 18 -2 -1 -109 29
+-137 40 -13 4 -32 9 -65 16 -5 1 -16 5 -22 9 -7 5 -13 6 -13 3 0 -2 -15 0 -32
+5 -18 5 -44 11 -58 14 -14 3 -36 7 -50 10 -14 3 -50 9 -80 15 -30 6 -64 12
+-75 14 -11 2 -45 6 -75 10 -30 4 -71 9 -90 12 -19 3 -53 6 -75 7 -22 1 -44 5
+-50 8 -11 7 -542 9 -548 2z m57 -404 c7 10 436 8 511 -3 22 -3 60 -8 85 -11
+25 -2 56 -6 70 -9 14 -2 43 -7 65 -10 38 -5 58 -9 115 -21 14 -3 34 -7 45 -9
+11 -2 58 -14 105 -26 47 -12 92 -23 100 -25 35 -7 279 -94 308 -109 17 -9 34
+-16 37 -16 3 1 20 -6 38 -14 17 -8 68 -31 112 -51 44 -20 82 -35 84 -35 2 1 7
+-3 10 -8 3 -5 43 -28 88 -51 45 -23 87 -48 93 -56 7 -8 17 -15 22 -15 12 0
+192 -121 196 -132 2 -4 8 -8 13 -8 10 0 119 -86 220 -172 102 -87 256 -244
+349 -357 25 -30 53 -63 63 -73 9 -10 17 -22 17 -28 0 -5 3 -10 8 -10 4 0 25
+-27 46 -60 22 -33 43 -60 48 -60 4 0 8 -5 8 -11 0 -6 11 -25 25 -43 14 -18 25
+-38 25 -44 0 -7 4 -12 8 -12 5 0 16 -15 25 -32 9 -18 30 -55 47 -83 46 -77
+161 -305 154 -305 -4 0 -2 -6 4 -12 6 -7 23 -47 40 -88 16 -41 33 -84 37 -95
+5 -11 9 -22 10 -25 0 -3 11 -36 24 -73 13 -38 21 -70 19 -73 -3 -2 -1386 -3
+-3075 -2 l-3071 3 38 110 c47 137 117 301 182 425 62 118 167 295 191 320 9
+11 17 22 17 25 0 7 39 63 58 83 6 7 26 35 44 60 18 26 37 52 43 57 6 6 34 37
+61 70 48 59 271 286 329 335 17 14 53 43 80 65 28 22 52 42 55 45 3 3 21 17
+40 30 19 14 40 28 45 32 40 32 105 78 109 78 3 0 28 16 55 35 26 19 53 35 58
+35 5 0 18 8 29 18 17 15 53 35 216 119 118 60 412 176 422 166 3 -4 6 -2 6 4
+0 6 12 13 28 16 15 3 52 12 82 21 30 9 63 19 73 21 10 2 27 7 37 10 10 3 29 8
+42 10 13 3 48 10 78 16 30 7 61 12 68 12 6 0 12 4 12 9 0 5 5 6 10 3 6 -4 34
+-2 63 4 51 11 71 13 197 26 36 4 67 9 69 11 2 2 10 -1 17 -7 8 -6 14 -7 18 0z"
+		/>
+	</g>
+</svg>
diff --git a/src/lib/components/templates.ts b/src/lib/components/templates.ts
index b82b12f51..2336afb7d 100644
--- a/src/lib/components/templates.ts
+++ b/src/lib/components/templates.ts
@@ -153,6 +153,16 @@ export function findBuildPack(pack, packageManager = 'npm') {
 			port: 8000
 		};
 	}
+	if (pack === 'deno') {
+		return {
+			...metaData,
+			installCommand: null,
+			buildCommand: null,
+			startCommand: null,
+			publishDirectory: null,
+			port: 8000
+		};
+	}
 	return {
 		name: 'node',
 		fancyName: 'Node.js',
@@ -262,6 +272,12 @@ export const buildPacks = [
 		fancyName: 'Python',
 		hoverColor: 'hover:bg-green-700',
 		color: 'bg-green-700'
+	},
+	{
+		name: 'deno',
+		fancyName: 'Deno',
+		hoverColor: 'hover:bg-green-700',
+		color: 'bg-green-700'
 	}
 ];
 export const scanningTemplates = {
diff --git a/src/lib/crypto.ts b/src/lib/crypto.ts
index 861a25510..dfb38991f 100644
--- a/src/lib/crypto.ts
+++ b/src/lib/crypto.ts
@@ -1,13 +1,13 @@
 import crypto from 'crypto';
 const algorithm = 'aes-256-ctr';
 
-export const base64Encode = (text: string) => {
+export const base64Encode = (text: string): string => {
 	return Buffer.from(text).toString('base64');
 };
-export const base64Decode = (text: string) => {
+export const base64Decode = (text: string): string => {
 	return Buffer.from(text, 'base64').toString('ascii');
 };
-export const encrypt = (text: string) => {
+export const encrypt = (text: string): string => {
 	if (text) {
 		const iv = crypto.randomBytes(16);
 		const cipher = crypto.createCipheriv(algorithm, process.env['COOLIFY_SECRET_KEY'], iv);
@@ -19,7 +19,7 @@ export const encrypt = (text: string) => {
 	}
 };
 
-export const decrypt = (hashString: string) => {
+export const decrypt = (hashString: string): string => {
 	if (hashString) {
 		const hash: Hash = JSON.parse(hashString);
 		const decipher = crypto.createDecipheriv(
diff --git a/src/lib/database/applications.ts b/src/lib/database/applications.ts
index 7177d0136..de8a7e75e 100644
--- a/src/lib/database/applications.ts
+++ b/src/lib/database/applications.ts
@@ -1,10 +1,19 @@
 import { decrypt, encrypt } from '$lib/crypto';
 import { asyncExecShell, getEngine } from '$lib/common';
 
-import { getDomain, removeDestinationDocker } from '$lib/common';
+import { removeDestinationDocker } from '$lib/common';
 import { prisma } from './common';
 
-export async function listApplications(teamId) {
+import type {
+	DestinationDocker,
+	GitSource,
+	Secret,
+	ApplicationSettings,
+	Application,
+	ApplicationPersistentStorage
+} from '@prisma/client';
+
+export async function listApplications(teamId: string): Promise<Application[]> {
 	if (teamId === '0') {
 		return await prisma.application.findMany({ include: { teams: true } });
 	}
@@ -14,7 +23,13 @@ export async function listApplications(teamId) {
 	});
 }
 
-export async function newApplication({ name, teamId }) {
+export async function newApplication({
+	name,
+	teamId
+}: {
+	name: string;
+	teamId: string;
+}): Promise<Application> {
 	return await prisma.application.create({
 		data: {
 			name,
@@ -24,34 +39,17 @@ export async function newApplication({ name, teamId }) {
 	});
 }
 
-export async function importApplication({
-	name,
-	teamId,
-	fqdn,
-	port,
-	buildCommand,
-	startCommand,
-	installCommand
-}) {
-	return await prisma.application.create({
-		data: {
-			name,
-			fqdn,
-			port,
-			buildCommand,
-			startCommand,
-			installCommand,
-			teams: { connect: { id: teamId } }
-		}
-	});
-}
-
-export async function removeApplication({ id, teamId }) {
-	const { fqdn, destinationDockerId, destinationDocker } = await prisma.application.findUnique({
+export async function removeApplication({
+	id,
+	teamId
+}: {
+	id: string;
+	teamId: string;
+}): Promise<void> {
+	const { destinationDockerId, destinationDocker } = await prisma.application.findUnique({
 		where: { id },
 		include: { destinationDocker: true }
 	});
-	const domain = getDomain(fqdn);
 	if (destinationDockerId) {
 		const host = getEngine(destinationDocker.engine);
 		const { stdout: containers } = await asyncExecShell(
@@ -62,7 +60,6 @@ export async function removeApplication({ id, teamId }) {
 			for (const container of containersArray) {
 				const containerObj = JSON.parse(container);
 				const id = containerObj.ID;
-				const preview = containerObj.Image.split('-')[1];
 				await removeDestinationDocker({ id, engine: destinationDocker.engine });
 			}
 		}
@@ -80,9 +77,23 @@ export async function removeApplication({ id, teamId }) {
 	}
 }
 
-export async function getApplicationWebhook({ projectId, branch }) {
+export async function getApplicationWebhook({
+	projectId,
+	branch
+}: {
+	projectId: number;
+	branch: string;
+}): Promise<
+	Application & {
+		destinationDocker: DestinationDocker;
+		settings: ApplicationSettings;
+		gitSource: GitSource;
+		secrets: Secret[];
+		persistentStorage: ApplicationPersistentStorage[];
+	}
+> {
 	try {
-		let application = await prisma.application.findFirst({
+		const application = await prisma.application.findFirst({
 			where: { projectId, branch, settings: { autodeploy: true } },
 			include: {
 				destinationDocker: true,
@@ -131,16 +142,17 @@ export async function getApplicationWebhook({ projectId, branch }) {
 		throw { status: 404, body: { message: e.message } };
 	}
 }
-export async function getApplicationById({ id }) {
-	const body = await prisma.application.findFirst({
-		where: { id },
-		include: { destinationDocker: true }
-	});
 
-	return { ...body };
-}
-export async function getApplication({ id, teamId }) {
-	let body = {};
+export async function getApplication({ id, teamId }: { id: string; teamId: string }): Promise<
+	Application & {
+		destinationDocker: DestinationDocker;
+		settings: ApplicationSettings;
+		gitSource: GitSource;
+		secrets: Secret[];
+		persistentStorage: ApplicationPersistentStorage[];
+	}
+> {
+	let body;
 	if (teamId === '0') {
 		body = await prisma.application.findFirst({
 			where: { id },
@@ -194,7 +206,14 @@ export async function configureGitRepository({
 	projectId,
 	webhookToken,
 	autodeploy
-}) {
+}: {
+	id: string;
+	repository: string;
+	branch: string;
+	projectId: number;
+	webhookToken: string;
+	autodeploy: boolean;
+}): Promise<void> {
 	if (webhookToken) {
 		const encryptedWebhookToken = encrypt(webhookToken);
 		await prisma.application.update({
@@ -224,7 +243,10 @@ export async function configureGitRepository({
 	}
 }
 
-export async function configureBuildPack({ id, buildPack }) {
+export async function configureBuildPack({
+	id,
+	buildPack
+}: Pick<Application, 'id' | 'buildPack'>): Promise<Application> {
 	return await prisma.application.update({ where: { id }, data: { buildPack } });
 }
 
@@ -242,8 +264,29 @@ export async function configureApplication({
 	publishDirectory,
 	pythonWSGI,
 	pythonModule,
-	pythonVariable
-}) {
+	pythonVariable,
+	dockerFileLocation,
+	denoMainFile,
+	denoOptions
+}: {
+	id: string;
+	buildPack: string;
+	name: string;
+	fqdn: string;
+	port: number;
+	exposePort: number;
+	installCommand: string;
+	buildCommand: string;
+	startCommand: string;
+	baseDirectory: string;
+	publishDirectory: string;
+	pythonWSGI: string;
+	pythonModule: string;
+	pythonVariable: string;
+	dockerFileLocation: string;
+	denoMainFile: string;
+	denoOptions: string;
+}): Promise<Application> {
 	return await prisma.application.update({
 		where: { id },
 		data: {
@@ -259,16 +302,32 @@ export async function configureApplication({
 			publishDirectory,
 			pythonWSGI,
 			pythonModule,
-			pythonVariable
+			pythonVariable,
+			dockerFileLocation,
+			denoMainFile,
+			denoOptions
 		}
 	});
 }
 
-export async function checkDoubleBranch(branch, projectId) {
+export async function checkDoubleBranch(branch: string, projectId: number): Promise<boolean> {
 	const applications = await prisma.application.findMany({ where: { branch, projectId } });
 	return applications.length > 1;
 }
-export async function setApplicationSettings({ id, debug, previews, dualCerts, autodeploy }) {
+
+export async function setApplicationSettings({
+	id,
+	debug,
+	previews,
+	dualCerts,
+	autodeploy
+}: {
+	id: string;
+	debug: boolean;
+	previews: boolean;
+	dualCerts: boolean;
+	autodeploy: boolean;
+}): Promise<Application & { destinationDocker: DestinationDocker }> {
 	return await prisma.application.update({
 		where: { id },
 		data: { settings: { update: { debug, previews, dualCerts, autodeploy } } },
@@ -276,29 +335,6 @@ export async function setApplicationSettings({ id, debug, previews, dualCerts, a
 	});
 }
 
-export async function createBuild({
-	id,
-	applicationId,
-	destinationDockerId,
-	gitSourceId,
-	githubAppId,
-	gitlabAppId,
-	type
-}) {
-	return await prisma.build.create({
-		data: {
-			id,
-			applicationId,
-			destinationDockerId,
-			gitSourceId,
-			githubAppId,
-			gitlabAppId,
-			status: 'running',
-			type
-		}
-	});
-}
-
-export async function getPersistentStorage(id) {
+export async function getPersistentStorage(id: string): Promise<ApplicationPersistentStorage[]> {
 	return await prisma.applicationPersistentStorage.findMany({ where: { applicationId: id } });
 }
diff --git a/src/lib/database/checks.ts b/src/lib/database/checks.ts
index 534d81966..bbe773ae5 100644
--- a/src/lib/database/checks.ts
+++ b/src/lib/database/checks.ts
@@ -1,7 +1,16 @@
 import { getDomain } from '$lib/common';
 import { prisma } from './common';
+import type { Application, ServiceSecret, DestinationDocker, Secret } from '@prisma/client';
 
-export async function isBranchAlreadyUsed({ repository, branch, id }) {
+export async function isBranchAlreadyUsed({
+	repository,
+	branch,
+	id
+}: {
+	id: string;
+	repository: string;
+	branch: string;
+}): Promise<Application> {
 	const application = await prisma.application.findUnique({
 		where: { id },
 		include: { gitSource: true }
@@ -11,18 +20,42 @@ export async function isBranchAlreadyUsed({ repository, branch, id }) {
 	});
 }
 
-export async function isDockerNetworkExists({ network }) {
+export async function isDockerNetworkExists({
+	network
+}: {
+	network: string;
+}): Promise<DestinationDocker> {
 	return await prisma.destinationDocker.findFirst({ where: { network } });
 }
 
-export async function isServiceSecretExists({ id, name }) {
+export async function isServiceSecretExists({
+	id,
+	name
+}: {
+	id: string;
+	name: string;
+}): Promise<ServiceSecret> {
 	return await prisma.serviceSecret.findFirst({ where: { name, serviceId: id } });
 }
-export async function isSecretExists({ id, name, isPRMRSecret }) {
+export async function isSecretExists({
+	id,
+	name,
+	isPRMRSecret
+}: {
+	id: string;
+	name: string;
+	isPRMRSecret: boolean;
+}): Promise<Secret> {
 	return await prisma.secret.findFirst({ where: { name, applicationId: id, isPRMRSecret } });
 }
 
-export async function isDomainConfigured({ id, fqdn }) {
+export async function isDomainConfigured({
+	id,
+	fqdn
+}: {
+	id: string;
+	fqdn: string;
+}): Promise<boolean> {
 	const domain = getDomain(fqdn);
 	const nakedDomain = domain.replace('www.', '');
 	const foundApp = await prisma.application.findFirst({
@@ -55,6 +88,5 @@ export async function isDomainConfigured({ id, fqdn }) {
 		},
 		select: { fqdn: true }
 	});
-	if (foundApp || foundService || coolifyFqdn) return true;
-	return false;
+	return !!(foundApp || foundService || coolifyFqdn);
 }
diff --git a/src/lib/database/common.ts b/src/lib/database/common.ts
index 9d588fcc4..968208f55 100644
--- a/src/lib/database/common.ts
+++ b/src/lib/database/common.ts
@@ -6,11 +6,12 @@ import {
 } from '$lib/components/common';
 import * as Prisma from '@prisma/client';
 import { default as ProdPrisma } from '@prisma/client';
-import type { PrismaClientOptions } from '@prisma/client/runtime';
+import type { Database, DatabaseSettings } from '@prisma/client';
 import generator from 'generate-password';
 import forge from 'node-forge';
+import getPort, { portNumbers } from 'get-port';
 
-export function generatePassword(length = 24) {
+export function generatePassword(length = 24): string {
 	return generator.generate({
 		length,
 		numbers: true,
@@ -30,8 +31,14 @@ export const prisma = new PrismaClient({
 	rejectOnNotFound: false
 });
 
-export function ErrorHandler(e) {
-	if (e! instanceof Error) {
+export function ErrorHandler(e: {
+	stdout?;
+	message?: string;
+	status?: number;
+	name?: string;
+	error?: string;
+}): { status: number; body: { message: string; error: string } } {
+	if (e && e instanceof Error) {
 		e = new Error(e.toString());
 	}
 	let truncatedError = e;
@@ -39,8 +46,7 @@ export function ErrorHandler(e) {
 		truncatedError = e.stdout;
 	}
 	if (e.message?.includes('docker run')) {
-		let truncatedArray = [];
-		truncatedArray = truncatedError.message.split('-').filter((line) => {
+		const truncatedArray: string[] = truncatedError.message.split('-').filter((line) => {
 			if (!line.startsWith('e ')) {
 				return line;
 			}
@@ -68,11 +74,11 @@ export function ErrorHandler(e) {
 			payload.body.message = 'Already exists. Choose another name.';
 		}
 	}
-	// console.error(e)
 	return payload;
 }
+
 export async function generateSshKeyPair(): Promise<{ publicKey: string; privateKey: string }> {
-	return await new Promise(async (resolve, reject) => {
+	return await new Promise((resolve, reject) => {
 		forge.pki.rsa.generateKeyPair({ bits: 4096, workers: -1 }, function (err, keys) {
 			if (keys) {
 				resolve({
@@ -86,35 +92,94 @@ export async function generateSshKeyPair(): Promise<{ publicKey: string; private
 	});
 }
 
-export function getVersions(type) {
+export function getVersions(type: string): string[] {
 	const found = supportedDatabaseTypesAndVersions.find((t) => t.name === type);
 	if (found) {
 		return found.versions;
 	}
 	return [];
 }
-export function getDatabaseImage(type) {
+
+export function getDatabaseImage(type: string): string {
 	const found = supportedDatabaseTypesAndVersions.find((t) => t.name === type);
 	if (found) {
 		return found.baseImage;
 	}
 	return '';
 }
-export function getServiceImage(type) {
+
+export function getServiceImage(type: string): string {
 	const found = supportedServiceTypesAndVersions.find((t) => t.name === type);
 	if (found) {
 		return found.baseImage;
 	}
 	return '';
 }
-export function getServiceImages(type) {
+
+export function getServiceImages(type: string): string[] {
 	const found = supportedServiceTypesAndVersions.find((t) => t.name === type);
 	if (found) {
 		return found.images;
 	}
 	return [];
 }
-export function generateDatabaseConfiguration(database) {
+
+export function generateDatabaseConfiguration(database: Database & { settings: DatabaseSettings }):
+	| {
+			volume: string;
+			image: string;
+			ulimits: Record<string, unknown>;
+			privatePort: number;
+			environmentVariables: {
+				MYSQL_DATABASE: string;
+				MYSQL_PASSWORD: string;
+				MYSQL_ROOT_USER: string;
+				MYSQL_USER: string;
+				MYSQL_ROOT_PASSWORD: string;
+			};
+	  }
+	| {
+			volume: string;
+			image: string;
+			ulimits: Record<string, unknown>;
+			privatePort: number;
+			environmentVariables: {
+				MONGODB_ROOT_USER: string;
+				MONGODB_ROOT_PASSWORD: string;
+			};
+	  }
+	| {
+			volume: string;
+			image: string;
+			ulimits: Record<string, unknown>;
+			privatePort: number;
+			environmentVariables: {
+				POSTGRESQL_POSTGRES_PASSWORD: string;
+				POSTGRESQL_USERNAME: string;
+				POSTGRESQL_PASSWORD: string;
+				POSTGRESQL_DATABASE: string;
+			};
+	  }
+	| {
+			volume: string;
+			image: string;
+			ulimits: Record<string, unknown>;
+			privatePort: number;
+			environmentVariables: {
+				REDIS_AOF_ENABLED: string;
+				REDIS_PASSWORD: string;
+			};
+	  }
+	| {
+			volume: string;
+			image: string;
+			ulimits: Record<string, unknown>;
+			privatePort: number;
+			environmentVariables: {
+				COUCHDB_PASSWORD: string;
+				COUCHDB_USER: string;
+			};
+	  } {
 	const {
 		id,
 		dbUser,
@@ -129,7 +194,6 @@ export function generateDatabaseConfiguration(database) {
 	const baseImage = getDatabaseImage(type);
 	if (type === 'mysql') {
 		return {
-			// url: `mysql://${dbUser}:${dbUserPassword}@${id}:${isPublic ? port : 3306}/${defaultDatabase}`,
 			privatePort: 3306,
 			environmentVariables: {
 				MYSQL_USER: dbUser,
@@ -144,7 +208,6 @@ export function generateDatabaseConfiguration(database) {
 		};
 	} else if (type === 'mongodb') {
 		return {
-			// url: `mongodb://${dbUser}:${dbUserPassword}@${id}:${isPublic ? port : 27017}/${defaultDatabase}`,
 			privatePort: 27017,
 			environmentVariables: {
 				MONGODB_ROOT_USER: rootUser,
@@ -156,7 +219,6 @@ export function generateDatabaseConfiguration(database) {
 		};
 	} else if (type === 'postgresql') {
 		return {
-			// url: `psql://${dbUser}:${dbUserPassword}@${id}:${isPublic ? port : 5432}/${defaultDatabase}`,
 			privatePort: 5432,
 			environmentVariables: {
 				POSTGRESQL_POSTGRES_PASSWORD: rootUserPassword,
@@ -170,7 +232,6 @@ export function generateDatabaseConfiguration(database) {
 		};
 	} else if (type === 'redis') {
 		return {
-			// url: `redis://${dbUser}:${dbUserPassword}@${id}:${isPublic ? port : 6379}/${defaultDatabase}`,
 			privatePort: 6379,
 			environmentVariables: {
 				REDIS_PASSWORD: dbUserPassword,
@@ -182,7 +243,6 @@ export function generateDatabaseConfiguration(database) {
 		};
 	} else if (type === 'couchdb') {
 		return {
-			// url: `couchdb://${dbUser}:${dbUserPassword}@${id}:${isPublic ? port : 5984}/${defaultDatabase}`,
 			privatePort: 5984,
 			environmentVariables: {
 				COUCHDB_PASSWORD: dbUserPassword,
@@ -193,18 +253,30 @@ export function generateDatabaseConfiguration(database) {
 			ulimits: {}
 		};
 	}
-	// } else if (type === 'clickhouse') {
-	//     return {
-	//         url: `clickhouse://${dbUser}:${dbUserPassword}@${id}:${port}/${defaultDatabase}`,
-	//         privatePort: 9000,
-	//         image: `bitnami/clickhouse-server:${version}`,
-	//         volume: `${id}-${type}-data:/var/lib/clickhouse`,
-	//         ulimits: {
-	// 			nofile: {
-	// 				soft: 262144,
-	// 				hard: 262144
-	// 			}
-	// 		}
-	//     }
-	// }
+}
+
+export async function getFreePort() {
+	const data = await prisma.setting.findFirst();
+	const { minPort, maxPort } = data;
+
+	const dbUsed = await (
+		await prisma.database.findMany({
+			where: { publicPort: { not: null } },
+			select: { publicPort: true }
+		})
+	).map((a) => a.publicPort);
+	const wpFtpUsed = await (
+		await prisma.wordpress.findMany({
+			where: { ftpPublicPort: { not: null } },
+			select: { ftpPublicPort: true }
+		})
+	).map((a) => a.ftpPublicPort);
+	const wpUsed = await (
+		await prisma.wordpress.findMany({
+			where: { mysqlPublicPort: { not: null } },
+			select: { mysqlPublicPort: true }
+		})
+	).map((a) => a.mysqlPublicPort);
+	const usedPorts = [...dbUsed, ...wpFtpUsed, ...wpUsed];
+	return await getPort({ port: portNumbers(minPort, maxPort), exclude: usedPorts });
 }
diff --git a/src/lib/database/databases.ts b/src/lib/database/databases.ts
index 9132fc2b2..388047ac3 100644
--- a/src/lib/database/databases.ts
+++ b/src/lib/database/databases.ts
@@ -1,12 +1,11 @@
 import { decrypt, encrypt } from '$lib/crypto';
-import * as db from '$lib/database';
 import cuid from 'cuid';
 import { generatePassword } from '.';
-import { prisma, ErrorHandler } from './common';
-import getPort, { portNumbers } from 'get-port';
+import { prisma } from './common';
 import { asyncExecShell, getEngine, removeContainer } from '$lib/common';
+import type { Database, DatabaseSettings, DestinationDocker } from '@prisma/client';
 
-export async function listDatabases(teamId) {
+export async function listDatabases(teamId: string): Promise<Database[]> {
 	if (teamId === '0') {
 		return await prisma.database.findMany({ include: { teams: true } });
 	} else {
@@ -16,7 +15,14 @@ export async function listDatabases(teamId) {
 		});
 	}
 }
-export async function newDatabase({ name, teamId }) {
+
+export async function newDatabase({
+	name,
+	teamId
+}: {
+	name: string;
+	teamId: string;
+}): Promise<Database> {
 	const dbUser = cuid();
 	const dbUserPassword = encrypt(generatePassword());
 	const rootUser = cuid();
@@ -37,8 +43,14 @@ export async function newDatabase({ name, teamId }) {
 	});
 }
 
-export async function getDatabase({ id, teamId }) {
-	let body = {};
+export async function getDatabase({
+	id,
+	teamId
+}: {
+	id: string;
+	teamId: string;
+}): Promise<Database & { destinationDocker: DestinationDocker; settings: DatabaseSettings }> {
+	let body;
 	if (teamId === '0') {
 		body = await prisma.database.findFirst({
 			where: { id },
@@ -50,20 +62,25 @@ export async function getDatabase({ id, teamId }) {
 			include: { destinationDocker: true, settings: true }
 		});
 	}
-
 	if (body.dbUserPassword) body.dbUserPassword = decrypt(body.dbUserPassword);
 	if (body.rootUserPassword) body.rootUserPassword = decrypt(body.rootUserPassword);
 
-	return { ...body };
+	return body;
 }
 
-export async function removeDatabase({ id }) {
+export async function removeDatabase({ id }: { id: string }): Promise<void> {
 	await prisma.databaseSettings.deleteMany({ where: { databaseId: id } });
 	await prisma.database.delete({ where: { id } });
 	return;
 }
 
-export async function configureDatabaseType({ id, type }) {
+export async function configureDatabaseType({
+	id,
+	type
+}: {
+	id: string;
+	type: string;
+}): Promise<Database> {
 	return await prisma.database.update({
 		where: { id },
 		data: { type }
@@ -79,7 +96,7 @@ export async function setDatabase({
 	version?: string;
 	isPublic?: boolean;
 	appendOnly?: boolean;
-}) {
+}): Promise<Database> {
 	return await prisma.database.update({
 		where: { id },
 		data: {
@@ -97,7 +114,16 @@ export async function updateDatabase({
 	rootUser,
 	rootUserPassword,
 	version
-}) {
+}: {
+	id: string;
+	name: string;
+	defaultDatabase: string;
+	dbUser: string;
+	dbUserPassword: string;
+	rootUser: string;
+	rootUserPassword: string;
+	version: string;
+}): Promise<Database> {
 	const encryptedDbUserPassword = dbUserPassword && encrypt(dbUserPassword);
 	const encryptedRootUserPassword = rootUserPassword && encrypt(rootUserPassword);
 	return await prisma.database.update({
@@ -114,7 +140,9 @@ export async function updateDatabase({
 	});
 }
 
-export async function stopDatabase(database) {
+export async function stopDatabase(
+	database: Database & { destinationDocker: DestinationDocker }
+): Promise<boolean> {
 	let everStarted = false;
 	const {
 		id,
diff --git a/src/lib/database/destinations.ts b/src/lib/database/destinations.ts
index 7b2570d93..2f6cdb488 100644
--- a/src/lib/database/destinations.ts
+++ b/src/lib/database/destinations.ts
@@ -1,11 +1,22 @@
 import { asyncExecShell, getEngine } from '$lib/common';
-import { decrypt, encrypt } from '$lib/crypto';
 import { dockerInstance } from '$lib/docker';
 import { startCoolifyProxy } from '$lib/haproxy';
 import { getDatabaseImage } from '.';
 import { prisma } from './common';
+import type { DestinationDocker, Service, Application, Prisma } from '@prisma/client';
+import type { CreateDockerDestination } from '$lib/types/destinations';
 
-export async function listDestinations(teamId) {
+type DestinationConfigurationObject = {
+	id: string;
+	destinationId: string;
+};
+
+type FindDestinationFromTeam = {
+	id: string;
+	teamId: string;
+};
+
+export async function listDestinations(teamId: string): Promise<DestinationDocker[]> {
 	if (teamId === '0') {
 		return await prisma.destinationDocker.findMany({ include: { teams: true } });
 	}
@@ -15,19 +26,28 @@ export async function listDestinations(teamId) {
 	});
 }
 
-export async function configureDestinationForService({ id, destinationId }) {
+export async function configureDestinationForService({
+	id,
+	destinationId
+}: DestinationConfigurationObject): Promise<Service> {
 	return await prisma.service.update({
 		where: { id },
 		data: { destinationDocker: { connect: { id: destinationId } } }
 	});
 }
-export async function configureDestinationForApplication({ id, destinationId }) {
+export async function configureDestinationForApplication({
+	id,
+	destinationId
+}: DestinationConfigurationObject): Promise<Application> {
 	return await prisma.application.update({
 		where: { id },
 		data: { destinationDocker: { connect: { id: destinationId } } }
 	});
 }
-export async function configureDestinationForDatabase({ id, destinationId }) {
+export async function configureDestinationForDatabase({
+	id,
+	destinationId
+}: DestinationConfigurationObject): Promise<void> {
 	await prisma.database.update({
 		where: { id },
 		data: { destinationDocker: { connect: { id: destinationId } } }
@@ -48,7 +68,12 @@ export async function configureDestinationForDatabase({ id, destinationId }) {
 		}
 	}
 }
-export async function updateDestination({ id, name, engine, network }) {
+export async function updateDestination({
+	id,
+	name,
+	engine,
+	network
+}: Pick<DestinationDocker, 'id' | 'name' | 'engine' | 'network'>): Promise<DestinationDocker> {
 	return await prisma.destinationDocker.update({ where: { id }, data: { name, engine, network } });
 }
 
@@ -58,13 +83,8 @@ export async function newRemoteDestination({
 	engine,
 	network,
 	isCoolifyProxyUsed,
-	remoteEngine,
-	ipAddress,
-	user,
-	port,
-	sshPrivateKey
-}) {
-	const encryptedPrivateKey = encrypt(sshPrivateKey);
+	remoteEngine
+}: CreateDockerDestination): Promise<string> {
 	const destination = await prisma.destinationDocker.create({
 		data: {
 			name,
@@ -72,16 +92,18 @@ export async function newRemoteDestination({
 			engine,
 			network,
 			isCoolifyProxyUsed,
-			remoteEngine,
-			ipAddress,
-			user,
-			port,
-			sshPrivateKey: encryptedPrivateKey
+			remoteEngine
 		}
 	});
 	return destination.id;
 }
-export async function newLocalDestination({ name, teamId, engine, network, isCoolifyProxyUsed }) {
+export async function newLocalDestination({
+	name,
+	teamId,
+	engine,
+	network,
+	isCoolifyProxyUsed
+}: CreateDockerDestination): Promise<string> {
 	const host = getEngine(engine);
 	const docker = dockerInstance({ destinationDocker: { engine, network } });
 	const found = await docker.engine.listNetworks({ filters: { name: [`^${network}$`] } });
@@ -99,18 +121,14 @@ export async function newLocalDestination({ name, teamId, engine, network, isCoo
 			(destination) => destination.network !== network && destination.isCoolifyProxyUsed === true
 		);
 		if (proxyConfigured) {
-			if (proxyConfigured.isCoolifyProxyUsed) {
-				isCoolifyProxyUsed = true;
-			} else {
-				isCoolifyProxyUsed = false;
-			}
+			isCoolifyProxyUsed = !!proxyConfigured.isCoolifyProxyUsed;
 		}
 		await prisma.destinationDocker.updateMany({ where: { engine }, data: { isCoolifyProxyUsed } });
 	}
 	if (isCoolifyProxyUsed) await startCoolifyProxy(engine);
 	return destination.id;
 }
-export async function removeDestination({ id }) {
+export async function removeDestination({ id }: Pick<DestinationDocker, 'id'>): Promise<void> {
 	const destination = await prisma.destinationDocker.delete({ where: { id } });
 	if (destination.isCoolifyProxyUsed) {
 		const host = getEngine(destination.engine);
@@ -127,8 +145,11 @@ export async function removeDestination({ id }) {
 	}
 }
 
-export async function getDestination({ id, teamId }) {
-	let destination = {};
+export async function getDestination({
+	id,
+	teamId
+}: FindDestinationFromTeam): Promise<DestinationDocker & { sshPrivateKey?: string }> {
+	let destination;
 	if (teamId === '0') {
 		destination = await prisma.destinationDocker.findFirst({
 			where: { id }
@@ -141,13 +162,22 @@ export async function getDestination({ id, teamId }) {
 
 	return destination;
 }
-export async function getDestinationByApplicationId({ id, teamId }) {
+export async function getDestinationByApplicationId({
+	id,
+	teamId
+}: FindDestinationFromTeam): Promise<DestinationDocker> {
 	return await prisma.destinationDocker.findFirst({
 		where: { application: { some: { id } }, teams: { some: { id: teamId } } }
 	});
 }
 
-export async function setDestinationSettings({ engine, isCoolifyProxyUsed }) {
+export async function setDestinationSettings({
+	engine,
+	isCoolifyProxyUsed
+}: {
+	engine: string;
+	isCoolifyProxyUsed: boolean;
+}): Promise<Prisma.BatchPayload> {
 	return await prisma.destinationDocker.updateMany({
 		where: { engine },
 		data: { isCoolifyProxyUsed }
diff --git a/src/lib/database/gitSources.ts b/src/lib/database/gitSources.ts
index b8279c268..a0c0b94ed 100644
--- a/src/lib/database/gitSources.ts
+++ b/src/lib/database/gitSources.ts
@@ -1,7 +1,10 @@
 import { decrypt, encrypt } from '$lib/crypto';
 import { prisma } from './common';
+import type { GithubApp, GitlabApp, GitSource, Prisma, Application } from '@prisma/client';
 
-export async function listSources(teamId) {
+export async function listSources(
+	teamId: string | Prisma.StringFilter
+): Promise<(GitSource & { githubApp?: GithubApp; gitlabApp?: GitlabApp })[]> {
 	if (teamId === '0') {
 		return await prisma.gitSource.findMany({
 			include: { githubApp: true, gitlabApp: true, teams: true }
@@ -13,7 +16,13 @@ export async function listSources(teamId) {
 	});
 }
 
-export async function newSource({ teamId, name }) {
+export async function newSource({
+	name,
+	teamId
+}: {
+	name: string;
+	teamId: string;
+}): Promise<GitSource> {
 	return await prisma.gitSource.create({
 		data: {
 			name,
@@ -21,7 +30,7 @@ export async function newSource({ teamId, name }) {
 		}
 	});
 }
-export async function removeSource({ id }) {
+export async function removeSource({ id }: { id: string }): Promise<void> {
 	const source = await prisma.gitSource.delete({
 		where: { id },
 		include: { githubApp: true, gitlabApp: true }
@@ -30,8 +39,14 @@ export async function removeSource({ id }) {
 	if (source.gitlabAppId) await prisma.gitlabApp.delete({ where: { id: source.gitlabAppId } });
 }
 
-export async function getSource({ id, teamId }) {
-	let body = {};
+export async function getSource({
+	id,
+	teamId
+}: {
+	id: string;
+	teamId: string;
+}): Promise<GitSource & { githubApp: GithubApp; gitlabApp: GitlabApp }> {
+	let body;
 	if (teamId === '0') {
 		body = await prisma.gitSource.findFirst({
 			where: { id },
@@ -51,8 +66,11 @@ export async function getSource({ id, teamId }) {
 	if (body?.gitlabApp?.appSecret) body.gitlabApp.appSecret = decrypt(body.gitlabApp.appSecret);
 	return body;
 }
-export async function addGitHubSource({ id, teamId, type, name, htmlUrl, apiUrl }) {
-	await prisma.gitSource.update({ where: { id }, data: { type, name, htmlUrl, apiUrl } });
+export async function addGitHubSource({ id, teamId, type, name, htmlUrl, apiUrl, organization }) {
+	await prisma.gitSource.update({
+		where: { id },
+		data: { type, name, htmlUrl, apiUrl, organization }
+	});
 	return await prisma.githubApp.create({
 		data: {
 			teams: { connect: { id: teamId } },
@@ -72,7 +90,7 @@ export async function addGitLabSource({
 	appSecret,
 	groupName
 }) {
-	const encrptedAppSecret = encrypt(appSecret);
+	const encryptedAppSecret = encrypt(appSecret);
 	await prisma.gitSource.update({ where: { id }, data: { type, apiUrl, htmlUrl, name } });
 	return await prisma.gitlabApp.create({
 		data: {
@@ -80,19 +98,35 @@ export async function addGitLabSource({
 			appId,
 			oauthId,
 			groupName,
-			appSecret: encrptedAppSecret,
+			appSecret: encryptedAppSecret,
 			gitSource: { connect: { id } }
 		}
 	});
 }
 
-export async function configureGitsource({ id, gitSourceId }) {
+export async function configureGitsource({
+	id,
+	gitSourceId
+}: {
+	id: string;
+	gitSourceId: string;
+}): Promise<Application> {
 	return await prisma.application.update({
 		where: { id },
 		data: { gitSource: { connect: { id: gitSourceId } } }
 	});
 }
-export async function updateGitsource({ id, name, htmlUrl, apiUrl }) {
+export async function updateGitsource({
+	id,
+	name,
+	htmlUrl,
+	apiUrl
+}: {
+	id: string;
+	name: string;
+	htmlUrl: string;
+	apiUrl: string;
+}): Promise<GitSource> {
 	return await prisma.gitSource.update({
 		where: { id },
 		data: { name, htmlUrl, apiUrl }
diff --git a/src/lib/database/github.ts b/src/lib/database/github.ts
index 339b8e008..182ad4529 100644
--- a/src/lib/database/github.ts
+++ b/src/lib/database/github.ts
@@ -1,7 +1,15 @@
 import { decrypt, encrypt } from '$lib/crypto';
 import { prisma } from './common';
+import type { GithubApp } from '@prisma/client';
 
-export async function addInstallation({ gitSourceId, installation_id }) {
+// TODO: We should change installation_id to be camelCase
+export async function addInstallation({
+	gitSourceId,
+	installation_id
+}: {
+	gitSourceId: string;
+	installation_id: string;
+}): Promise<GithubApp> {
 	const source = await prisma.gitSource.findUnique({
 		where: { id: gitSourceId },
 		include: { githubApp: true }
@@ -12,8 +20,12 @@ export async function addInstallation({ gitSourceId, installation_id }) {
 	});
 }
 
-export async function getUniqueGithubApp({ githubAppId }) {
-	let body = await prisma.githubApp.findUnique({ where: { id: githubAppId } });
+export async function getUniqueGithubApp({
+	githubAppId
+}: {
+	githubAppId: string;
+}): Promise<GithubApp> {
+	const body = await prisma.githubApp.findUnique({ where: { id: githubAppId } });
 	if (body.privateKey) body.privateKey = decrypt(body.privateKey);
 	return body;
 }
@@ -26,7 +38,15 @@ export async function createGithubApp({
 	pem,
 	webhook_secret,
 	state
-}) {
+}: {
+	id: number;
+	client_id: string;
+	slug: string;
+	client_secret: string;
+	pem: string;
+	webhook_secret: string;
+	state: string;
+}): Promise<GithubApp> {
 	const encryptedClientSecret = encrypt(client_secret);
 	const encryptedWebhookSecret = encrypt(webhook_secret);
 	const encryptedPem = encrypt(pem);
diff --git a/src/lib/database/gitlab.ts b/src/lib/database/gitlab.ts
index eb9bdfb1b..8bb6a9c9b 100644
--- a/src/lib/database/gitlab.ts
+++ b/src/lib/database/gitlab.ts
@@ -1,7 +1,14 @@
 import { encrypt } from '$lib/crypto';
 import { generateSshKeyPair, prisma } from './common';
+import type { GitlabApp } from '@prisma/client';
 
-export async function updateDeployKey({ id, deployKeyId }) {
+export async function updateDeployKey({
+	id,
+	deployKeyId
+}: {
+	id: string;
+	deployKeyId: number;
+}): Promise<GitlabApp> {
 	const application = await prisma.application.findUnique({
 		where: { id },
 		include: { gitSource: { include: { gitlabApp: true } } }
@@ -11,14 +18,24 @@ export async function updateDeployKey({ id, deployKeyId }) {
 		data: { deployKeyId }
 	});
 }
-export async function getSshKey({ id }) {
+export async function getSshKey({
+	id
+}: {
+	id: string;
+}): Promise<{ status: number; body: { publicKey: string } }> {
 	const application = await prisma.application.findUnique({
 		where: { id },
 		include: { gitSource: { include: { gitlabApp: true } } }
 	});
 	return { status: 200, body: { publicKey: application.gitSource.gitlabApp.publicSshKey } };
 }
-export async function generateSshKey({ id }) {
+export async function generateSshKey({
+	id
+}: {
+	id: string;
+}): Promise<
+	{ status: number; body: { publicKey: string } } | { status: number; body?: undefined }
+> {
 	const application = await prisma.application.findUnique({
 		where: { id },
 		include: { gitSource: { include: { gitlabApp: true } } }
diff --git a/src/lib/database/logs.ts b/src/lib/database/logs.ts
index 9a71f51e4..74f50b50b 100644
--- a/src/lib/database/logs.ts
+++ b/src/lib/database/logs.ts
@@ -1,6 +1,13 @@
+import type { BuildLog } from '@prisma/client';
 import { prisma, ErrorHandler } from './common';
 
-export async function listLogs({ buildId, last = 0 }) {
+export async function listLogs({
+	buildId,
+	last = 0
+}: {
+	buildId: string;
+	last: number;
+}): Promise<BuildLog[] | { status: number; body: { message: string; error: string } }> {
 	try {
 		const body = await prisma.buildLog.findMany({
 			where: { buildId, time: { gt: last } },
diff --git a/src/lib/database/secrets.ts b/src/lib/database/secrets.ts
index 835eb4def..2aade4a2f 100644
--- a/src/lib/database/secrets.ts
+++ b/src/lib/database/secrets.ts
@@ -1,7 +1,8 @@
 import { encrypt, decrypt } from '$lib/crypto';
 import { prisma } from './common';
+import type { ServiceSecret, Secret, Prisma } from '@prisma/client';
 
-export async function listServiceSecrets(serviceId: string) {
+export async function listServiceSecrets(serviceId: string): Promise<ServiceSecret[]> {
 	let secrets = await prisma.serviceSecret.findMany({
 		where: { serviceId },
 		orderBy: { createdAt: 'desc' }
@@ -14,7 +15,7 @@ export async function listServiceSecrets(serviceId: string) {
 	return secrets;
 }
 
-export async function listSecrets(applicationId: string) {
+export async function listSecrets(applicationId: string): Promise<Secret[]> {
 	let secrets = await prisma.secret.findMany({
 		where: { applicationId },
 		orderBy: { createdAt: 'desc' }
@@ -27,20 +28,48 @@ export async function listSecrets(applicationId: string) {
 	return secrets;
 }
 
-export async function createServiceSecret({ id, name, value }) {
+export async function createServiceSecret({
+	id,
+	name,
+	value
+}: {
+	id: string;
+	name: string;
+	value: string;
+}): Promise<ServiceSecret> {
 	value = encrypt(value);
 	return await prisma.serviceSecret.create({
 		data: { name, value, service: { connect: { id } } }
 	});
 }
-export async function createSecret({ id, name, value, isBuildSecret, isPRMRSecret }) {
+export async function createSecret({
+	id,
+	name,
+	value,
+	isBuildSecret,
+	isPRMRSecret
+}: {
+	id: string;
+	name: string;
+	value: string;
+	isBuildSecret: boolean;
+	isPRMRSecret: boolean;
+}): Promise<Secret> {
 	value = encrypt(value);
 	return await prisma.secret.create({
 		data: { name, value, isBuildSecret, isPRMRSecret, application: { connect: { id } } }
 	});
 }
 
-export async function updateServiceSecret({ id, name, value }) {
+export async function updateServiceSecret({
+	id,
+	name,
+	value
+}: {
+	id: string;
+	name: string;
+	value: string;
+}): Promise<Prisma.BatchPayload | ServiceSecret> {
 	value = encrypt(value);
 	const found = await prisma.serviceSecret.findFirst({ where: { serviceId: id, name } });
 
@@ -55,7 +84,19 @@ export async function updateServiceSecret({ id, name, value }) {
 		});
 	}
 }
-export async function updateSecret({ id, name, value, isBuildSecret, isPRMRSecret }) {
+export async function updateSecret({
+	id,
+	name,
+	value,
+	isBuildSecret,
+	isPRMRSecret
+}: {
+	id: string;
+	name: string;
+	value: string;
+	isBuildSecret: boolean;
+	isPRMRSecret: boolean;
+}): Promise<Prisma.BatchPayload | Secret> {
 	value = encrypt(value);
 	const found = await prisma.secret.findFirst({ where: { applicationId: id, name, isPRMRSecret } });
 
@@ -71,10 +112,22 @@ export async function updateSecret({ id, name, value, isBuildSecret, isPRMRSecre
 	}
 }
 
-export async function removeServiceSecret({ id, name }) {
+export async function removeServiceSecret({
+	id,
+	name
+}: {
+	id: string;
+	name: string;
+}): Promise<Prisma.BatchPayload> {
 	return await prisma.serviceSecret.deleteMany({ where: { serviceId: id, name } });
 }
 
-export async function removeSecret({ id, name }) {
+export async function removeSecret({
+	id,
+	name
+}: {
+	id: string;
+	name: string;
+}): Promise<Prisma.BatchPayload> {
 	return await prisma.secret.deleteMany({ where: { applicationId: id, name } });
 }
diff --git a/src/lib/database/services.ts b/src/lib/database/services.ts
index 0aec569b6..4cb2e8b22 100644
--- a/src/lib/database/services.ts
+++ b/src/lib/database/services.ts
@@ -1,10 +1,28 @@
-import { asyncExecShell, getEngine } from '$lib/common';
 import { decrypt, encrypt } from '$lib/crypto';
+import type { Minio, Prisma, Service } from '@prisma/client';
 import cuid from 'cuid';
 import { generatePassword } from '.';
 import { prisma } from './common';
 
-export async function listServices(teamId) {
+const include: Prisma.ServiceInclude = {
+	destinationDocker: true,
+	persistentStorage: true,
+	serviceSecret: true,
+	minio: true,
+	plausibleAnalytics: true,
+	vscodeserver: true,
+	wordpress: true,
+	ghost: true,
+	meiliSearch: true,
+	umami: true
+};
+export async function listServicesWithIncludes() {
+	return await prisma.service.findMany({
+		include,
+		orderBy: { createdAt: 'desc' }
+	});
+}
+export async function listServices(teamId: string): Promise<Service[]> {
 	if (teamId === '0') {
 		return await prisma.service.findMany({ include: { teams: true } });
 	} else {
@@ -15,22 +33,18 @@ export async function listServices(teamId) {
 	}
 }
 
-export async function newService({ name, teamId }) {
+export async function newService({
+	name,
+	teamId
+}: {
+	name: string;
+	teamId: string;
+}): Promise<Service> {
 	return await prisma.service.create({ data: { name, teams: { connect: { id: teamId } } } });
 }
 
-export async function getService({ id, teamId }) {
-	let body = {};
-	const include = {
-		destinationDocker: true,
-		plausibleAnalytics: true,
-		minio: true,
-		vscodeserver: true,
-		wordpress: true,
-		ghost: true,
-		serviceSecret: true,
-		meiliSearch: true
-	};
+export async function getService({ id, teamId }: { id: string; teamId: string }): Promise<Service> {
+	let body;
 	if (teamId === '0') {
 		body = await prisma.service.findFirst({
 			where: { id },
@@ -43,6 +57,12 @@ export async function getService({ id, teamId }) {
 		});
 	}
 
+	if (body?.serviceSecret.length > 0) {
+		body.serviceSecret = body.serviceSecret.map((s) => {
+			s.value = decrypt(s.value);
+			return s;
+		});
+	}
 	if (body.plausibleAnalytics?.postgresqlPassword)
 		body.plausibleAnalytics.postgresqlPassword = decrypt(
 			body.plausibleAnalytics.postgresqlPassword
@@ -69,21 +89,26 @@ export async function getService({ id, teamId }) {
 
 	if (body.meiliSearch?.masterKey) body.meiliSearch.masterKey = decrypt(body.meiliSearch.masterKey);
 
-	if (body?.serviceSecret.length > 0) {
-		body.serviceSecret = body.serviceSecret.map((s) => {
-			s.value = decrypt(s.value);
-			return s;
-		});
-	}
-	if (body.wordpress?.ftpPassword) {
-		body.wordpress.ftpPassword = decrypt(body.wordpress.ftpPassword);
-	}
+	if (body.wordpress?.ftpPassword) body.wordpress.ftpPassword = decrypt(body.wordpress.ftpPassword);
+
+	if (body.umami?.postgresqlPassword)
+		body.umami.postgresqlPassword = decrypt(body.umami.postgresqlPassword);
+	if (body.umami?.umamiAdminPassword)
+		body.umami.umamiAdminPassword = decrypt(body.umami.umamiAdminPassword);
+	if (body.umami?.hashSalt) body.umami.hashSalt = decrypt(body.umami.hashSalt);
+
 	const settings = await prisma.setting.findFirst();
 
 	return { ...body, settings };
 }
 
-export async function configureServiceType({ id, type }) {
+export async function configureServiceType({
+	id,
+	type
+}: {
+	id: string;
+	type: string;
+}): Promise<void> {
 	if (type === 'plausibleanalytics') {
 		const password = encrypt(generatePassword());
 		const postgresqlUser = cuid();
@@ -197,48 +222,184 @@ export async function configureServiceType({ id, type }) {
 				meiliSearch: { create: { masterKey } }
 			}
 		});
+	} else if (type === 'umami') {
+		const umamiAdminPassword = encrypt(generatePassword());
+		const postgresqlUser = cuid();
+		const postgresqlPassword = encrypt(generatePassword());
+		const postgresqlDatabase = 'umami';
+		const hashSalt = encrypt(generatePassword(64));
+		await prisma.service.update({
+			where: { id },
+			data: {
+				type,
+				umami: {
+					create: {
+						umamiAdminPassword,
+						postgresqlDatabase,
+						postgresqlPassword,
+						postgresqlUser,
+						hashSalt
+					}
+				}
+			}
+		});
 	}
 }
-export async function setServiceVersion({ id, version }) {
+
+export async function setServiceVersion({
+	id,
+	version
+}: {
+	id: string;
+	version: string;
+}): Promise<Service> {
 	return await prisma.service.update({
 		where: { id },
 		data: { version }
 	});
 }
 
-export async function setServiceSettings({ id, dualCerts }) {
+export async function setServiceSettings({
+	id,
+	dualCerts
+}: {
+	id: string;
+	dualCerts: boolean;
+}): Promise<Service> {
 	return await prisma.service.update({
 		where: { id },
 		data: { dualCerts }
 	});
 }
 
-export async function updatePlausibleAnalyticsService({ id, fqdn, email, username, name }) {
+export async function updatePlausibleAnalyticsService({
+	id,
+	fqdn,
+	email,
+	username,
+	name
+}: {
+	id: string;
+	fqdn: string;
+	name: string;
+	email: string;
+	username: string;
+}): Promise<void> {
 	await prisma.plausibleAnalytics.update({ where: { serviceId: id }, data: { email, username } });
 	await prisma.service.update({ where: { id }, data: { name, fqdn } });
 }
-export async function updateService({ id, fqdn, name }) {
+
+export async function updateService({
+	id,
+	fqdn,
+	name
+}: {
+	id: string;
+	fqdn: string;
+	name: string;
+}): Promise<Service> {
 	return await prisma.service.update({ where: { id }, data: { fqdn, name } });
 }
-export async function updateWordpress({ id, fqdn, name, mysqlDatabase, extraConfig }) {
+
+export async function updateLanguageToolService({
+	id,
+	fqdn,
+	name
+}: {
+	id: string;
+	fqdn: string;
+	name: string;
+}): Promise<Service> {
+	return await prisma.service.update({ where: { id }, data: { fqdn, name } });
+}
+
+export async function updateMeiliSearchService({
+	id,
+	fqdn,
+	name
+}: {
+	id: string;
+	fqdn: string;
+	name: string;
+}): Promise<Service> {
+	return await prisma.service.update({ where: { id }, data: { fqdn, name } });
+}
+
+export async function updateVaultWardenService({
+	id,
+	fqdn,
+	name
+}: {
+	id: string;
+	fqdn: string;
+	name: string;
+}): Promise<Service> {
+	return await prisma.service.update({ where: { id }, data: { fqdn, name } });
+}
+
+export async function updateVsCodeServer({
+	id,
+	fqdn,
+	name
+}: {
+	id: string;
+	fqdn: string;
+	name: string;
+}): Promise<Service> {
+	return await prisma.service.update({ where: { id }, data: { fqdn, name } });
+}
+
+export async function updateWordpress({
+	id,
+	fqdn,
+	name,
+	mysqlDatabase,
+	extraConfig
+}: {
+	id: string;
+	fqdn: string;
+	name: string;
+	mysqlDatabase: string;
+	extraConfig: string;
+}): Promise<Service> {
 	return await prisma.service.update({
 		where: { id },
 		data: { fqdn, name, wordpress: { update: { mysqlDatabase, extraConfig } } }
 	});
 }
-export async function updateMinioService({ id, publicPort }) {
+
+export async function updateMinioService({
+	id,
+	publicPort
+}: {
+	id: string;
+	publicPort: number;
+}): Promise<Minio> {
 	return await prisma.minio.update({ where: { serviceId: id }, data: { publicPort } });
 }
-export async function updateGhostService({ id, fqdn, name, mariadbDatabase }) {
+
+export async function updateGhostService({
+	id,
+	fqdn,
+	name,
+	mariadbDatabase
+}: {
+	id: string;
+	fqdn: string;
+	name: string;
+	mariadbDatabase: string;
+}): Promise<Service> {
 	return await prisma.service.update({
 		where: { id },
 		data: { fqdn, name, ghost: { update: { mariadbDatabase } } }
 	});
 }
 
-export async function removeService({ id }) {
+export async function removeService({ id }: { id: string }): Promise<void> {
+	await prisma.servicePersistentStorage.deleteMany({ where: { serviceId: id } });
 	await prisma.meiliSearch.deleteMany({ where: { serviceId: id } });
 	await prisma.ghost.deleteMany({ where: { serviceId: id } });
+	await prisma.umami.deleteMany({ where: { serviceId: id } });
 	await prisma.plausibleAnalytics.deleteMany({ where: { serviceId: id } });
 	await prisma.minio.deleteMany({ where: { serviceId: id } });
 	await prisma.vscodeserver.deleteMany({ where: { serviceId: id } });
diff --git a/src/lib/database/settings.ts b/src/lib/database/settings.ts
index 31d6b3c04..2d0395d88 100644
--- a/src/lib/database/settings.ts
+++ b/src/lib/database/settings.ts
@@ -1,8 +1,9 @@
 import { decrypt } from '$lib/crypto';
 import { prisma } from './common';
+import type { Setting } from '@prisma/client';
 
-export async function listSettings() {
-	let settings = await prisma.setting.findFirst({});
+export async function listSettings(): Promise<Setting> {
+	const settings = await prisma.setting.findFirst({});
 	if (settings.proxyPassword) settings.proxyPassword = decrypt(settings.proxyPassword);
 	return settings;
 }
diff --git a/src/lib/database/teams.ts b/src/lib/database/teams.ts
index dd9a14cff..45d8fb5db 100644
--- a/src/lib/database/teams.ts
+++ b/src/lib/database/teams.ts
@@ -1,9 +1,10 @@
+import type { Team, Permission } from '@prisma/client';
 import { prisma } from './common';
 
-export async function listTeams() {
+export async function listTeams(): Promise<Team[]> {
 	return await prisma.team.findMany();
 }
-export async function newTeam({ name, userId }) {
+export async function newTeam({ name, userId }: { name: string; userId: string }): Promise<Team> {
 	return await prisma.team.create({
 		data: {
 			name,
@@ -12,7 +13,11 @@ export async function newTeam({ name, userId }) {
 		}
 	});
 }
-export async function getMyTeams({ userId }) {
+export async function getMyTeams({
+	userId
+}: {
+	userId: string;
+}): Promise<(Permission & { team: Team & { _count: { users: number } } })[]> {
 	return await prisma.permission.findMany({
 		where: { userId },
 		include: { team: { include: { _count: { select: { users: true } } } } }
diff --git a/src/lib/database/users.ts b/src/lib/database/users.ts
index 36b130b35..b74c8de4c 100644
--- a/src/lib/database/users.ts
+++ b/src/lib/database/users.ts
@@ -1,16 +1,30 @@
 import cuid from 'cuid';
-import bcrypt from 'bcrypt';
+import bcrypt from 'bcryptjs';
 
 import { prisma } from './common';
 import { asyncExecShell, uniqueName } from '$lib/common';
-
 import * as db from '$lib/database';
 import { startCoolifyProxy } from '$lib/haproxy';
-export async function hashPassword(password: string) {
+import type { User } from '@prisma/client';
+
+export async function hashPassword(password: string): Promise<string> {
 	const saltRounds = 15;
 	return bcrypt.hash(password, saltRounds);
 }
-export async function login({ email, password, isLogin }) {
+
+export async function login({
+	email,
+	password,
+	isLogin
+}: {
+	email: string;
+	password: string;
+	isLogin: boolean;
+}): Promise<{
+	status: number;
+	headers: { 'Set-Cookie': string };
+	body: { userId: string; teamId: string; permission: string; isAdmin: boolean };
+}> {
 	const users = await prisma.user.count();
 	const userFound = await prisma.user.findUnique({
 		where: { email },
@@ -32,8 +46,12 @@ export async function login({ email, password, isLogin }) {
 	if (users === 0) {
 		await prisma.setting.update({ where: { id }, data: { isRegistrationEnabled: false } });
 		// Create default network & start Coolify Proxy
-		await asyncExecShell(`docker network create --attachable coolify`);
-		await startCoolifyProxy('/var/run/docker.sock');
+		try {
+			await asyncExecShell(`docker network create --attachable coolify`);
+		} catch (error) {}
+		try {
+			await startCoolifyProxy('/var/run/docker.sock');
+		} catch (error) {}
 		uid = '0';
 	}
 
@@ -140,6 +158,6 @@ export async function login({ email, password, isLogin }) {
 	};
 }
 
-export async function getUser({ userId }) {
+export async function getUser({ userId }: { userId: string }): Promise<User> {
 	return await prisma.user.findUnique({ where: { id: userId } });
 }
diff --git a/src/lib/docker.ts b/src/lib/docker.ts
index 04f68ac48..d3c040c6a 100644
--- a/src/lib/docker.ts
+++ b/src/lib/docker.ts
@@ -85,7 +85,8 @@ export async function buildImage({
 	docker,
 	buildId,
 	isCache = false,
-	debug = false
+	debug = false,
+	dockerFileLocation = '/Dockerfile'
 }) {
 	if (isCache) {
 		await saveBuildLog({ line: `Building cache image started.`, buildId, applicationId });
@@ -103,11 +104,12 @@ export async function buildImage({
 	const stream = await docker.engine.buildImage(
 		{ src: ['.'], context: workdir },
 		{
-			dockerfile: isCache ? 'Dockerfile-cache' : 'Dockerfile',
+			dockerfile: isCache ? `${dockerFileLocation}-cache` : dockerFileLocation,
 			t: `${applicationId}:${tag}${isCache ? '-cache' : ''}`
 		}
 	);
 	await streamEvents({ stream, docker, buildId, applicationId, debug });
+	await saveBuildLog({ line: `Building image successful!`, buildId, applicationId });
 }
 
 export function dockerInstance({ destinationDocker }): { engine: Dockerode; network: string } {
diff --git a/src/lib/form.ts b/src/lib/form.ts
index 08099576d..5a7d65e23 100644
--- a/src/lib/form.ts
+++ b/src/lib/form.ts
@@ -1,5 +1,6 @@
 import { toast } from '@zerodevx/svelte-toast';
-export function errorNotification(message: string) {
+
+export function errorNotification(message: string): void {
 	console.error(message);
 	if (typeof message !== 'string') {
 		toast.push('Ooops, something is not okay, are you okay?');
@@ -30,7 +31,7 @@ export function enhance(
 		e.preventDefault();
 
 		let body = new FormData(form);
-		let parsedData = body;
+		const parsedData = body;
 
 		body.forEach((data, key) => {
 			if (data === '' || data === null) parsedData.delete(key);
diff --git a/src/lib/haproxy/configuration.ts b/src/lib/haproxy/configuration.ts
index 831d9490b..f2f9f500b 100644
--- a/src/lib/haproxy/configuration.ts
+++ b/src/lib/haproxy/configuration.ts
@@ -1,16 +1,16 @@
 import { dev } from '$app/env';
-import got from 'got';
+import got, { type Got } from 'got';
+import * as db from '$lib/database';
 import mustache from 'mustache';
 import crypto from 'crypto';
-
-import * as db from '$lib/database';
 import { checkContainer, checkHAProxy } from '.';
 import { asyncExecShell, getDomain, getEngine } from '$lib/common';
 import { supportedServiceTypesAndVersions } from '$lib/components/common';
+import { listServicesWithIncludes } from '$lib/database';
 
 const url = dev ? 'http://localhost:5555' : 'http://coolify-haproxy:5555';
 
-let template = `program api 
+const template = `program api 
   command /usr/bin/dataplaneapi -f /usr/local/etc/haproxy/dataplaneapi.hcl --userlist haproxy-dataplaneapi
   no option start-on-reload
 	
@@ -21,10 +21,10 @@ global
 defaults 
   mode http
   log global
-  timeout http-request 60s
+  timeout http-request 120s
   timeout connect 10s
-  timeout client 60s
-  timeout server 60s
+  timeout client 120s
+  timeout server 120s
 
 userlist haproxy-dataplaneapi 
   user admin insecure-password "\${HAPROXY_PASSWORD}"
@@ -128,7 +128,8 @@ backend {{domain}}
   server {{id}} {{id}}:{{port}} check fall 10
 {{/coolify}}
 `;
-export async function haproxyInstance() {
+
+export async function haproxyInstance(): Promise<Got> {
 	const { proxyPassword } = await db.listSettings();
 	return got.extend({
 		prefixUrl: url,
@@ -137,31 +138,87 @@ export async function haproxyInstance() {
 	});
 }
 
-export async function configureHAProxy() {
+export async function configureHAProxy(): Promise<void> {
 	const haproxy = await haproxyInstance();
 	await checkHAProxy(haproxy);
 
-	try {
-		const data = {
-			applications: [],
-			services: [],
-			coolify: []
-		};
-		const applications = await db.prisma.application.findMany({
-			include: { destinationDocker: true, settings: true }
-		});
-		for (const application of applications) {
-			const {
-				fqdn,
-				id,
-				port,
-				destinationDocker,
-				destinationDockerId,
-				settings: { previews },
-				updatedAt
-			} = application;
-			if (destinationDockerId) {
-				const { engine, network } = destinationDocker;
+	const data = {
+		applications: [],
+		services: [],
+		coolify: []
+	};
+	const applications = await db.prisma.application.findMany({
+		include: { destinationDocker: true, settings: true }
+	});
+	for (const application of applications) {
+		const {
+			fqdn,
+			id,
+			port,
+			destinationDocker,
+			destinationDockerId,
+			settings: { previews },
+			updatedAt
+		} = application;
+		if (destinationDockerId) {
+			const { engine, network } = destinationDocker;
+			const isRunning = await checkContainer(engine, id);
+			if (fqdn) {
+				const domain = getDomain(fqdn);
+				const isHttps = fqdn.startsWith('https://');
+				const isWWW = fqdn.includes('www.');
+				const redirectValue = `${isHttps ? 'https://' : 'http://'}${domain}%[capture.req.uri]`;
+				if (isRunning) {
+					data.applications.push({
+						id,
+						port: port || 3000,
+						domain,
+						isRunning,
+						isHttps,
+						redirectValue,
+						redirectTo: isWWW ? domain.replace('www.', '') : 'www.' + domain,
+						updatedAt: updatedAt.getTime()
+					});
+				}
+				if (previews) {
+					const host = getEngine(engine);
+					const { stdout } = await asyncExecShell(
+						`DOCKER_HOST=${host} docker container ls --filter="status=running" --filter="network=${network}" --filter="name=${id}-" --format="{{json .Names}}"`
+					);
+					const containers = stdout
+						.trim()
+						.split('\n')
+						.filter((a) => a)
+						.map((c) => c.replace(/"/g, ''));
+					if (containers.length > 0) {
+						for (const container of containers) {
+							const previewDomain = `${container.split('-')[1]}.${domain}`;
+							data.applications.push({
+								id: container,
+								port: port || 3000,
+								domain: previewDomain,
+								isRunning,
+								isHttps,
+								redirectValue,
+								redirectTo: isWWW ? previewDomain.replace('www.', '') : 'www.' + previewDomain,
+								updatedAt: updatedAt.getTime()
+							});
+						}
+					}
+				}
+			}
+		}
+	}
+	const services = await listServicesWithIncludes();
+
+	for (const service of services) {
+		const { fqdn, id, type, destinationDocker, destinationDockerId, updatedAt } = service;
+		if (destinationDockerId) {
+			const { engine } = destinationDocker;
+			const found = supportedServiceTypesAndVersions.find((a) => a.name === type);
+			if (found) {
+				const port = found.ports.main;
+				const publicPort = service[type]?.publicPort;
 				const isRunning = await checkContainer(engine, id);
 				if (fqdn) {
 					const domain = getDomain(fqdn);
@@ -169,9 +226,10 @@ export async function configureHAProxy() {
 					const isWWW = fqdn.includes('www.');
 					const redirectValue = `${isHttps ? 'https://' : 'http://'}${domain}%[capture.req.uri]`;
 					if (isRunning) {
-						data.applications.push({
+						data.services.push({
 							id,
-							port: port || 3000,
+							port,
+							publicPort,
 							domain,
 							isRunning,
 							isHttps,
@@ -180,108 +238,38 @@ export async function configureHAProxy() {
 							updatedAt: updatedAt.getTime()
 						});
 					}
-					if (previews) {
-						const host = getEngine(engine);
-						const { stdout } = await asyncExecShell(
-							`DOCKER_HOST=${host} docker container ls --filter="status=running" --filter="network=${network}" --filter="name=${id}-" --format="{{json .Names}}"`
-						);
-						const containers = stdout
-							.trim()
-							.split('\n')
-							.filter((a) => a)
-							.map((c) => c.replace(/"/g, ''));
-						if (containers.length > 0) {
-							for (const container of containers) {
-								let previewDomain = `${container.split('-')[1]}.${domain}`;
-								data.applications.push({
-									id: container,
-									port: port || 3000,
-									domain: previewDomain,
-									isRunning,
-									isHttps,
-									redirectValue,
-									redirectTo: isWWW ? previewDomain.replace('www.', '') : 'www.' + previewDomain,
-									updatedAt: updatedAt.getTime()
-								});
-							}
-						}
-					}
 				}
 			}
 		}
-		const services = await db.prisma.service.findMany({
-			include: {
-				destinationDocker: true,
-				minio: true,
-				plausibleAnalytics: true,
-				vscodeserver: true,
-				wordpress: true,
-				ghost: true
+	}
+	const { fqdn } = await db.prisma.setting.findFirst();
+	if (fqdn) {
+		const domain = getDomain(fqdn);
+		const isHttps = fqdn.startsWith('https://');
+		const isWWW = fqdn.includes('www.');
+		const redirectValue = `${isHttps ? 'https://' : 'http://'}${domain}%[capture.req.uri]`;
+		data.coolify.push({
+			id: dev ? 'host.docker.internal' : 'coolify',
+			port: 3000,
+			domain,
+			isHttps,
+			redirectValue,
+			redirectTo: isWWW ? domain.replace('www.', '') : 'www.' + domain
+		});
+	}
+	const output = mustache.render(template, data);
+	const newHash = crypto.createHash('md5').update(output).digest('hex');
+	const { proxyHash, id } = await db.listSettings();
+	if (proxyHash !== newHash) {
+		await db.prisma.setting.update({ where: { id }, data: { proxyHash: newHash } });
+		await haproxy.post(`v2/services/haproxy/configuration/raw`, {
+			searchParams: {
+				skip_version: true
+			},
+			body: output,
+			headers: {
+				'Content-Type': 'text/plain'
 			}
 		});
-
-		for (const service of services) {
-			const { fqdn, id, type, destinationDocker, destinationDockerId, updatedAt } = service;
-			if (destinationDockerId) {
-				const { engine } = destinationDocker;
-				const found = supportedServiceTypesAndVersions.find((a) => a.name === type);
-				if (found) {
-					const port = found.ports.main;
-					const publicPort = service[type]?.publicPort;
-					const isRunning = await checkContainer(engine, id);
-					if (fqdn) {
-						const domain = getDomain(fqdn);
-						const isHttps = fqdn.startsWith('https://');
-						const isWWW = fqdn.includes('www.');
-						const redirectValue = `${isHttps ? 'https://' : 'http://'}${domain}%[capture.req.uri]`;
-						if (isRunning) {
-							data.services.push({
-								id,
-								port,
-								publicPort,
-								domain,
-								isRunning,
-								isHttps,
-								redirectValue,
-								redirectTo: isWWW ? domain.replace('www.', '') : 'www.' + domain,
-								updatedAt: updatedAt.getTime()
-							});
-						}
-					}
-				}
-			}
-		}
-		const { fqdn } = await db.prisma.setting.findFirst();
-		if (fqdn) {
-			const domain = getDomain(fqdn);
-			const isHttps = fqdn.startsWith('https://');
-			const isWWW = fqdn.includes('www.');
-			const redirectValue = `${isHttps ? 'https://' : 'http://'}${domain}%[capture.req.uri]`;
-			data.coolify.push({
-				id: dev ? 'host.docker.internal' : 'coolify',
-				port: 3000,
-				domain,
-				isHttps,
-				redirectValue,
-				redirectTo: isWWW ? domain.replace('www.', '') : 'www.' + domain
-			});
-		}
-		const output = mustache.render(template, data);
-		const newHash = crypto.createHash('md5').update(output).digest('hex');
-		const { proxyHash, id } = await db.listSettings();
-		if (proxyHash !== newHash) {
-			await db.prisma.setting.update({ where: { id }, data: { proxyHash: newHash } });
-			await haproxy.post(`v2/services/haproxy/configuration/raw`, {
-				searchParams: {
-					skip_version: true
-				},
-				body: output,
-				headers: {
-					'Content-Type': 'text/plain'
-				}
-			});
-		}
-	} catch (error) {
-		throw error;
 	}
 }
diff --git a/src/lib/haproxy/index.ts b/src/lib/haproxy/index.ts
index 98a1453f3..5b713e343 100644
--- a/src/lib/haproxy/index.ts
+++ b/src/lib/haproxy/index.ts
@@ -1,7 +1,8 @@
 import { dev } from '$app/env';
 import { asyncExecShell, getEngine } from '$lib/common';
-import got from 'got';
+import got, { type Got, type Response } from 'got';
 import * as db from '$lib/database';
+import type { DestinationDocker } from '@prisma/client';
 
 const url = dev ? 'http://localhost:5555' : 'http://coolify-haproxy:5555';
 
@@ -9,7 +10,7 @@ export const defaultProxyImage = `coolify-haproxy-alpine:latest`;
 export const defaultProxyImageTcp = `coolify-haproxy-tcp-alpine:latest`;
 export const defaultProxyImageHttp = `coolify-haproxy-http-alpine:latest`;
 
-export async function haproxyInstance() {
+export async function haproxyInstance(): Promise<Got> {
 	const { proxyPassword } = await db.listSettings();
 	return got.extend({
 		prefixUrl: url,
@@ -17,6 +18,7 @@ export async function haproxyInstance() {
 		password: proxyPassword
 	});
 }
+
 export async function getRawConfiguration(): Promise<RawHaproxyConfiguration> {
 	return await (await haproxyInstance()).get(`v2/services/haproxy/configuration/raw`).json();
 }
@@ -43,11 +45,12 @@ export async function getNextTransactionId(): Promise<string> {
 	return newTransaction.id;
 }
 
-export async function completeTransaction(transactionId) {
+export async function completeTransaction(transactionId: string): Promise<Response<string>> {
 	const haproxy = await haproxyInstance();
 	return await haproxy.put(`v2/services/haproxy/transactions/${transactionId}`);
 }
-export async function deleteProxy({ id }) {
+
+export async function deleteProxy({ id }: { id: string }): Promise<void> {
 	const haproxy = await haproxyInstance();
 	await checkHAProxy(haproxy);
 
@@ -77,11 +80,12 @@ export async function deleteProxy({ id }) {
 	}
 }
 
-export async function reloadHaproxy(engine) {
+export async function reloadHaproxy(engine: string): Promise<{ stdout: string; stderr: string }> {
 	const host = getEngine(engine);
 	return await asyncExecShell(`DOCKER_HOST=${host} docker exec coolify-haproxy kill -HUP 1`);
 }
-export async function checkHAProxy(haproxy?: any) {
+
+export async function checkHAProxy(haproxy?: Got): Promise<void> {
 	if (!haproxy) haproxy = await haproxyInstance();
 	try {
 		await haproxy.get('v2/info');
@@ -93,7 +97,10 @@ export async function checkHAProxy(haproxy?: any) {
 	}
 }
 
-export async function stopTcpHttpProxy(destinationDocker, publicPort) {
+export async function stopTcpHttpProxy(
+	destinationDocker: DestinationDocker,
+	publicPort: number
+): Promise<{ stdout: string; stderr: string } | Error> {
 	const { engine } = destinationDocker;
 	const host = getEngine(engine);
 	const containerName = `haproxy-for-${publicPort}`;
@@ -108,16 +115,22 @@ export async function stopTcpHttpProxy(destinationDocker, publicPort) {
 		return error;
 	}
 }
-export async function startTcpProxy(destinationDocker, id, publicPort, privatePort, volume = null) {
+export async function startTcpProxy(
+	destinationDocker: DestinationDocker,
+	id: string,
+	publicPort: number,
+	privatePort: number,
+	volume?: string
+): Promise<{ stdout: string; stderr: string } | Error> {
 	const { network, engine } = destinationDocker;
 	const host = getEngine(engine);
 
 	const containerName = `haproxy-for-${publicPort}`;
-	const found = await checkContainer(engine, containerName);
-	const foundDB = await checkContainer(engine, id);
+	const found = await checkContainer(engine, containerName, true);
+	const foundDependentContainer = await checkContainer(engine, id, true);
 
 	try {
-		if (foundDB && !found) {
+		if (foundDependentContainer && !found) {
 			const { stdout: Config } = await asyncExecShell(
 				`DOCKER_HOST="${host}" docker network inspect bridge --format '{{json .IPAM.Config }}'`
 			);
@@ -128,20 +141,31 @@ export async function startTcpProxy(destinationDocker, id, publicPort, privatePo
 				} -d coollabsio/${defaultProxyImageTcp}`
 			);
 		}
+		if (!foundDependentContainer && found) {
+			return await asyncExecShell(
+				`DOCKER_HOST=${host} docker stop -t 0 ${containerName} && docker rm ${containerName}`
+			);
+		}
 	} catch (error) {
 		return error;
 	}
 }
-export async function startHttpProxy(destinationDocker, id, publicPort, privatePort) {
+
+export async function startHttpProxy(
+	destinationDocker: DestinationDocker,
+	id: string,
+	publicPort: number,
+	privatePort: number
+): Promise<{ stdout: string; stderr: string } | Error> {
 	const { network, engine } = destinationDocker;
 	const host = getEngine(engine);
 
 	const containerName = `haproxy-for-${publicPort}`;
-	const found = await checkContainer(engine, containerName);
-	const foundDB = await checkContainer(engine, id);
+	const found = await checkContainer(engine, containerName, true);
+	const foundDependentContainer = await checkContainer(engine, id, true);
 
 	try {
-		if (foundDB && !found) {
+		if (foundDependentContainer && !found) {
 			const { stdout: Config } = await asyncExecShell(
 				`DOCKER_HOST="${host}" docker network inspect bridge --format '{{json .IPAM.Config }}'`
 			);
@@ -150,13 +174,19 @@ export async function startHttpProxy(destinationDocker, id, publicPort, privateP
 				`DOCKER_HOST=${host} docker run --restart always -e PORT=${publicPort} -e APP=${id} -e PRIVATE_PORT=${privatePort} --add-host 'host.docker.internal:host-gateway' --add-host 'host.docker.internal:${ip}' --network ${network} -p ${publicPort}:${publicPort} --name ${containerName} -d coollabsio/${defaultProxyImageHttp}`
 			);
 		}
+		if (!foundDependentContainer && found) {
+			return await asyncExecShell(
+				`DOCKER_HOST=${host} docker stop -t 0 ${containerName} && docker rm ${containerName}`
+			);
+		}
 	} catch (error) {
 		return error;
 	}
 }
-export async function startCoolifyProxy(engine) {
+
+export async function startCoolifyProxy(engine: string): Promise<void> {
 	const host = getEngine(engine);
-	const found = await checkContainer(engine, 'coolify-haproxy');
+	const found = await checkContainer(engine, 'coolify-haproxy', true);
 	const { proxyPassword, proxyUser, id } = await db.listSettings();
 	if (!found) {
 		const { stdout: Config } = await asyncExecShell(
@@ -170,7 +200,26 @@ export async function startCoolifyProxy(engine) {
 	}
 	await configureNetworkCoolifyProxy(engine);
 }
-export async function checkContainer(engine, container) {
+
+export async function isContainerExited(engine: string, containerName: string): Promise<boolean> {
+	let isExited = false;
+	const host = getEngine(engine);
+	try {
+		const { stdout } = await asyncExecShell(
+			`DOCKER_HOST="${host}" docker inspect -f '{{.State.Status}}' ${containerName}`
+		);
+		if (stdout.trim() === 'exited') {
+			isExited = true;
+		}
+	} catch (error) {}
+
+	return isExited;
+}
+export async function checkContainer(
+	engine: string,
+	container: string,
+	remove: boolean = false
+): Promise<boolean> {
 	const host = getEngine(engine);
 	let containerFound = false;
 
@@ -180,8 +229,11 @@ export async function checkContainer(engine, container) {
 		);
 		const parsedStdout = JSON.parse(stdout);
 		const status = parsedStdout.Status;
-		const isRunning = status === 'running' ? true : false;
-		if (status === 'exited' || status === 'created') {
+		const isRunning = status === 'running';
+		if (status === 'created') {
+			await asyncExecShell(`DOCKER_HOST="${host}" docker rm ${container}`);
+		}
+		if (remove && status === 'exited') {
 			await asyncExecShell(`DOCKER_HOST="${host}" docker rm ${container}`);
 		}
 		if (isRunning) {
@@ -193,7 +245,9 @@ export async function checkContainer(engine, container) {
 	return containerFound;
 }
 
-export async function stopCoolifyProxy(engine) {
+export async function stopCoolifyProxy(
+	engine: string
+): Promise<{ stdout: string; stderr: string } | Error> {
 	const host = getEngine(engine);
 	const found = await checkContainer(engine, 'coolify-haproxy');
 	await db.setDestinationSettings({ engine, isCoolifyProxyUsed: false });
@@ -210,16 +264,18 @@ export async function stopCoolifyProxy(engine) {
 	}
 }
 
-export async function configureNetworkCoolifyProxy(engine) {
+export async function configureNetworkCoolifyProxy(engine: string): Promise<void> {
 	const host = getEngine(engine);
 	const destinations = await db.prisma.destinationDocker.findMany({ where: { engine } });
-	destinations.forEach(async (destination) => {
-		try {
+	const { stdout: networks } = await asyncExecShell(
+		`DOCKER_HOST="${host}" docker ps -a --filter name=coolify-haproxy --format '{{json .Networks}}'`
+	);
+	const configuredNetworks = networks.replace(/"/g, '').replace('\n', '').split(',');
+	for (const destination of destinations) {
+		if (!configuredNetworks.includes(destination.network)) {
 			await asyncExecShell(
 				`DOCKER_HOST="${host}" docker network connect ${destination.network} coolify-haproxy`
 			);
-		} catch (err) {
-			// TODO: handle error
 		}
-	});
+	}
 }
diff --git a/src/lib/importers/github.ts b/src/lib/importers/github.ts
index 53754205e..a08fb87b4 100644
--- a/src/lib/importers/github.ts
+++ b/src/lib/importers/github.ts
@@ -2,11 +2,9 @@ import { asyncExecShell, saveBuildLog } from '$lib/common';
 import got from 'got';
 import jsonwebtoken from 'jsonwebtoken';
 import * as db from '$lib/database';
-import { ErrorHandler } from '$lib/database';
 
 export default async function ({
 	applicationId,
-	debug,
 	workdir,
 	githubAppId,
 	repository,
@@ -14,7 +12,16 @@ export default async function ({
 	htmlUrl,
 	branch,
 	buildId
-}): Promise<any> {
+}: {
+	applicationId: string;
+	workdir: string;
+	githubAppId: string;
+	repository: string;
+	apiUrl: string;
+	htmlUrl: string;
+	branch: string;
+	buildId: string;
+}): Promise<string> {
 	const url = htmlUrl.replace('https://', '').replace('http://', '');
 	await saveBuildLog({ line: 'GitHub importer started.', buildId, applicationId });
 	const { privateKey, appId, installationId } = await db.getUniqueGithubApp({ githubAppId });
diff --git a/src/lib/importers/gitlab.ts b/src/lib/importers/gitlab.ts
index 0cf57d98a..966b22c96 100644
--- a/src/lib/importers/gitlab.ts
+++ b/src/lib/importers/gitlab.ts
@@ -9,7 +9,16 @@ export default async function ({
 	branch,
 	buildId,
 	privateSshKey
-}): Promise<any> {
+}: {
+	applicationId: string;
+	workdir: string;
+	repository: string;
+	htmlUrl: string;
+	branch: string;
+	buildId: string;
+	repodir: string;
+	privateSshKey: string;
+}): Promise<string> {
 	const url = htmlUrl.replace('https://', '').replace('http://', '').replace(/\/$/, '');
 	await saveBuildLog({ line: 'GitLab importer started.', buildId, applicationId });
 	await asyncExecShell(`echo '${privateSshKey}' > ${repodir}/id.rsa`);
diff --git a/src/lib/lang.json b/src/lib/lang.json
new file mode 100644
index 000000000..fdfc5bf80
--- /dev/null
+++ b/src/lib/lang.json
@@ -0,0 +1,4 @@
+{
+	"fr": "Français",
+	"en": "English"
+}
diff --git a/src/lib/letsencrypt/index.ts b/src/lib/letsencrypt/index.ts
index fb1fa46ac..7682ecb27 100644
--- a/src/lib/letsencrypt/index.ts
+++ b/src/lib/letsencrypt/index.ts
@@ -6,9 +6,14 @@ import cuid from 'cuid';
 import fs from 'fs/promises';
 import getPort, { portNumbers } from 'get-port';
 import { supportedServiceTypesAndVersions } from '$lib/components/common';
+import { promises as dns } from 'dns';
+import { listServicesWithIncludes } from '$lib/database';
 
-export async function letsEncrypt(domain, id = null, isCoolify = false) {
+export async function letsEncrypt(domain: string, id?: string, isCoolify = false): Promise<void> {
 	try {
+		const certbotImage =
+			process.arch === 'x64' ? 'certbot/certbot' : 'certbot/certbot:arm64v8-latest';
+
 		const data = await db.prisma.setting.findFirst();
 		const { minPort, maxPort } = data;
 
@@ -62,7 +67,7 @@ export async function letsEncrypt(domain, id = null, isCoolify = false) {
 			if (found) return;
 
 			await asyncExecShell(
-				`DOCKER_HOST=${host} docker run --rm --name certbot-${randomCuid} -p 9080:${randomPort} -v "coolify-letsencrypt:/etc/letsencrypt" certbot/certbot --logs-dir /etc/letsencrypt/logs certonly --standalone --preferred-challenges http --http-01-address 0.0.0.0 --http-01-port ${randomPort} -d ${nakedDomain} -d ${wwwDomain} --expand --agree-tos --non-interactive --register-unsafely-without-email ${
+				`DOCKER_HOST=${host} docker run --rm --name certbot-${randomCuid} -p 9080:${randomPort} -v "coolify-letsencrypt:/etc/letsencrypt" ${certbotImage} --logs-dir /etc/letsencrypt/logs certonly --standalone --preferred-challenges http --http-01-address 0.0.0.0 --http-01-port ${randomPort} -d ${nakedDomain} -d ${wwwDomain} --expand --agree-tos --non-interactive --register-unsafely-without-email ${
 					dev ? '--test-cert' : ''
 				}`
 			);
@@ -82,7 +87,7 @@ export async function letsEncrypt(domain, id = null, isCoolify = false) {
 			}
 			if (found) return;
 			await asyncExecShell(
-				`DOCKER_HOST=${host} docker run --rm --name certbot-${randomCuid} -p 9080:${randomPort} -v "coolify-letsencrypt:/etc/letsencrypt" certbot/certbot --logs-dir /etc/letsencrypt/logs certonly --standalone --preferred-challenges http --http-01-address 0.0.0.0 --http-01-port ${randomPort} -d ${domain} --expand --agree-tos --non-interactive --register-unsafely-without-email ${
+				`DOCKER_HOST=${host} docker run --rm --name certbot-${randomCuid} -p 9080:${randomPort} -v "coolify-letsencrypt:/etc/letsencrypt" ${certbotImage} --logs-dir /etc/letsencrypt/logs certonly --standalone --preferred-challenges http --http-01-address 0.0.0.0 --http-01-port ${randomPort} -d ${domain} --expand --agree-tos --non-interactive --register-unsafely-without-email ${
 					dev ? '--test-cert' : ''
 				}`
 			);
@@ -98,7 +103,7 @@ export async function letsEncrypt(domain, id = null, isCoolify = false) {
 	}
 }
 
-export async function generateSSLCerts() {
+export async function generateSSLCerts(): Promise<void> {
 	const ssls = [];
 	const applications = await db.prisma.application.findMany({
 		include: { destinationDocker: true, settings: true },
@@ -131,7 +136,7 @@ export async function generateSSLCerts() {
 						.map((c) => c.replace(/"/g, ''));
 					if (containers.length > 0) {
 						for (const container of containers) {
-							let previewDomain = `${container.split('-')[1]}.${domain}`;
+							const previewDomain = `${container.split('-')[1]}.${domain}`;
 							if (isHttps) ssls.push({ domain: previewDomain, id, isCoolify: false });
 						}
 					}
@@ -141,17 +146,7 @@ export async function generateSSLCerts() {
 			console.log(`Error during generateSSLCerts with ${application.fqdn}: ${error}`);
 		}
 	}
-	const services = await db.prisma.service.findMany({
-		include: {
-			destinationDocker: true,
-			minio: true,
-			plausibleAnalytics: true,
-			vscodeserver: true,
-			wordpress: true,
-			ghost: true
-		},
-		orderBy: { createdAt: 'desc' }
-	});
+	const services = await listServicesWithIncludes();
 
 	for (const service of services) {
 		try {
@@ -198,16 +193,44 @@ export async function generateSSLCerts() {
 				file.endsWith('.pem') && certificates.push(file.replace(/\.pem$/, ''));
 			}
 		}
+		const resolver = new dns.Resolver({ timeout: 2000 });
+		resolver.setServers(['8.8.8.8', '1.1.1.1']);
+		let ipv4, ipv6;
+		try {
+			ipv4 = await (await asyncExecShell(`curl -4s https://ifconfig.io`)).stdout;
+		} catch (error) {}
+		try {
+			ipv6 = await (await asyncExecShell(`curl -6s https://ifconfig.io`)).stdout;
+		} catch (error) {}
 		for (const ssl of ssls) {
 			if (!dev) {
 				if (
 					certificates.includes(ssl.domain) ||
 					certificates.includes(ssl.domain.replace('www.', ''))
 				) {
-					console.log(`Certificate for ${ssl.domain} already exists`);
+					// console.log(`Certificate for ${ssl.domain} already exists`);
 				} else {
-					console.log('Generating SSL for', ssl.domain);
-					await letsEncrypt(ssl.domain, ssl.id, ssl.isCoolify);
+					// Checking DNS entry before generating certificate
+					if (ipv4 || ipv6) {
+						let domains4 = [];
+						let domains6 = [];
+						try {
+							domains4 = await resolver.resolve4(ssl.domain);
+						} catch (error) {}
+						try {
+							domains6 = await resolver.resolve6(ssl.domain);
+						} catch (error) {}
+						if (domains4.length > 0 || domains6.length > 0) {
+							if (
+								(ipv4 && domains4.includes(ipv4.replace('\n', ''))) ||
+								(ipv6 && domains6.includes(ipv6.replace('\n', '')))
+							) {
+								console.log('Generating SSL for', ssl.domain);
+								return await letsEncrypt(ssl.domain, ssl.id, ssl.isCoolify);
+							}
+						}
+					}
+					console.log('DNS settings is incorrect for', ssl.domain, 'skipping.');
 				}
 			} else {
 				if (
@@ -216,7 +239,27 @@ export async function generateSSLCerts() {
 				) {
 					console.log(`Certificate for ${ssl.domain} already exists`);
 				} else {
-					console.log('Generating SSL for', ssl.domain);
+					// Checking DNS entry before generating certificate
+					if (ipv4 || ipv6) {
+						let domains4 = [];
+						let domains6 = [];
+						try {
+							domains4 = await resolver.resolve4(ssl.domain);
+						} catch (error) {}
+						try {
+							domains6 = await resolver.resolve6(ssl.domain);
+						} catch (error) {}
+						if (domains4.length > 0 || domains6.length > 0) {
+							if (
+								(ipv4 && domains4.includes(ipv4.replace('\n', ''))) ||
+								(ipv6 && domains6.includes(ipv6.replace('\n', '')))
+							) {
+								console.log('Generating SSL for', ssl.domain);
+								return;
+							}
+						}
+					}
+					console.log('DNS settings is incorrect for', ssl.domain, 'skipping.');
 				}
 			}
 		}
diff --git a/src/lib/locales/en.json b/src/lib/locales/en.json
new file mode 100644
index 000000000..d77d2a1c1
--- /dev/null
+++ b/src/lib/locales/en.json
@@ -0,0 +1,329 @@
+{
+	"layout": {
+		"update_done": "Update completed.",
+		"wait_new_version_startup": "Waiting for the new version to start...",
+		"new_version": "New version reachable. Reloading...",
+		"switch_to_a_different_team": "Switch to a different team...",
+		"update_available": "Update available"
+	},
+	"error": {
+		"you_can_find_your_way_back": "You can find your way back",
+		"here": "here",
+		"you_are_lost": "Ooops you are lost! But don't be afraid!"
+	},
+	"index": {
+		"dashboard": "Dashboard",
+		"applications": "Applications",
+		"destinations": "Destinations",
+		"git_sources": "Git Sources",
+		"databases": "Databases",
+		"services": "Services",
+		"teams": "Teams",
+		"not_implemented_yet": "Not implemented yet",
+		"database": "Database",
+		"settings": "Settings",
+		"global_settings": "Global Settings",
+		"secret": "Secret",
+		"team": "Team",
+		"logout": "Logout"
+	},
+	"login": {
+		"already_logged_in": "Already logged in...",
+		"authenticating": "Authenticating...",
+		"login": "Login"
+	},
+	"forms": {
+		"password": "Password",
+		"email": "Email address",
+		"passwords_not_match": "Passwords do not match.",
+		"password_again": "Password again",
+		"save": "Save",
+		"saving": "Saving...",
+		"name": "Name",
+		"value": "Value",
+		"action": "Action",
+		"is_required": "is required.",
+		"add": "Add",
+		"set": "Set",
+		"remove": "Remove",
+		"path": "Path",
+		"confirm_continue": "Are you sure to continue?",
+		"must_be_stopped_to_modify": "Must be stopped to modify.",
+		"port": "Port",
+		"default": "default",
+		"base_directory": "Base Directory",
+		"publish_directory": "Publish Directory",
+		"generated_automatically_after_start": "Generated automatically after start",
+		"roots_password": "Root's Password",
+		"root_user": "Root User",
+		"eg": "eg",
+		"user": "User",
+		"loading": "Loading...",
+		"version": "Version",
+		"host": "Host",
+		"already_used_for": "<span class=\"text-red-500\">{{type}}</span> already used for",
+		"configuration": "Configuration",
+		"engine": "Engine",
+		"network": "Network",
+		"ip_address": "IP Address",
+		"ssh_private_key": "SSH Private Key",
+		"type": "Type",
+		"html_url": "HTML URL",
+		"api_url": "API URL",
+		"organization": "Organization",
+		"new_password": "New password",
+		"super_secure_new_password": "Super secure new password",
+		"submit": "Submit",
+		"default_email_address": "Default Email Address",
+		"default_password": "Default Password",
+		"username": "Username",
+		"root_db_user": "Root DB User",
+		"root_db_password": "Root DB Password",
+		"api_port": "API Port",
+		"verifying": "Verifying",
+		"verify_emails_without_smtp": "Verify emails without SMTP",
+		"extra_config": "Extra Config",
+		"select_a_service": "Select a Service",
+		"select_a_service_version": "Select a Service version",
+		"removing": "Removing...",
+		"remove_domain": "Remove domain",
+		"public_port_range": "Public Port Range",
+		"public_port_range_explainer": "Ports used to expose databases/services/internal services.<br> Add them to your firewall (if applicable).<br><br>You can specify a range of ports, eg: <span class='text-yellow-500 font-bold'>9000-9100</span>",
+		"no_actions_available": "No actions available",
+		"admin_api_key": "Admin API key"
+	},
+	"register": {
+		"register": "Register",
+		"registering": "Registering...",
+		"first_user": "You are registering the first user. It will be the administrator of your Coolify instance."
+	},
+	"reset": {
+		"reset_password": "Reset",
+		"invalid_secret_key": "Invalid secret key.",
+		"secret_key": "Secret Key",
+		"find_path_secret_key": "You can find it in ~/coolify/.env (COOLIFY_SECRET_KEY)"
+	},
+	"application": {
+		"configuration": {
+			"buildpack": {
+				"choose_this_one": "Choose this one..."
+			},
+			"branch_already_in_use": "This branch is already used by another application. Webhooks won't work in this case for both applications. Are you sure you want to use it?",
+			"no_repositories_configured": "No repositories configured for your Git Application.",
+			"configure_it_now": "Configure it now",
+			"loading_repositories": "Loading repositories ...",
+			"select_a_repository": "Please select a repository",
+			"loading_branches": "Loading branches ...",
+			"select_a_repository_first": "Please select a repository first",
+			"select_a_branch": "Please select a branch",
+			"loading_groups": "Loading groups...",
+			"select_a_group": "Please select a group",
+			"loading_projects": "Loading projects...",
+			"select_a_project": "Please select a project",
+			"no_projects_found": "No projects found",
+			"no_branches_found": "No branches found",
+			"configure_build_pack": "Configure Build Pack",
+			"scanning_repository_suggest_build_pack": "Scanning repository to suggest a build pack for you...",
+			"found_lock_file": "Found lock file for <span class=\"font-bold text-orange-500 pl-1\">{{packageManager}}</span>. Using it for predefined commands commands.",
+			"configure_destination": "Configure Destination",
+			"no_configurable_destination": "No configurable Destination found",
+			"select_a_repository_project": "Select a Repository / Project",
+			"select_a_git_source": "Select a Git Source",
+			"no_configurable_git": "No configurable Git Source found",
+			"configuration_missing": "Configuration missing"
+		},
+		"build": {
+			"queued_waiting_exec": "Queued and waiting for execution.",
+			"build_logs_of": "Build logs of",
+			"running": "Running",
+			"queued": "Queued",
+			"finished_in": "Finished in",
+			"load_more": "Load More",
+			"no_logs": "No logs found",
+			"waiting_logs": "Waiting for the logs..."
+		},
+		"preview": {
+			"need_during_buildtime": "Need during buildtime?",
+			"setup_secret_app_first": "You can add secrets to PR/MR deployments. Please add secrets to the application first. <br>Useful for creating <span class='text-green-500 font-bold'>staging</span> environments.",
+			"values_overwriting_app_secrets": "These values overwrite application secrets in PR/MR deployments. Useful for creating <span class='text-green-500 font-bold'>staging</span> environments.",
+			"redeploy": "Redeploy",
+			"no_previews_available": "No previews available"
+		},
+		"secrets": {
+			"secret_saved": "Secret saved.",
+			"use_isbuildsecret": "Use isBuildSecret",
+			"secrets_for": "Secrets for"
+		},
+		"storage": {
+			"path_is_required": "Path is required.",
+			"storage_saved": "Storage saved.",
+			"storage_updated": "Storage updated.",
+			"storage_deleted": "Storage deleted.",
+			"persistent_storage_explainer": "You can specify any folder that you want to be persistent across deployments. <br>This is useful for storing data such as a database (SQLite) or a cache."
+		},
+		"deployment_queued": "Deployment queued.",
+		"confirm_to_delete": "Are you sure you would like to delete '{{name}}'?",
+		"stop_application": "Stop application",
+		"permission_denied_stop_application": "You do not have permission to stop the application.",
+		"rebuild_application": "Rebuild application",
+		"permission_denied_rebuild_application": "You do not have permission to rebuild application.",
+		"build_and_start_application": "Build and start application",
+		"permission_denied_build_and_start_application": "You do not have permission to Build and start application.",
+		"configurations": "Configurations",
+		"secret": "Secrets",
+		"persistent_storage": "Persistent Storage",
+		"previews": "Previews",
+		"logs": "Application Logs",
+		"build_logs": "Build Logs",
+		"delete_application": "Delete application",
+		"permission_denied_delete_application": "You do not have permission to delete this application",
+		"domain_already_in_use": "Domain {{domain}} is already used.",
+		"dns_not_set_error": "DNS not set or propogated for {{domain}}.<br><br>Please check your DNS settings.",
+		"settings_saved": "Settings saved.",
+		"dns_not_set_partial_error": "DNS not set",
+		"git_source": "Git Source",
+		"git_repository": "Git Repository",
+		"build_pack": "Build Pack",
+		"destination": "Destination",
+		"application": "Application",
+		"url_fqdn": "URL (FQDN)",
+		"domain_fqdn": "Domain (FQDN)",
+		"https_explainer": "If you specify <span class='text-green-500 font-bold'>https</span>, the application will be accessible only over https. SSL certificate will be generated for you.<br>If you specify <span class='text-green-500 font-bold'>www</span>, the application will be redirected (302) from non-www and vice versa.<br><br>To modify the domain, you must first stop the application.<br><br><span class='text-white font-bold'>You must set your DNS to point to the server IP in advance.</span>",
+		"ssl_www_and_non_www": "Generate SSL for www and non-www?",
+		"ssl_explainer": "It will generate certificates for both www and non-www. <br>You need to have <span class='font-bold text-green-500'>both DNS entries</span> set in advance.<br><br>Useful if you expect to have visitors on both.",
+		"install_command": "Install Command",
+		"build_command": "Build Command",
+		"start_command": "Start Command",
+		"directory_to_use_explainer": "Directory to use as the base for all commands.<br>Could be useful with <span class='text-green-500 font-bold'>monorepos</span>.",
+		"publish_directory_explainer": "Directory containing all the assets for deployment. <br> For example: <span class='text-green-500 font-bold'>dist</span>,<span class='text-green-500 font-bold'>_site</span> or <span class='text-green-500 font-bold'>public</span>.",
+		"features": "Features",
+		"enable_automatic_deployment": "Enable Automatic Deployment",
+		"enable_auto_deploy_webhooks": "Enable automatic deployment through webhooks.",
+		"enable_mr_pr_previews": "Enable MR/PR Previews",
+		"enable_preview_deploy_mr_pr_requests": "Enable preview deployments from pull or merge requests.",
+		"debug_logs": "Debug Logs",
+		"enable_debug_log_during_build": "Enable debug logs during build phase.<br><span class='text-red-500 font-bold'>Sensitive information</span> could be visible and saved in logs.",
+		"cant_activate_auto_deploy_without_repo": "Cannot activate automatic deployments until only one application is defined for this repository / branch.",
+		"no_applications_found": "No applications found",
+		"secret__batch_dot_env": "Paste .env file",
+		"batch_secrets": "Batch add secrets"
+	},
+	"general": "General",
+	"database": {
+		"default_database": "Default Database",
+		"generated_automatically_after_set_to_public": "Generated automatically after set to public",
+		"connection_string": "Connection String",
+		"set_public": "Set it public",
+		"warning_database_public": "Your database will be reachable over the internet. <br>Take security seriously in this case!",
+		"change_append_only_mode": "Change append only mode",
+		"warning_append_only": "Useful if you would like to restore redis data from a backup.<br><span class='font-bold text-white'>Database restart is required.</span>",
+		"select_database_type": "Select a Database type",
+		"select_database_version": "Select a Database version",
+		"confirm_stop": "Are you sure you would like to stop {{name}}?",
+		"stop_database": "Stop database",
+		"permission_denied_stop_database": "You do not have permission to stop the database.",
+		"start_database": "Start database",
+		"permission_denied_start_database": "You do not have permission to start the database.",
+		"delete_database": "Delete Database",
+		"permission_denied_delete_database": "You do not have permission to delete a Database",
+		"no_databases_found": "No databases found"
+	},
+	"destination": {
+		"delete_destination": "Delete Destination",
+		"permission_denied_delete_destination": "You do not have permission to delete this destination",
+		"add_to_coolify": "Add to Coolify",
+		"coolify_proxy_stopped": "Coolify Proxy stopped!",
+		"coolify_proxy_started": "Coolify Proxy started!",
+		"confirm_restart_proxy": "Are you sure you want to restart the proxy? Everything will be reconfigured in ~10 secs.",
+		"coolify_proxy_restarting": "Coolify Proxy restarting...",
+		"restarting_please_wait": "Restarting... please wait...",
+		"force_restart_proxy": "Force restart proxy",
+		"use_coolify_proxy": "Use Coolify Proxy?",
+		"no_destination_found": "No destination found",
+		"new_error_network_already_exists": "Network {{network}} already configured for another team!",
+		"new": {
+			"saving_and_configuring_proxy": "Saving and configuring proxy...",
+			"install_proxy": "This will install a proxy on the destination to allow you to access your applications and services without any manual configuration (recommended for Docker).<br><br>Databases will have their own proxy.",
+			"add_new_destination": "Add New Destination",
+			"predefined_destinations": "Predefined destinations"
+		}
+	},
+	"sources": {
+		"local_docker": "Local Docker",
+		"remote_docker": "Remote Docker",
+		"organization_explainer": "Fill it if you would like to use an organization's as your Git Source. Otherwise your user will be used."
+	},
+	"source": {
+		"new": {
+			"git_source": "Add New Git Source",
+			"official_providers": "Official providers"
+		},
+		"no_git_sources_found": "No git sources found",
+		"delete_git_source": "Delete Git Source",
+		"permission_denied": "You do not have permission to delete a Git Source",
+		"create_new_app": "Create new {{name}} App",
+		"change_app_settings": "Change {{name}} App Settings",
+		"install_repositories": "Install Repositories",
+		"application_id": "Application ID",
+		"group_name": "Group Name",
+		"oauth_id": "OAuth ID",
+		"oauth_id_explainer": "The OAuth ID is the unique identifier of the GitLab application. <br>You can find it <span class='font-bold text-orange-600' >in the URL</span> of your GitLab OAuth Application.",
+		"register_oauth_gitlab": "Register new OAuth application on GitLab",
+		"gitlab": {
+			"self_hosted": "Instance-wide application (self-hosted)",
+			"user_owned": "User owned application",
+			"group_owned": "Group owned application",
+			"gitlab_application_type": "GitLab Application Type",
+			"already_configured": "GitLab App is already configured."
+		},
+		"github": {
+			"redirecting": "Redirecting to Github..."
+		}
+	},
+	"services": {
+		"all_email_verified": "All email verified. You can login now.",
+		"generate_www_non_www_ssl": "It will generate certificates for both www and non-www. <br>You need to have <span class='font-bold text-pink-600'>both DNS entries</span> set in advance.<br><br>Service needs to be restarted."
+	},
+	"service": {
+		"stop_service": "Stop Service",
+		"permission_denied_stop_service": "You do not have permission to stop the service.",
+		"start_service": "Start Service",
+		"permission_denied_start_service": "You do not have permission to start the service.",
+		"delete_service": "Delete Service",
+		"permission_denied_delete_service": "You do not have permission to delete a service.",
+		"no_service": "No services found"
+	},
+	"setting": {
+		"change_language": "Change Language",
+		"permission_denied": "You do not have permission to do this. \\nAsk an admin to modify your permissions.",
+		"domain_removed": "Domain removed",
+		"ssl_explainer": "If you specify <span class='text-yellow-500 font-bold'>https</span>, Coolify will be accessible only over https. SSL certificate will be generated for you.<br>If you specify <span class='text-yellow-500 font-bold'>www</span>, Coolify will be redirected (302) from non-www and vice versa.",
+		"must_remove_domain_before_changing": "Must remove the domain before you can change this setting.",
+		"registration_allowed": "Registration allowed?",
+		"registration_allowed_explainer": "Allow further registrations to the application. <br>It's turned off after the first registration.",
+		"coolify_proxy_settings": "Coolify Proxy Settings",
+		"credential_stat_explainer": "Credentials for <a class=\"text-white font-bold\" href=\"{{link}}\" target=\"_blank\">stats</a> page.",
+		"auto_update_enabled": "Auto update enabled?",
+		"auto_update_enabled_explainer": "Enable automatic updates for Coolify. It will be done automatically behind the scenes, if there is no build process running."
+	},
+	"team": {
+		"pending_invitations": "Pending invitations",
+		"accept": "Accept",
+		"delete": "Delete",
+		"member": "member(s)",
+		"root": "(root)",
+		"invited_with_permissions": "Invited to <span class=\"font-bold text-pink-600\">{{teamName}}</span> with <span class=\"font-bold text-rose-600\">{{permission}}</span> permission.",
+		"members": "Members",
+		"root_team_explainer": "This is the <span class='text-red-500 font-bold'>root</span> team. That means members of this group can manage instance wide settings and have all the priviliges in Coolify (imagine like root user on Linux).",
+		"permission": "Permission",
+		"you": "(You)",
+		"promote_to": "Promote to {{grade}}",
+		"revoke_invitation": "Revoke invitation",
+		"pending_invitation": "Pending invitation",
+		"invite_new_member": "Invite new member",
+		"send_invitation": "Send invitation",
+		"invite_only_register_explainer": "You can only invite registered users at the moment - will be extended soon.",
+		"admin": "Admin",
+		"read": "Read"
+	}
+}
diff --git a/src/lib/locales/fr.json b/src/lib/locales/fr.json
new file mode 100644
index 000000000..36f10dfb4
--- /dev/null
+++ b/src/lib/locales/fr.json
@@ -0,0 +1,322 @@
+{
+	"application": {
+		"application": "Application",
+		"build": {
+			"build_logs_of": "Créer des journaux de",
+			"finished_in": "Fini en",
+			"load_more": "Charger plus",
+			"no_logs": "Aucun journal trouvé",
+			"queued": "En file d'attente",
+			"queued_waiting_exec": "En file d'attente et en attente d'exécution.",
+			"running": "Fonctionnement",
+			"waiting_logs": "En attente des logs..."
+		},
+		"build_and_start_application": "Build et démarrer l'application",
+		"build_command": "Commande Build",
+		"build_logs": "Créer des journaux",
+		"build_pack": "Pack de Build",
+		"cant_activate_auto_deploy_without_repo": "Impossible d'activer les déploiements automatiques tant qu'une seule application n'est pas définie pour ce dépôt/branche.",
+		"configuration": {
+			"branch_already_in_use": "Cette branche est déjà utilisée par une autre application. \nLes webhooks ne fonctionneront pas dans ce cas pour les deux applications. \nÊtes-vous sûr de vouloir l'utiliser ?",
+			"buildpack": {
+				"choose_this_one": "Choisir celui-ci..."
+			},
+			"configuration_missing": "Configuration manquante",
+			"configure_build_pack": "Configurer le pack de build",
+			"configure_destination": "Configurer la destination",
+			"configure_it_now": "Configurez-le maintenant",
+			"found_lock_file": "Fichier .lock trouvé pour <span class=\"font-bold text-orange-500 pl-1\">{{packageManager}}</span>. \nL'utiliser pour les commandes prédéfinies.",
+			"loading_branches": "Chargement des branches...",
+			"loading_groups": "Chargement des groupes...",
+			"loading_projects": "Chargement des projets...",
+			"loading_repositories": "Chargement des dépôts Git...",
+			"no_branches_found": "Aucune branche trouvée",
+			"no_configurable_destination": "Aucune destination configurable trouvée",
+			"no_configurable_git": "Aucune source Git configurable trouvée",
+			"no_projects_found": "Aucun projet trouvé",
+			"no_repositories_configured": "Aucun dépôt Git configuré pour votre application.",
+			"scanning_repository_suggest_build_pack": "Analyse du dépôt pour vous suggérer un pack de Build...",
+			"select_a_branch": "Veuillez sélectionner une branche",
+			"select_a_git_source": "Sélectionnez une source Git",
+			"select_a_group": "Veuillez sélectionner un groupe",
+			"select_a_project": "Veuillez sélectionner un projet",
+			"select_a_repository": "Veuillez sélectionner un dépôt",
+			"select_a_repository_first": "Veuillez d'abord sélectionner un dépôt",
+			"select_a_repository_project": "Sélectionnez un dépôt / projet"
+		},
+		"configurations": "Configurations",
+		"confirm_to_delete": "Voulez-vous vraiment supprimer '{{name}}'?",
+		"debug_logs": "Journaux de débogage",
+		"delete_application": "Supprimer l'application",
+		"deployment_queued": "Déploiement en file d'attente.",
+		"destination": "Destination",
+		"directory_to_use_explainer": "Répertoire à utiliser comme base pour toutes les commandes.<br>Pourrait être utile avec <span class='text-green-500 font-bold'>monorepos</span>.",
+		"dns_not_set_error": "DNS non défini ou propagé pour {{domain}}.<br><br>Veuillez vérifier vos paramètres DNS.",
+		"dns_not_set_partial_error": "DNS non défini",
+		"domain_already_in_use": "Le domaine {{domain}} est déjà utilisé.",
+		"domain_fqdn": "Domaine (FQDN)",
+		"url_fqdn": "URL (FQDN)",
+		"enable_auto_deploy_webhooks": "Activez le déploiement automatique via des webhooks.",
+		"enable_automatic_deployment": "Activer le déploiement automatique",
+		"enable_debug_log_during_build": "Activez les journaux de débogage pendant la phase de build.<br><span class='text-red-500 font-bold'>Les informations sensibles</span> peuvent être visibles et enregistrées dans les journaux.",
+		"enable_mr_pr_previews": "Activer les aperçus MR/PR",
+		"enable_preview_deploy_mr_pr_requests": "Activez les déploiements de prévisualisation à partir de demandes d'extraction ou de fusion.",
+		"features": "Caractéristiques",
+		"git_repository": "Dépôt Git",
+		"git_source": "Source Git",
+		"https_explainer": "Si vous spécifiez <span class='text-green-500 font-bold'>https</span>, l'application sera accessible uniquement via https. \nUn certificat SSL sera généré pour vous.<br>Si vous spécifiez <span class='text-green-500 font-bold'>www</span>, l'application sera redirigée (302) à partir de non-www et vice versa \n.<br><br>Pour modifier le domaine, vous devez d'abord arrêter l'application.<br><br><span class='text-white font-bold'>Vous devez configurer, en avance, votre DNS pour pointer vers l'IP du serveur.</span>",
+		"install_command": "Commande d'installation",
+		"logs": "Journaux des applications",
+		"no_applications_found": "Aucune application trouvée",
+		"permission_denied_build_and_start_application": "Vous n'êtes pas autorisé à créer et à démarrer l'application.",
+		"permission_denied_delete_application": "Vous n'êtes pas autorisé à supprimer cette application",
+		"permission_denied_rebuild_application": "Vous n'êtes pas autorisé à re-build l'application.",
+		"permission_denied_stop_application": "Vous n'êtes pas autorisé à arrêter l'application.",
+		"persistent_storage": "Stockage persistant",
+		"preview": {
+			"need_during_buildtime": "Besoin pendant la build ?",
+			"no_previews_available": "Aucun aperçu disponible",
+			"redeploy": "Redéployer",
+			"setup_secret_app_first": "Vous pouvez ajouter des secrets aux déploiements PR/MR. \nVeuillez d'abord ajouter des secrets à l'application. \n<br>Utile pour créer des environnements <span class='text-green-500 font-bold'>de mise en scène</span>.",
+			"values_overwriting_app_secrets": "Ces valeurs remplacent les secrets d'application dans les déploiements PR/MR. \nUtile pour créer des environnements <span class='text-green-500 font-bold'>de mise en scène</span>."
+		},
+		"previews": "Aperçus",
+		"publish_directory_explainer": "Répertoire contenant tous les actifs à déployer. \n<br> Par exemple : <span class='text-green-500 font-bold'>dist</span>,<span class='text-green-500 font-bold'>_site</span> ou <span \nclass='text-green-500 font-bold'>public</span>.",
+		"rebuild_application": "Re-build l'application",
+		"secret": "secrets",
+		"secrets": {
+			"secret_saved": "Secret enregistré.",
+			"secrets_for": "secrets pour",
+			"use_isbuildsecret": "Utiliser isBuildSecret"
+		},
+		"settings_saved": "Paramètres sauvegardés.",
+		"ssl_explainer": "Il générera des certificats pour www et non-www. \n<br>Vous devez avoir <span class='font-bold text-green-500'>les deux entrées DNS</span> définies à l'avance.<br><br>Utile si vous prévoyez d'avoir des visiteurs sur les deux.",
+		"ssl_www_and_non_www": "Générer SSL pour www et non-www ?",
+		"start_command": "Démarrer la commande",
+		"stop_application": "Arrêter l'application",
+		"storage": {
+			"path_is_required": "Le chemin est requis.",
+			"persistent_storage_explainer": "Vous pouvez spécifier n'importe quel dossier que vous souhaitez conserver dans les déploiements. \n<br>Ceci est utile pour stocker des données telles qu'une base de données (SQLite) ou un cache.",
+			"storage_deleted": "Stockage supprimé.",
+			"storage_saved": "Stockage enregistré.",
+			"storage_updated": "Stockage mis à jour."
+		}
+	},
+	"database": {
+		"change_append_only_mode": "Changer le mode d'ajout uniquement",
+		"confirm_stop": "Êtes-vous sûr de vouloir arrêter {{name}} ?",
+		"connection_string": "Connexion string",
+		"default_database": "Base de données par défaut",
+		"delete_database": "Supprimer la base de données",
+		"generated_automatically_after_set_to_public": "Généré automatiquement après avoir été défini sur public",
+		"no_databases_found": "Aucune base de données trouvée",
+		"permission_denied_delete_database": "Vous n'êtes pas autorisé à supprimer une base de données",
+		"permission_denied_start_database": "Vous n'êtes pas autorisé à démarrer la base de données.",
+		"permission_denied_stop_database": "Vous n'êtes pas autorisé à arrêter la base de données.",
+		"select_database_type": "Sélectionnez un type de base de données",
+		"select_database_version": "Sélectionnez une version de la base de données",
+		"set_public": "Rendre public",
+		"start_database": "Démarrer la base de données",
+		"stop_database": "Arrêter la base de données",
+		"warning_append_only": "Utile si vous souhaitez restaurer des données Redis à partir d'une sauvegarde.<br><span class='font-bold text-white'>Le redémarrage de la base de données est nécessaire.</span>",
+		"warning_database_public": "Votre base de données sera accessible depuis Internet. \n<br>Prenez la sécurité au sérieux dans ce cas!"
+	},
+	"destination": {
+		"add_to_coolify": "Ajouter à Coolify",
+		"confirm_restart_proxy": "Voulez-vous vraiment redémarrer le proxy? \nTout sera reconfiguré en ~10 secondes.",
+		"coolify_proxy_restarting": "Redémarrage du Proxy Coolify...",
+		"coolify_proxy_started": "Proxy Coolify démarré!",
+		"coolify_proxy_stopped": "Proxy Coolify arrêté!",
+		"delete_destination": "Supprimer le destinataire",
+		"force_restart_proxy": "Forcer le redémarrage du proxy",
+		"new": {
+			"add_new_destination": "Ajouter une nouvelle destination",
+			"install_proxy": "Cela installera un proxy sur la destination pour vous permettre d'accéder à vos applications et services sans aucune configuration manuelle (recommandé pour Docker).<br><br>Les bases de données auront leur propre proxy.",
+			"predefined_destinations": "Destinations prédéfinies",
+			"saving_and_configuring_proxy": "Enregistrement et configuration du proxy..."
+		},
+		"new_error_network_already_exists": "Réseau {{network}} déjà configuré pour une autre équipe !",
+		"no_destination_found": "Aucune destination trouvée",
+		"permission_denied_delete_destination": "Vous n'êtes pas autorisé à supprimer cette destination",
+		"restarting_please_wait": "Redémarrage... veuillez patienter...",
+		"use_coolify_proxy": "Utiliser le Proxy Coolify ?"
+	},
+	"error": {
+		"here": "ici",
+		"you_are_lost": "Oups vous êtes perdu ! \nMais n'ayez pas peur !",
+		"you_can_find_your_way_back": "Tu peux retrouver ton chemin"
+	},
+	"forms": {
+		"action": "action",
+		"add": "Ajouter",
+		"already_used_for": "<span class=\"text-red-500\">{{type}}</span> déjà utilisé pour",
+		"api_port": "Port API",
+		"api_url": "URL de l'API",
+		"base_directory": "Répertoire de base",
+		"configuration": "Configuration",
+		"confirm_continue": "Êtes-vous sûr de continuer ?",
+		"default": "défaut",
+		"default_email_address": "Adresse e-mail par défaut",
+		"default_password": "Mot de passe par défaut",
+		"eg": "ex",
+		"email": "Adresse e-mail",
+		"engine": "Moteur",
+		"extra_config": "Configuration supplémentaire",
+		"generated_automatically_after_start": "Généré automatiquement après le démarrage",
+		"host": "Hôte",
+		"html_url": "URL HTML",
+		"ip_address": "Adresse IP",
+		"is_required": "est requis.",
+		"loading": "Chargement...",
+		"must_be_stopped_to_modify": "Doit être arrêté pour être modifié.",
+		"name": "Nom",
+		"network": "Réseau",
+		"new_password": "Nouveau mot de passe",
+		"no_actions_available": "Aucune action disponible",
+		"organization": "Organisation",
+		"password": "Mot de passe",
+		"password_again": "Mot de passe à nouveau",
+		"passwords_not_match": "Les mots de passe ne correspondent pas.",
+		"path": "Chemin",
+		"port": "Port",
+		"public_port_range": "Gamme de ports publics",
+		"public_port_range_explainer": "Ports utilisés pour exposer les bases de données/services/services internes.<br> Ajoutez-les à votre pare-feu (le cas échéant).<br><br>Vous pouvez spécifier une plage de ports, par exemple : <span class='text-yellow-500 \nfont-bold'>9000-9100</span>",
+		"publish_directory": "Publier le répertoire",
+		"remove": "Retirer",
+		"remove_domain": "Supprimer le domaine",
+		"removing": "Suppression...",
+		"root_db_password": "Mot de passe root de la base de données",
+		"root_db_user": "Utilisateur root de la base de données",
+		"root_user": "Utilisateur root",
+		"roots_password": "Mot de passe de l'utilisateur root",
+		"save": "sauvegarder",
+		"saving": "Sauvegarde...",
+		"select_a_service": "Sélectionnez un service",
+		"select_a_service_version": "Sélectionnez une version de service",
+		"set": "Régler",
+		"ssh_private_key": "Clé privée SSH",
+		"submit": "Nous faire parvenir",
+		"super_secure_new_password": "Nouveau mot de passe super sécurisé",
+		"type": "Taper",
+		"user": "Utilisateur",
+		"username": "Nom d'utilisateur",
+		"value": "Valeur",
+		"verify_emails_without_smtp": "Vérifier les e-mails sans SMTP",
+		"verifying": "Vérification",
+		"version": "Version"
+	},
+	"general": "Général",
+	"index": {
+		"applications": "Applications",
+		"dashboard": "Tableau de bord",
+		"database": "Base de données",
+		"databases": "Bases de données",
+		"destinations": "Destinations",
+		"git_sources": "Sources Git",
+		"global_settings": "Paramètres globaux",
+		"logout": "Se déconnecter",
+		"not_implemented_yet": "Pas encore implémenté",
+		"secret": "Secret",
+		"services": "Services",
+		"settings": "Réglages",
+		"team": "Équipe",
+		"teams": "Équipes"
+	},
+	"layout": {
+		"new_version": "Nouvelle version accessible. \nRechargement...",
+		"switch_to_a_different_team": "Changer d'équipe...",
+		"update_available": "Mise à jour disponible",
+		"update_done": "Mise à jour terminée.",
+		"wait_new_version_startup": "En attendant le lancement de la nouvelle version..."
+	},
+	"login": {
+		"already_logged_in": "Déjà connecté...",
+		"authenticating": "Authentification...",
+		"login": "Connexion"
+	},
+	"register": {
+		"first_user": "Vous enregistrez le premier utilisateur. \nCe sera l'administrateur de votre instance Coolify.",
+		"register": "S'inscrire"
+	},
+	"reset": {
+		"find_path_secret_key": "Vous pouvez le trouver dans ~/coolify/.env (COOLIFY_SECRET_KEY)",
+		"invalid_secret_key": "Clé secrète invalide.",
+		"reset_password": "Réinitialiser",
+		"secret_key": "Clef secrète"
+	},
+	"service": {
+		"delete_service": "Supprimer le service",
+		"no_service": "Aucun service trouvé",
+		"permission_denied_delete_service": "Vous n'êtes pas autorisé à supprimer un service.",
+		"permission_denied_start_service": "Vous n'êtes pas autorisé à démarrer le service.",
+		"permission_denied_stop_service": "Vous n'êtes pas autorisé à arrêter le service.",
+		"start_service": "Démarrer le service",
+		"stop_service": "Stopper le service"
+	},
+	"services": {
+		"all_email_verified": "Tous les e-mails sont vérifiés. \nVous pouvez vous connecter maintenant.",
+		"generate_www_non_www_ssl": "Il générera des certificats pour www et non-www. \n<br>Vous devez avoir <span class='font-bold text-pink-600'>les deux entrées DNS</span> définies à l'avance.<br><br>Le service devra être redémarré."
+	},
+	"setting": {
+		"coolify_proxy_settings": "Paramètres du proxy Coolify",
+		"credential_stat_explainer": "Identifiants pour la page <a class=\"text-white font-bold\" href=\"{{link}}\" target=\"_blank\">statistiques</a>.",
+		"domain_removed": "Domaine supprimé",
+		"must_remove_domain_before_changing": "Vous devez supprimer le domaine avant de pouvoir modifier ce paramètre.",
+		"permission_denied": "Vous n'avez pas la permission de faire cela. \n\\nDemandez à un administrateur de modifier vos autorisations.",
+		"registration_allowed": "Inscription autorisée ?",
+		"registration_allowed_explainer": "Autoriser d'autres inscriptions à l'application. \n<br>Il est désactivé après la première inscription.",
+		"ssl_explainer": "Si vous spécifiez <span class='text-yellow-500 font-bold'>https</span>, Coolify sera accessible uniquement via https. \nUn certificat SSL sera généré pour vous.<br>Si vous spécifiez <span class='text-yellow-500 font-bold'>www</span>, Coolify sera redirigé (302) à partir de non-www et vice versa."
+	},
+	"source": {
+		"application_id": "ID d'application",
+		"change_app_settings": "Modifier les paramètres de l'application {{name}}",
+		"create_new_app": "Créer une nouvelle application {{name}}",
+		"delete_git_source": "Supprimer la source Git",
+		"github": {
+			"redirecting": "Redirection vers Github..."
+		},
+		"gitlab": {
+			"already_configured": "L'application GitLab est déjà configurée.",
+			"gitlab_application_type": "Type d'application GitLab",
+			"group_owned": "Application détenue par le groupe",
+			"self_hosted": "Application à l'échelle de l'instance (auto-hébergée)",
+			"user_owned": "Application appartenant à l'utilisateur"
+		},
+		"group_name": "Nom de groupe",
+		"install_repositories": "Installer les dépôts",
+		"new": {
+			"git_source": "Ajouter une nouvelle source Git",
+			"official_providers": "Fournisseurs officiels"
+		},
+		"no_git_sources_found": "Aucune source git trouvée",
+		"oauth_id": "ID OAuth",
+		"oauth_id_explainer": "L'identifiant OAuth est l'identifiant unique de l'application GitLab. \n<br>Vous pouvez le trouver <span class='font-bold text-orange-600' >dans l'URL</span> de votre application GitLab OAuth.",
+		"permission_denied": "Vous n'êtes pas autorisé à supprimer une source Git",
+		"register_oauth_gitlab": "Enregistrer une nouvelle application OAuth sur GitLab"
+	},
+	"sources": {
+		"local_docker": "Docker local",
+		"organization_explainer": "Remplissez-le si vous souhaitez utiliser une organisation comme source Git. \nSinon, votre utilisateur sera utilisé.",
+		"remote_docker": "Station d'accueil à distance"
+	},
+	"team": {
+		"accept": "J'accepte",
+		"admin": "Administrateur",
+		"delete": "Supprimer",
+		"invite_new_member": "Inviter un nouveau membre",
+		"invite_only_register_explainer": "Vous ne pouvez inviter que des utilisateurs enregistrés pour le moment - sera bientôt prolongé.",
+		"invited_with_permissions": "Invité à <span class=\"font-bold text-pink-600\">{{teamName}}</span> avec <span class=\"font-bold text-rose-600\">{{permission}}</span \n> autorisation.",
+		"member": "membre(s)",
+		"members": "Membres",
+		"pending_invitation": "Invitation en attente",
+		"pending_invitations": "Invitations en attente",
+		"permission": "Autorisation",
+		"promote_to": "Promouvoir à {{grade}}",
+		"read": "Lire",
+		"revoke_invitation": "Révoquer l'invitation",
+		"root": "(suprême)",
+		"root_team_explainer": "Il s'agit de l'équipe <span class='text-red-500 font-bold'>suprême</span>. \nCela signifie que les membres de ce groupe peuvent gérer les paramètres à l'échelle de l'instance et avoir tous les privilèges dans Coolify (imaginez comme un utilisateur root sous Linux).",
+		"send_invitation": "Envoyer une invitation",
+		"you": "(Toi)"
+	}
+}
diff --git a/src/lib/queues/autoUpdater.ts b/src/lib/queues/autoUpdater.ts
new file mode 100644
index 000000000..4bfb995c7
--- /dev/null
+++ b/src/lib/queues/autoUpdater.ts
@@ -0,0 +1,42 @@
+import { prisma } from '$lib/database';
+import { buildQueue } from '.';
+import got from 'got';
+import { asyncExecShell, version } from '$lib/common';
+import compare from 'compare-versions';
+import { dev } from '$app/env';
+
+export default async function (): Promise<void> {
+	try {
+		const currentVersion = version;
+		const { isAutoUpdateEnabled } = await prisma.setting.findFirst();
+		if (isAutoUpdateEnabled) {
+			const versions = await got
+				.get(
+					`https://get.coollabs.io/versions.json?appId=${process.env['COOLIFY_APP_ID']}&version=${currentVersion}`
+				)
+				.json();
+			const latestVersion = versions['coolify'].main.version;
+			const isUpdateAvailable = compare(latestVersion, currentVersion);
+			if (isUpdateAvailable === 1) {
+				const activeCount = await buildQueue.getActiveCount();
+				if (activeCount === 0) {
+					if (!dev) {
+						await buildQueue.pause();
+						console.log(`Updating Coolify to ${latestVersion}.`);
+						await asyncExecShell(`docker pull coollabsio/coolify:${latestVersion}`);
+						await asyncExecShell(`env | grep COOLIFY > .env`);
+						await asyncExecShell(
+							`docker run --rm -tid --env-file .env -v /var/run/docker.sock:/var/run/docker.sock -v coolify-db coollabsio/coolify:${latestVersion} /bin/sh -c "env | grep COOLIFY > .env && echo 'TAG=${latestVersion}' >> .env && docker stop -t 0 coolify coolify-redis && docker rm coolify coolify-redis && docker compose up -d --force-recreate"`
+						);
+					} else {
+						await buildQueue.pause();
+						console.log('Updating (not really in dev mode).');
+					}
+				}
+			}
+		}
+	} catch (error) {
+		await buildQueue.resume();
+		console.log(error);
+	}
+}
diff --git a/src/lib/queues/builder.ts b/src/lib/queues/builder.ts
index 699ed4ed6..a6cf0af75 100644
--- a/src/lib/queues/builder.ts
+++ b/src/lib/queues/builder.ts
@@ -20,28 +20,22 @@ import {
 	setDefaultConfiguration
 } from '$lib/buildPacks/common';
 import yaml from 'js-yaml';
+import type { Job } from 'bullmq';
+import type { BuilderJob } from '$lib/types/builderJob';
+
 import type { ComposeFile } from '$lib/types/composeFile';
 
-export default async function (job) {
-	let {
+export default async function (job: Job<BuilderJob, void, string>): Promise<void> {
+	const {
 		id: applicationId,
 		repository,
-		branch,
-		buildPack,
 		name,
 		destinationDocker,
 		destinationDockerId,
 		gitSource,
 		build_id: buildId,
 		configHash,
-		port,
-		exposePort,
-		installCommand,
-		buildCommand,
-		startCommand,
 		fqdn,
-		baseDirectory,
-		publishDirectory,
 		projectId,
 		secrets,
 		phpModules,
@@ -52,7 +46,21 @@ export default async function (job) {
 		persistentStorage,
 		pythonWSGI,
 		pythonModule,
-		pythonVariable
+		pythonVariable,
+		denoOptions,
+		exposePort
+	} = job.data;
+	let {
+		branch,
+		buildPack,
+		port,
+		installCommand,
+		buildCommand,
+		startCommand,
+		baseDirectory,
+		publishDirectory,
+		dockerFileLocation,
+		denoMainFile
 	} = job.data;
 	const { debug } = settings;
 
@@ -68,7 +76,7 @@ export default async function (job) {
 	});
 	let imageId = applicationId;
 	let domain = getDomain(fqdn);
-	let volumes =
+	const volumes =
 		persistentStorage?.map((storage) => {
 			return `${applicationId}${storage.path.replace(/\//gi, '-')}:${
 				buildPack !== 'docker' ? '/app' : ''
@@ -103,8 +111,10 @@ export default async function (job) {
 		buildCommand = configuration.buildCommand;
 		publishDirectory = configuration.publishDirectory;
 		baseDirectory = configuration.baseDirectory;
+		dockerFileLocation = configuration.dockerFileLocation;
+		denoMainFile = configuration.denoMainFile;
 
-		let commit = await importers[gitSource.type]({
+		const commit = await importers[gitSource.type]({
 			applicationId,
 			debug,
 			workdir,
@@ -179,6 +189,7 @@ export default async function (job) {
 		}
 		if (!imageFound || deployNeeded) {
 			await copyBaseConfigurationFiles(buildPack, workdir, buildId, applicationId);
+			console.log(exposePort ? `${exposePort}:${port}` : port);
 			if (buildpacks[buildPack])
 				await buildpacks[buildPack]({
 					buildId,
@@ -197,7 +208,7 @@ export default async function (job) {
 					tag,
 					workdir,
 					docker,
-					port,
+					port: exposePort ? `${exposePort}:${port}` : port,
 					installCommand,
 					buildCommand,
 					startCommand,
@@ -206,15 +217,16 @@ export default async function (job) {
 					phpModules,
 					pythonWSGI,
 					pythonModule,
-					pythonVariable
+					pythonVariable,
+					dockerFileLocation,
+					denoMainFile,
+					denoOptions
 				});
 			else {
 				await saveBuildLog({ line: `Build pack ${buildPack} not found`, buildId, applicationId });
 				throw new Error(`Build pack ${buildPack} not found.`);
 			}
-			deployNeeded = true;
 		} else {
-			deployNeeded = false;
 			await saveBuildLog({ line: 'Nothing changed.', buildId, applicationId });
 		}
 
@@ -250,7 +262,7 @@ export default async function (job) {
 			repository,
 			branch,
 			projectId,
-			port,
+			port: exposePort ? `${exposePort}:${port}` : port,
 			commit,
 			installCommand,
 			buildCommand,
@@ -282,10 +294,21 @@ export default async function (job) {
 						volumes,
 						env_file: envFound ? [`${workdir}/.env`] : [],
 						networks: [docker.network],
-						ports: exposePort ? [`${exposePort}:${port}`] : [],
 						labels,
 						depends_on: [],
-						restart: 'always'
+						restart: 'always',
+						...(exposePort ? { ports: [`${exposePort}:${port}`] } : {}),
+						// logging: {
+						// 	driver: 'fluentd',
+						// },
+						deploy: {
+							restart_policy: {
+								condition: 'on-failure',
+								delay: '5s',
+								max_attempts: 3,
+								window: '120s'
+							}
+						}
 					}
 				},
 				networks: {
diff --git a/src/lib/queues/cleanup.ts b/src/lib/queues/cleanup.ts
index f89353531..d5dc49381 100644
--- a/src/lib/queues/cleanup.ts
+++ b/src/lib/queues/cleanup.ts
@@ -1,11 +1,10 @@
-import { dev } from '$app/env';
 import { asyncExecShell, getEngine, version } from '$lib/common';
 import { prisma } from '$lib/database';
-import { defaultProxyImageHttp, defaultProxyImageTcp } from '$lib/haproxy';
-export default async function () {
+export default async function (): Promise<void> {
 	const destinationDockers = await prisma.destinationDocker.findMany();
-	for (const destinationDocker of destinationDockers) {
-		const host = getEngine(destinationDocker.engine);
+	const engines = [...new Set(destinationDockers.map(({ engine }) => engine))];
+	for (const engine of engines) {
+		const host = getEngine(engine);
 		// Cleanup old coolify images
 		try {
 			let { stdout: images } = await asyncExecShell(
@@ -16,56 +15,23 @@ export default async function () {
 				await asyncExecShell(`DOCKER_HOST=${host} docker rmi -f ${images}`);
 			}
 		} catch (error) {
-			console.log(error);
+			//console.log(error);
 		}
 		try {
 			await asyncExecShell(`DOCKER_HOST=${host} docker container prune -f`);
 		} catch (error) {
-			console.log(error);
+			//console.log(error);
 		}
 		try {
 			await asyncExecShell(`DOCKER_HOST=${host} docker image prune -f --filter "until=2h"`);
 		} catch (error) {
-			console.log(error);
+			//console.log(error);
+		}
+		// Cleanup old images older than a day
+		try {
+			await asyncExecShell(`DOCKER_HOST=${host} docker image prune --filter "until=72h" -a -f`);
+		} catch (error) {
+			//console.log(error);
 		}
-		// Tagging images with labels
-		// try {
-		// 	const images = [
-		// 		`coollabsio/${defaultProxyImageTcp}`,
-		// 		`coollabsio/${defaultProxyImageHttp}`,
-		// 		'certbot/certbot:latest',
-		// 		'node:16.14.0-alpine',
-		// 		'alpine:latest',
-		// 		'nginx:stable-alpine',
-		// 		'node:lts',
-		// 		'php:apache',
-		// 		'rust:latest'
-		// 	];
-		// 	for (const image of images) {
-		// 		try {
-		// 			await asyncExecShell(`DOCKER_HOST=${host} docker image inspect ${image}`);
-		// 		} catch (error) {
-		// 			await asyncExecShell(
-		// 				`DOCKER_HOST=${host} docker pull ${image} && echo "FROM ${image}" | docker build --label coolify.image="true" -t "${image}" -`
-		// 			);
-		// 		}
-		// 	}
-		// } catch (error) {}
-		// if (!dev) {
-		// 	// Cleanup images that are not managed by coolify
-		// 	try {
-		// 		await asyncExecShell(
-		// 			`DOCKER_HOST=${host} docker image prune --filter 'label!=coolify.image=true' -a -f`
-		// 		);
-		// 	} catch (error) {
-		// 		console.log(error);
-		// 	}
-		// 	// Cleanup old images >3 days
-		// 	try {
-		// 		await asyncExecShell(`DOCKER_HOST=${host} docker image prune --filter "until=72h" -a -f`);
-		// 	} catch (error) {
-		// 		console.log(error);
-		// 	}
-		// }
 	}
 }
diff --git a/src/lib/queues/index.ts b/src/lib/queues/index.ts
index 736d76789..60097680d 100644
--- a/src/lib/queues/index.ts
+++ b/src/lib/queues/index.ts
@@ -1,6 +1,5 @@
 import * as Bullmq from 'bullmq';
-import { default as ProdBullmq, Job, QueueEvents, QueueScheduler } from 'bullmq';
-import cuid from 'cuid';
+import { default as ProdBullmq, QueueScheduler } from 'bullmq';
 import { dev } from '$app/env';
 import { prisma } from '$lib/database';
 
@@ -8,8 +7,10 @@ import builder from './builder';
 import logger from './logger';
 import cleanup from './cleanup';
 import proxy from './proxy';
+import proxyTcpHttp from './proxyTcpHttp';
 import ssl from './ssl';
 import sslrenewal from './sslrenewal';
+import autoUpdater from './autoUpdater';
 
 import { asyncExecShell, saveBuildLog } from '$lib/common';
 
@@ -28,22 +29,28 @@ const connectionOptions = {
 	}
 };
 
-const cron = async () => {
+const cron = async (): Promise<void> => {
 	new QueueScheduler('proxy', connectionOptions);
+	new QueueScheduler('proxyTcpHttp', connectionOptions);
 	new QueueScheduler('cleanup', connectionOptions);
 	new QueueScheduler('ssl', connectionOptions);
 	new QueueScheduler('sslRenew', connectionOptions);
+	new QueueScheduler('autoUpdater', connectionOptions);
 
 	const queue = {
 		proxy: new Queue('proxy', { ...connectionOptions }),
+		proxyTcpHttp: new Queue('proxyTcpHttp', { ...connectionOptions }),
 		cleanup: new Queue('cleanup', { ...connectionOptions }),
 		ssl: new Queue('ssl', { ...connectionOptions }),
-		sslRenew: new Queue('sslRenew', { ...connectionOptions })
+		sslRenew: new Queue('sslRenew', { ...connectionOptions }),
+		autoUpdater: new Queue('autoUpdater', { ...connectionOptions })
 	};
 	await queue.proxy.drain();
+	await queue.proxyTcpHttp.drain();
 	await queue.cleanup.drain();
 	await queue.ssl.drain();
 	await queue.sslRenew.drain();
+	await queue.autoUpdater.drain();
 
 	new Worker(
 		'proxy',
@@ -55,6 +62,16 @@ const cron = async () => {
 		}
 	);
 
+	new Worker(
+		'proxyTcpHttp',
+		async () => {
+			await proxyTcpHttp();
+		},
+		{
+			...connectionOptions
+		}
+	);
+
 	new Worker(
 		'ssl',
 		async () => {
@@ -85,22 +102,22 @@ const cron = async () => {
 		}
 	);
 
+	new Worker(
+		'autoUpdater',
+		async () => {
+			await autoUpdater();
+		},
+		{
+			...connectionOptions
+		}
+	);
+
 	await queue.proxy.add('proxy', {}, { repeat: { every: 10000 } });
+	await queue.proxyTcpHttp.add('proxyTcpHttp', {}, { repeat: { every: 10000 } });
 	await queue.ssl.add('ssl', {}, { repeat: { every: dev ? 10000 : 60000 } });
 	if (!dev) await queue.cleanup.add('cleanup', {}, { repeat: { every: 300000 } });
 	await queue.sslRenew.add('sslRenew', {}, { repeat: { every: 1800000 } });
-
-	const events = {
-		proxy: new QueueEvents('proxy', { ...connectionOptions }),
-		ssl: new QueueEvents('ssl', { ...connectionOptions })
-	};
-
-	events.proxy.on('completed', (data) => {
-		// console.log(data)
-	});
-	events.ssl.on('completed', (data) => {
-		// console.log(data)
-	});
+	await queue.autoUpdater.add('autoUpdater', {}, { repeat: { every: 60000 } });
 };
 cron().catch((error) => {
 	console.log('cron failed to start');
@@ -113,6 +130,9 @@ const buildWorker = new Worker(buildQueueName, async (job) => await builder(job)
 	concurrency: 1,
 	...connectionOptions
 });
+buildQueue.resume().catch((err) => {
+	console.log('Build queue failed to resume!', err);
+});
 
 buildWorker.on('completed', async (job: Bullmq.Job) => {
 	try {
@@ -121,7 +141,6 @@ buildWorker.on('completed', async (job: Bullmq.Job) => {
 		setTimeout(async () => {
 			await prisma.build.update({ where: { id: job.data.build_id }, data: { status: 'success' } });
 		}, 1234);
-		console.log(error);
 	} finally {
 		const workdir = `/tmp/build-sources/${job.data.repository}/${job.data.build_id}`;
 		if (!dev) await asyncExecShell(`rm -fr ${workdir}`);
@@ -137,7 +156,6 @@ buildWorker.on('failed', async (job: Bullmq.Job, failedReason) => {
 		setTimeout(async () => {
 			await prisma.build.update({ where: { id: job.data.build_id }, data: { status: 'failed' } });
 		}, 1234);
-		console.log(error);
 	} finally {
 		const workdir = `/tmp/build-sources/${job.data.repository}`;
 		if (!dev) await asyncExecShell(`rm -fr ${workdir}`);
diff --git a/src/lib/queues/logger.ts b/src/lib/queues/logger.ts
index 14665b9ad..f751f8d6f 100644
--- a/src/lib/queues/logger.ts
+++ b/src/lib/queues/logger.ts
@@ -1,7 +1,8 @@
 import { prisma } from '$lib/database';
 import { dev } from '$app/env';
+import type { Job } from 'bullmq';
 
-export default async function (job) {
+export default async function (job: Job): Promise<void> {
 	const { line, applicationId, buildId } = job.data;
 	if (dev) console.debug(`[${applicationId}] ${line}`);
 	await prisma.buildLog.create({ data: { line, buildId, time: Number(job.id), applicationId } });
diff --git a/src/lib/queues/proxy.ts b/src/lib/queues/proxy.ts
index 339e60d60..db8742e74 100644
--- a/src/lib/queues/proxy.ts
+++ b/src/lib/queues/proxy.ts
@@ -1,7 +1,10 @@
 import { ErrorHandler } from '$lib/database';
 import { configureHAProxy } from '$lib/haproxy/configuration';
 
-export default async function () {
+export default async function (): Promise<void | {
+	status: number;
+	body: { message: string; error: string };
+}> {
 	try {
 		return await configureHAProxy();
 	} catch (error) {
diff --git a/src/lib/queues/proxyTcpHttp.ts b/src/lib/queues/proxyTcpHttp.ts
new file mode 100644
index 000000000..c268d2aa0
--- /dev/null
+++ b/src/lib/queues/proxyTcpHttp.ts
@@ -0,0 +1,55 @@
+import { ErrorHandler, generateDatabaseConfiguration, prisma } from '$lib/database';
+import { startCoolifyProxy, startHttpProxy, startTcpProxy } from '$lib/haproxy';
+
+export default async function (): Promise<void | {
+	status: number;
+	body: { message: string; error: string };
+}> {
+	try {
+		// Coolify Proxy
+		const localDocker = await prisma.destinationDocker.findFirst({
+			where: { engine: '/var/run/docker.sock' }
+		});
+		if (localDocker && localDocker.isCoolifyProxyUsed) {
+			await startCoolifyProxy('/var/run/docker.sock');
+		}
+		// TCP Proxies
+		const databasesWithPublicPort = await prisma.database.findMany({
+			where: { publicPort: { not: null } },
+			include: { settings: true, destinationDocker: true }
+		});
+		for (const database of databasesWithPublicPort) {
+			const { destinationDockerId, destinationDocker, publicPort, id } = database;
+			if (destinationDockerId) {
+				const { privatePort } = generateDatabaseConfiguration(database);
+				await startTcpProxy(destinationDocker, id, publicPort, privatePort);
+			}
+		}
+		const wordpressWithFtp = await prisma.wordpress.findMany({
+			where: { ftpPublicPort: { not: null } },
+			include: { service: { include: { destinationDocker: true } } }
+		});
+		for (const ftp of wordpressWithFtp) {
+			const { service, ftpPublicPort } = ftp;
+			const { destinationDockerId, destinationDocker, id } = service;
+			if (destinationDockerId) {
+				await startTcpProxy(destinationDocker, `${id}-ftp`, ftpPublicPort, 22);
+			}
+		}
+
+		// HTTP Proxies
+		const minioInstances = await prisma.minio.findMany({
+			where: { publicPort: { not: null } },
+			include: { service: { include: { destinationDocker: true } } }
+		});
+		for (const minio of minioInstances) {
+			const { service, publicPort } = minio;
+			const { destinationDockerId, destinationDocker, id } = service;
+			if (destinationDockerId) {
+				await startHttpProxy(destinationDocker, id, publicPort, 9000);
+			}
+		}
+	} catch (error) {
+		return ErrorHandler(error.response?.body || error);
+	}
+}
diff --git a/src/lib/queues/ssl.ts b/src/lib/queues/ssl.ts
index f041153d6..84b608fae 100644
--- a/src/lib/queues/ssl.ts
+++ b/src/lib/queues/ssl.ts
@@ -1,6 +1,6 @@
 import { generateSSLCerts } from '$lib/letsencrypt';
 
-export default async function () {
+export default async function (): Promise<void> {
 	try {
 		return await generateSSLCerts();
 	} catch (error) {
diff --git a/src/lib/queues/sslrenewal.ts b/src/lib/queues/sslrenewal.ts
index 807aa34c5..4af5bae64 100644
--- a/src/lib/queues/sslrenewal.ts
+++ b/src/lib/queues/sslrenewal.ts
@@ -1,13 +1,9 @@
 import { asyncExecShell } from '$lib/common';
 import { reloadHaproxy } from '$lib/haproxy';
 
-export default async function () {
-	try {
-		await asyncExecShell(
-			`docker run --rm --name certbot-renewal -v "coolify-letsencrypt:/etc/letsencrypt" certbot/certbot --logs-dir /etc/letsencrypt/logs renew`
-		);
-		await reloadHaproxy('unix:///var/run/docker.sock');
-	} catch (error) {
-		throw error;
-	}
+export default async function (): Promise<void> {
+	await asyncExecShell(
+		`docker run --rm --name certbot-renewal -v "coolify-letsencrypt:/etc/letsencrypt" certbot/certbot --logs-dir /etc/letsencrypt/logs renew`
+	);
+	await reloadHaproxy('unix:///var/run/docker.sock');
 }
diff --git a/src/lib/settings.ts b/src/lib/settings.ts
index 211852c06..4e13f4f0f 100644
--- a/src/lib/settings.ts
+++ b/src/lib/settings.ts
@@ -1,8 +1,6 @@
 export const publicPaths = [
 	'/login',
 	'/register',
-	'/reset',
-	'/reset/password',
 	'/webhooks/success',
 	'/webhooks/github',
 	'/webhooks/github/install',
diff --git a/src/lib/store.ts b/src/lib/store.ts
index d8d1be6ce..1473d93b2 100644
--- a/src/lib/store.ts
+++ b/src/lib/store.ts
@@ -1,6 +1,8 @@
-import { writable } from 'svelte/store';
+import { writable, type Writable } from 'svelte/store';
 
-export const gitTokens = writable({
-	githubToken: null,
-	gitlabToken: null
-});
+export const gitTokens: Writable<{ githubToken: string | null; gitlabToken: string | null }> =
+	writable({
+		githubToken: null,
+		gitlabToken: null
+	});
+export const disabledButton: Writable<boolean> = writable(false);
diff --git a/src/lib/translations.ts b/src/lib/translations.ts
new file mode 100644
index 000000000..3ead4e1ec
--- /dev/null
+++ b/src/lib/translations.ts
@@ -0,0 +1,25 @@
+import i18n from 'sveltekit-i18n';
+import lang from './lang.json';
+
+/** @type {import('sveltekit-i18n').Config} */
+export const config = {
+	fallbackLocale: 'en',
+	translations: {
+		en: { lang },
+		fr: { lang }
+	},
+	loaders: [
+		{
+			locale: 'en',
+			key: '',
+			loader: async () => (await import('./locales/en.json')).default
+		},
+		{
+			locale: 'fr',
+			key: '',
+			loader: async () => (await import('./locales/fr.json')).default
+		}
+	]
+};
+
+export const { t, locales, locale, loadTranslations } = new i18n(config);
diff --git a/src/lib/types/builderJob.ts b/src/lib/types/builderJob.ts
new file mode 100644
index 000000000..606a57ece
--- /dev/null
+++ b/src/lib/types/builderJob.ts
@@ -0,0 +1,55 @@
+import type { DestinationDocker, GithubApp, GitlabApp, GitSource, Secret } from '@prisma/client';
+
+export type BuilderJob = {
+	build_id: string;
+	type: BuildType;
+	id: string;
+	name: string;
+	fqdn: string;
+	repository: string;
+	configHash: unknown;
+	branch: string;
+	buildPack: BuildPackName;
+	projectId: number;
+	port: number;
+	exposePort?: number;
+	installCommand: string;
+	buildCommand?: string;
+	startCommand?: string;
+	baseDirectory: string;
+	publishDirectory: string;
+	phpModules: string;
+	pythonWSGI: string;
+	pythonModule: string;
+	pythonVariable: string;
+	dockerFileLocation: string;
+	denoMainFile: string;
+	denoOptions: string;
+	createdAt: string;
+	updatedAt: string;
+	destinationDockerId: string;
+	destinationDocker: DestinationDocker;
+	gitSource: GitSource & { githubApp?: GithubApp; gitlabApp?: GitlabApp };
+	settings: BuilderJobSettings;
+	secrets: Secret[];
+	persistentStorage: { path: string }[];
+	pullmergeRequestId?: unknown;
+	sourceBranch?: string;
+};
+
+// TODO: Add the other build types
+export type BuildType = 'manual';
+
+// TODO: Add the other buildpack names
+export type BuildPackName = 'node' | 'docker';
+
+export type BuilderJobSettings = {
+	id: string;
+	applicationId: string;
+	dualCerts: boolean;
+	debug: boolean;
+	previews: boolean;
+	autodeploy: boolean;
+	createdAt: string;
+	updatedAt: string;
+};
diff --git a/src/lib/types/composeFile.ts b/src/lib/types/composeFile.ts
index 1e2a0723c..724a53b69 100644
--- a/src/lib/types/composeFile.ts
+++ b/src/lib/types/composeFile.ts
@@ -18,11 +18,20 @@ export type ComposeFileService = {
 	restart: ComposeFileRestartOption;
 	depends_on?: string[];
 	command?: string;
+	ports?: string[];
 	build?: {
 		context: string;
 		dockerfile: string;
 		args?: Record<string, unknown>;
 	};
+	deploy?: {
+		restart_policy?: {
+			condition?: string;
+			delay?: string;
+			max_attempts?: number;
+			window?: string;
+		};
+	};
 };
 
 export type ComposerFileVersion =
diff --git a/src/lib/types/destinations.ts b/src/lib/types/destinations.ts
new file mode 100644
index 000000000..c5a56d772
--- /dev/null
+++ b/src/lib/types/destinations.ts
@@ -0,0 +1,8 @@
+export type CreateDockerDestination = {
+	name: string;
+	engine: string;
+	remoteEngine: boolean;
+	network: string;
+	isCoolifyProxyUsed: boolean;
+	teamId: string;
+};
diff --git a/src/routes/__error.svelte b/src/routes/__error.svelte
index 6e9d9f184..1ac61d6bf 100644
--- a/src/routes/__error.svelte
+++ b/src/routes/__error.svelte
@@ -12,15 +12,18 @@
 </script>
 
 <script>
+	import { t } from '$lib/translations';
+
 	export let status;
 	export let error;
 </script>
 
 <div class="mx-auto flex h-screen flex-col items-center justify-center px-4">
 	<div class="pb-10 text-7xl font-bold">{status}</div>
-	<div class="text-3xl font-bold">Ooops you are lost! But don't be afraid!</div>
+	<div class="text-3xl font-bold">{$t('error.you_are_lost')}</div>
 	<div class="text-xl">
-		You can find your way back <a href="/" class="font-bold uppercase text-sky-400">here</a>
+		{$t('error.you_can_find_your_way_back')}
+		<a href="/" class="font-bold uppercase text-sky-400">{$t('error.here')}</a>
 	</div>
 	<div class="py-10 text-xs font-bold">
 		<pre
diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte
index 09b030328..87d55c9a3 100644
--- a/src/routes/__layout.svelte
+++ b/src/routes/__layout.svelte
@@ -1,8 +1,15 @@
 <script context="module" lang="ts">
 	import type { Load } from '@sveltejs/kit';
 	import { publicPaths } from '$lib/settings';
-
+	import { locale, loadTranslations } from '$lib/translations';
 	export const load: Load = async ({ fetch, url, session }) => {
+		const { pathname } = url;
+
+		const defaultLocale = 'en';
+		const sessionLocale = session.lang;
+		const initLocale = sessionLocale || locale.get() || defaultLocale;
+		await loadTranslations(initLocale, pathname);
+
 		if (!session.userId && !publicPaths.includes(url.pathname)) {
 			return {
 				status: 302,
@@ -39,7 +46,6 @@
 	import { asyncSleep } from '$lib/components/common';
 	import { del, get, post } from '$lib/api';
 	import { browser, dev } from '$app/env';
-
 	let isUpdateAvailable = false;
 
 	let updateStatus = {
@@ -176,7 +182,7 @@
 				<a
 					sveltekit:prefetch
 					href="/applications"
-					class="icons tooltip-right bg-coolgray-200 hover:text-green-500"
+					class="icons tooltip-green-500 tooltip-right bg-coolgray-200 hover:text-green-500"
 					class:text-green-500={$page.url.pathname.startsWith('/applications') ||
 						$page.url.pathname.startsWith('/new/application')}
 					class:bg-coolgray-500={$page.url.pathname.startsWith('/applications') ||
@@ -204,7 +210,7 @@
 				<a
 					sveltekit:prefetch
 					href="/sources"
-					class="icons tooltip-right bg-coolgray-200 hover:text-orange-500"
+					class="icons tooltip-orange-500 tooltip-right bg-coolgray-200 hover:text-orange-500"
 					class:text-orange-500={$page.url.pathname.startsWith('/sources') ||
 						$page.url.pathname.startsWith('/new/source')}
 					class:bg-coolgray-500={$page.url.pathname.startsWith('/sources') ||
@@ -234,7 +240,7 @@
 				<a
 					sveltekit:prefetch
 					href="/destinations"
-					class="icons tooltip-right bg-coolgray-200 hover:text-sky-500"
+					class="icons tooltip-sky-500 tooltip-right bg-coolgray-200 hover:text-sky-500"
 					class:text-sky-500={$page.url.pathname.startsWith('/destinations') ||
 						$page.url.pathname.startsWith('/new/destination')}
 					class:bg-coolgray-500={$page.url.pathname.startsWith('/destinations') ||
@@ -269,7 +275,7 @@
 				<a
 					sveltekit:prefetch
 					href="/databases"
-					class="icons tooltip-right bg-coolgray-200 hover:text-purple-500"
+					class="icons tooltip-purple-500 tooltip-right bg-coolgray-200 hover:text-purple-500"
 					class:text-purple-500={$page.url.pathname.startsWith('/databases') ||
 						$page.url.pathname.startsWith('/new/database')}
 					class:bg-coolgray-500={$page.url.pathname.startsWith('/databases') ||
@@ -296,7 +302,7 @@
 				<a
 					sveltekit:prefetch
 					href="/services"
-					class="icons tooltip-right bg-coolgray-200 hover:text-pink-500"
+					class="icons tooltip-pink-500 tooltip-right bg-coolgray-200 hover:text-pink-500"
 					class:text-pink-500={$page.url.pathname.startsWith('/services') ||
 						$page.url.pathname.startsWith('/new/service')}
 					class:bg-coolgray-500={$page.url.pathname.startsWith('/services') ||
@@ -348,7 +354,7 @@
 							{:else if updateStatus.success === null}
 								<svg
 									xmlns="http://www.w3.org/2000/svg"
-									class="w-8 h-9"
+									class="h-9 w-8"
 									viewBox="0 0 24 24"
 									stroke-width="1.5"
 									stroke="currentColor"
@@ -363,7 +369,7 @@
 									<line x1="16" y1="12" x2="12" y2="8" />
 								</svg>
 							{:else if updateStatus.success}
-								<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" class="w-8 h-9"
+								<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" class="h-9 w-8"
 									><path
 										fill="#DD2E44"
 										d="M11.626 7.488c-.112.112-.197.247-.268.395l-.008-.008L.134 33.141l.011.011c-.208.403.14 1.223.853 1.937.713.713 1.533 1.061 1.936.853l.01.01L28.21 24.735l-.008-.009c.147-.07.282-.155.395-.269 1.562-1.562-.971-6.627-5.656-11.313-4.687-4.686-9.752-7.218-11.315-5.656z"
@@ -408,7 +414,7 @@
 									/></svg
 								>
 							{:else}
-								<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" class="w-8 h-9"
+								<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" class="h-9 w-8"
 									><path
 										fill="#FFCC4D"
 										d="M36 18c0 9.941-8.059 18-18 18S0 27.941 0 18 8.059 0 18 0s18 8.059 18 18"
@@ -435,7 +441,7 @@
 				<a
 					sveltekit:prefetch
 					href="/iam"
-					class="icons tooltip-right bg-coolgray-200 hover:text-fuchsia-500"
+					class="icons tooltip-fuchsia-500 tooltip-right bg-coolgray-200 hover:text-fuchsia-500"
 					class:text-fuchsia-500={$page.url.pathname.startsWith('/iam')}
 					class:bg-coolgray-500={$page.url.pathname.startsWith('/iam')}
 					data-tooltip="IAM"
@@ -456,12 +462,11 @@
 						<path d="M21 21v-2a4 4 0 0 0 -3 -3.85" />
 					</svg>
 				</a>
-
 				{#if $session.teamId === '0'}
 					<a
 						sveltekit:prefetch
 						href="/settings"
-						class="icons tooltip-right bg-coolgray-200 hover:text-yellow-500"
+						class="icons tooltip-yellow-500 tooltip-right bg-coolgray-200 hover:text-yellow-500"
 						class:text-yellow-500={$page.url.pathname.startsWith('/settings')}
 						class:bg-coolgray-500={$page.url.pathname.startsWith('/settings')}
 						data-tooltip="Settings"
@@ -486,7 +491,7 @@
 				{/if}
 
 				<div
-					class="icons tooltip-right bg-coolgray-200 hover:text-red-500"
+					class="icons tooltip-red-500 tooltip-right bg-coolgray-200 hover:text-red-500"
 					data-tooltip="Logout"
 					on:click={logout}
 				>
diff --git a/src/routes/applications/[id]/__layout.svelte b/src/routes/applications/[id]/__layout.svelte
index 7b997fae4..bf634edde 100644
--- a/src/routes/applications/[id]/__layout.svelte
+++ b/src/routes/applications/[id]/__layout.svelte
@@ -17,7 +17,7 @@
 		const endpoint = `/applications/${params.id}.json`;
 		const res = await fetch(endpoint);
 		if (res.ok) {
-			let { application, isRunning, appId, githubToken, gitlabToken } = await res.json();
+			let { application, isRunning, isExited, appId, githubToken, gitlabToken } = await res.json();
 			if (!application || Object.entries(application).length === 0) {
 				return {
 					status: 302,
@@ -46,6 +46,7 @@
 				props: {
 					application,
 					isRunning,
+					isExited,
 					githubToken,
 					gitlabToken
 				},
@@ -67,27 +68,39 @@
 <script lang="ts">
 	export let application;
 	export let isRunning;
+	export let isExited;
 	export let githubToken;
 	export let gitlabToken;
 	import { page, session } from '$app/stores';
 	import { errorNotification } from '$lib/form';
 	import DeleteIcon from '$lib/components/DeleteIcon.svelte';
 	import Loading from '$lib/components/Loading.svelte';
-	import { del, post } from '$lib/api';
+	import { del, get, post } from '$lib/api';
 	import { goto } from '$app/navigation';
 	import { gitTokens } from '$lib/store';
 	import { toast } from '@zerodevx/svelte-toast';
+	import { disabledButton } from '$lib/store';
+	import { onDestroy, onMount } from 'svelte';
+	import { t } from '$lib/translations';
 
 	if (githubToken) $gitTokens.githubToken = githubToken;
 	if (gitlabToken) $gitTokens.gitlabToken = gitlabToken;
 
 	let loading = false;
+	let statusInterval;
+	$disabledButton =
+		!$session.isAdmin ||
+		!application.fqdn ||
+		!application.gitSource ||
+		!application.repository ||
+		!application.destinationDocker ||
+		!application.buildPack;
 	const { id } = $page.params;
 
 	async function handleDeploySubmit() {
 		try {
 			const { buildId } = await post(`/applications/${id}/deploy.json`, { ...application });
-			toast.push('Deployment queued.');
+			toast.push($t('application.deployment_queued'));
 			if ($page.url.pathname.startsWith(`/applications/${id}/logs/build`)) {
 				return window.location.assign(`/applications/${id}/logs/build?buildId=${buildId}`);
 			} else {
@@ -101,7 +114,7 @@
 	}
 
 	async function deleteApplication(name) {
-		const sure = confirm(`Are you sure you would like to delete '${name}'?`);
+		const sure = confirm($t('application.confirm_to_delete', { name }));
 		if (sure) {
 			loading = true;
 			try {
@@ -121,142 +134,86 @@
 			return errorNotification(error);
 		}
 	}
+	async function getStatus() {
+		statusInterval = setInterval(async () => {
+			const data = await get(`/applications/${id}.json`);
+			isRunning = data.isRunning;
+			isExited = data.isExited;
+		}, 1000);
+	}
+	onDestroy(() => {
+		clearInterval(statusInterval);
+	});
+	onMount(async () => {
+		await getStatus();
+	});
 </script>
 
 <nav class="nav-side">
 	{#if loading}
 		<Loading fullscreen cover />
 	{:else}
-		{#if application.fqdn && application.gitSource && application.repository && application.destinationDocker && application.buildPack}
-			{#if isRunning}
+		{#if isExited}
+			<a
+				href={!$disabledButton ? `/applications/${id}/logs` : null}
+				class=" icons bg-transparent tooltip-bottom text-sm flex items-center text-red-500 tooltip-red-500"
+				data-tooltip="Application exited with an error!"
+				sveltekit:prefetch
+			>
+				<svg
+					xmlns="http://www.w3.org/2000/svg"
+					class="w-6 h-6"
+					viewBox="0 0 24 24"
+					stroke-width="1.5"
+					stroke="currentcolor"
+					fill="none"
+					stroke-linecap="round"
+					stroke-linejoin="round"
+				>
+					<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+					<path
+						d="M8.7 3h6.6c.3 0 .5 .1 .7 .3l4.7 4.7c.2 .2 .3 .4 .3 .7v6.6c0 .3 -.1 .5 -.3 .7l-4.7 4.7c-.2 .2 -.4 .3 -.7 .3h-6.6c-.3 0 -.5 -.1 -.7 -.3l-4.7 -4.7c-.2 -.2 -.3 -.4 -.3 -.7v-6.6c0 -.3 .1 -.5 .3 -.7l4.7 -4.7c.2 -.2 .4 -.3 .7 -.3z"
+					/>
+					<line x1="12" y1="8" x2="12" y2="12" />
+					<line x1="12" y1="16" x2="12.01" y2="16" />
+				</svg>
+			</a>
+		{/if}
+		{#if isRunning}
+			<button
+				on:click={stopApplication}
+				title="Stop application"
+				type="submit"
+				disabled={$disabledButton}
+				class="icons bg-transparent tooltip-bottom text-sm flex items-center space-x-2 text-red-500"
+				data-tooltip={$session.isAdmin
+					? $t('application.stop_application')
+					: $t('application.permission_denied_stop_application')}
+			>
+				<svg
+					xmlns="http://www.w3.org/2000/svg"
+					class="w-6 h-6"
+					viewBox="0 0 24 24"
+					stroke-width="1.5"
+					stroke="currentColor"
+					fill="none"
+					stroke-linecap="round"
+					stroke-linejoin="round"
+				>
+					<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+					<rect x="6" y="5" width="4" height="14" rx="1" />
+					<rect x="14" y="5" width="4" height="14" rx="1" />
+				</svg>
+			</button>
+			<form on:submit|preventDefault={handleDeploySubmit}>
 				<button
-					on:click={stopApplication}
-					title="Stop application"
+					title="Rebuild application"
 					type="submit"
-					disabled={!$session.isAdmin}
-					class="icons bg-transparent tooltip-bottom text-sm flex items-center space-x-2 text-red-500"
+					disabled={$disabledButton}
+					class="icons bg-transparent tooltip-bottom text-sm flex items-center space-x-2 hover:text-green-500"
 					data-tooltip={$session.isAdmin
-						? 'Stop application'
-						: 'You do not have permission to stop the application.'}
-				>
-					<svg
-						xmlns="http://www.w3.org/2000/svg"
-						class="w-6 h-6"
-						viewBox="0 0 24 24"
-						stroke-width="1.5"
-						stroke="currentColor"
-						fill="none"
-						stroke-linecap="round"
-						stroke-linejoin="round"
-					>
-						<path stroke="none" d="M0 0h24v24H0z" fill="none" />
-						<rect x="6" y="5" width="4" height="14" rx="1" />
-						<rect x="14" y="5" width="4" height="14" rx="1" />
-					</svg>
-				</button>
-				<form on:submit|preventDefault={handleDeploySubmit}>
-					<button
-						title="Rebuild application"
-						type="submit"
-						disabled={!$session.isAdmin}
-						class="icons bg-transparent tooltip-bottom text-sm flex items-center space-x-2 hover:text-green-500"
-						data-tooltip={$session.isAdmin
-							? 'Rebuild application'
-							: 'You do not have permission to rebuild application.'}
-					>
-						<svg
-							xmlns="http://www.w3.org/2000/svg"
-							class="w-6 h-6"
-							viewBox="0 0 24 24"
-							stroke-width="1.5"
-							stroke="currentColor"
-							fill="none"
-							stroke-linecap="round"
-							stroke-linejoin="round"
-						>
-							<path stroke="none" d="M0 0h24v24H0z" fill="none" />
-							<path
-								d="M16.3 5h.7a2 2 0 0 1 2 2v10a2 2 0 0 1 -2 2h-10a2 2 0 0 1 -2 -2v-10a2 2 0 0 1 2 -2h5l-2.82 -2.82m0 5.64l2.82 -2.82"
-								transform="rotate(-45 12 12)"
-							/>
-						</svg>
-					</button>
-				</form>
-			{:else}
-				<form on:submit|preventDefault={handleDeploySubmit}>
-					<button
-						title="Build and start application"
-						type="submit"
-						disabled={!$session.isAdmin}
-						class="icons bg-transparent tooltip-bottom text-sm flex items-center space-x-2 text-green-500"
-						data-tooltip={$session.isAdmin
-							? 'Build and start application'
-							: 'You do not have permission to Build and start application.'}
-					>
-						<svg
-							xmlns="http://www.w3.org/2000/svg"
-							class="w-6 h-6"
-							viewBox="0 0 24 24"
-							stroke-width="1.5"
-							stroke="currentColor"
-							fill="none"
-							stroke-linecap="round"
-							stroke-linejoin="round"
-						>
-							<path stroke="none" d="M0 0h24v24H0z" fill="none" />
-							<path d="M7 4v16l13 -8z" />
-						</svg>
-					</button>
-				</form>
-			{/if}
-
-			<div class="border border-stone-700 h-8" />
-			<a
-				href="/applications/{id}"
-				sveltekit:prefetch
-				class="hover:text-yellow-500 rounded"
-				class:text-yellow-500={$page.url.pathname === `/applications/${id}`}
-				class:bg-coolgray-500={$page.url.pathname === `/applications/${id}`}
-			>
-				<button
-					title="Configurations"
-					class="icons bg-transparent tooltip-bottom text-sm disabled:text-red-500"
-					data-tooltip="Configurations"
-				>
-					<svg
-						xmlns="http://www.w3.org/2000/svg"
-						class="h-6 w-6"
-						viewBox="0 0 24 24"
-						stroke-width="1.5"
-						stroke="currentColor"
-						fill="none"
-						stroke-linecap="round"
-						stroke-linejoin="round"
-					>
-						<path stroke="none" d="M0 0h24v24H0z" fill="none" />
-						<rect x="4" y="8" width="4" height="4" />
-						<line x1="6" y1="4" x2="6" y2="8" />
-						<line x1="6" y1="12" x2="6" y2="20" />
-						<rect x="10" y="14" width="4" height="4" />
-						<line x1="12" y1="4" x2="12" y2="14" />
-						<line x1="12" y1="18" x2="12" y2="20" />
-						<rect x="16" y="5" width="4" height="4" />
-						<line x1="18" y1="4" x2="18" y2="5" />
-						<line x1="18" y1="9" x2="18" y2="20" />
-					</svg></button
-				></a
-			>
-			<a
-				href="/applications/{id}/secrets"
-				sveltekit:prefetch
-				class="hover:text-pink-500 rounded"
-				class:text-pink-500={$page.url.pathname === `/applications/${id}/secrets`}
-				class:bg-coolgray-500={$page.url.pathname === `/applications/${id}/secrets`}
-			>
-				<button
-					title="Secret"
-					class="icons bg-transparent tooltip-bottom text-sm disabled:text-red-500"
-					data-tooltip="Secret"
+						? 'Rebuild application'
+						: 'You do not have permission to rebuild application.'}
 				>
 					<svg
 						xmlns="http://www.w3.org/2000/svg"
@@ -270,24 +227,22 @@
 					>
 						<path stroke="none" d="M0 0h24v24H0z" fill="none" />
 						<path
-							d="M12 3a12 12 0 0 0 8.5 3a12 12 0 0 1 -8.5 15a12 12 0 0 1 -8.5 -15a12 12 0 0 0 8.5 -3"
+							d="M16.3 5h.7a2 2 0 0 1 2 2v10a2 2 0 0 1 -2 2h-10a2 2 0 0 1 -2 -2v-10a2 2 0 0 1 2 -2h5l-2.82 -2.82m0 5.64l2.82 -2.82"
+							transform="rotate(-45 12 12)"
 						/>
-						<circle cx="12" cy="11" r="1" />
-						<line x1="12" y1="12" x2="12" y2="14.5" />
-					</svg></button
-				></a
-			>
-			<a
-				href="/applications/{id}/storage"
-				sveltekit:prefetch
-				class="hover:text-pink-500 rounded"
-				class:text-pink-500={$page.url.pathname === `/applications/${id}/storage`}
-				class:bg-coolgray-500={$page.url.pathname === `/applications/${id}/storage`}
-			>
+					</svg>
+				</button>
+			</form>
+		{:else}
+			<form on:submit|preventDefault={handleDeploySubmit}>
 				<button
-					title="Persistent Storage"
-					class="icons bg-transparent tooltip-bottom text-sm disabled:text-red-500"
-					data-tooltip="Persistent Storage"
+					title="Build and start application"
+					type="submit"
+					disabled={$disabledButton}
+					class="icons bg-transparent tooltip-bottom text-sm flex items-center space-x-2 text-green-500"
+					data-tooltip={$session.isAdmin
+						? 'Build and start application'
+						: 'You do not have permission to Build and start application.'}
 				>
 					<svg
 						xmlns="http://www.w3.org/2000/svg"
@@ -300,122 +255,223 @@
 						stroke-linejoin="round"
 					>
 						<path stroke="none" d="M0 0h24v24H0z" fill="none" />
-						<ellipse cx="12" cy="6" rx="8" ry="3" />
-						<path d="M4 6v6a8 3 0 0 0 16 0v-6" />
-						<path d="M4 12v6a8 3 0 0 0 16 0v-6" />
+						<path d="M7 4v16l13 -8z" />
 					</svg>
-				</button></a
-			>
-			<a
-				href="/applications/{id}/previews"
-				sveltekit:prefetch
-				class="hover:text-orange-500 rounded"
-				class:text-orange-500={$page.url.pathname === `/applications/${id}/previews`}
-				class:bg-coolgray-500={$page.url.pathname === `/applications/${id}/previews`}
-			>
-				<button
-					title="Previews"
-					class="icons bg-transparent tooltip-bottom text-sm disabled:text-red-500"
-					data-tooltip="Previews"
-				>
-					<svg
-						xmlns="http://www.w3.org/2000/svg"
-						class="w-6 h-6"
-						viewBox="0 0 24 24"
-						stroke-width="1.5"
-						stroke="currentColor"
-						fill="none"
-						stroke-linecap="round"
-						stroke-linejoin="round"
-					>
-						<path stroke="none" d="M0 0h24v24H0z" fill="none" />
-						<circle cx="7" cy="18" r="2" />
-						<circle cx="7" cy="6" r="2" />
-						<circle cx="17" cy="12" r="2" />
-						<line x1="7" y1="8" x2="7" y2="16" />
-						<path d="M7 8a4 4 0 0 0 4 4h4" />
-					</svg></button
-				></a
-			>
-			<div class="border border-stone-700 h-8" />
-			<a
-				href="/applications/{id}/logs"
-				sveltekit:prefetch
-				class="hover:text-sky-500 rounded"
-				class:text-sky-500={$page.url.pathname === `/applications/${id}/logs`}
-				class:bg-coolgray-500={$page.url.pathname === `/applications/${id}/logs`}
-			>
-				<button
-					title="Application Logs"
-					class="icons bg-transparent tooltip-bottom text-sm disabled:text-red-500 "
-					data-tooltip="Application Logs"
-				>
-					<svg
-						xmlns="http://www.w3.org/2000/svg"
-						class="h-6 w-6"
-						viewBox="0 0 24 24"
-						stroke-width="1.5"
-						stroke="currentColor"
-						fill="none"
-						stroke-linecap="round"
-						stroke-linejoin="round"
-					>
-						<path stroke="none" d="M0 0h24v24H0z" fill="none" />
-						<path d="M3 19a9 9 0 0 1 9 0a9 9 0 0 1 9 0" />
-						<path d="M3 6a9 9 0 0 1 9 0a9 9 0 0 1 9 0" />
-						<line x1="3" y1="6" x2="3" y2="19" />
-						<line x1="12" y1="6" x2="12" y2="19" />
-						<line x1="21" y1="6" x2="21" y2="19" />
-					</svg>
-				</button></a
-			>
-			<a
-				href="/applications/{id}/logs/build"
-				sveltekit:prefetch
-				class="hover:text-red-500 rounded"
-				class:text-red-500={$page.url.pathname === `/applications/${id}/logs/build`}
-				class:bg-coolgray-500={$page.url.pathname === `/applications/${id}/logs/build`}
-			>
-				<button
-					title="Build Logs"
-					class="icons bg-transparent tooltip-bottom text-sm disabled:text-red-500 "
-					data-tooltip="Build Logs"
-				>
-					<svg
-						xmlns="http://www.w3.org/2000/svg"
-						class="h-6 w-6"
-						viewBox="0 0 24 24"
-						stroke-width="1.5"
-						stroke="currentColor"
-						fill="none"
-						stroke-linecap="round"
-						stroke-linejoin="round"
-					>
-						<path stroke="none" d="M0 0h24v24H0z" fill="none" />
-						<circle cx="19" cy="13" r="2" />
-						<circle cx="4" cy="17" r="2" />
-						<circle cx="13" cy="17" r="2" />
-						<line x1="13" y1="19" x2="4" y2="19" />
-						<line x1="4" y1="15" x2="13" y2="15" />
-						<path d="M8 12v-5h2a3 3 0 0 1 3 3v5" />
-						<path d="M5 15v-2a1 1 0 0 1 1 -1h7" />
-						<path d="M19 11v-7l-6 7" />
-					</svg>
-				</button></a
-			>
-			<div class="border border-stone-700 h-8" />
+				</button>
+			</form>
 		{/if}
 
+		<div class="border border-coolgray-500 h-8" />
+		<a
+			href={!$disabledButton ? `/applications/${id}` : null}
+			sveltekit:prefetch
+			class="hover:text-yellow-500 rounded"
+			class:text-yellow-500={$page.url.pathname === `/applications/${id}`}
+			class:bg-coolgray-500={$page.url.pathname === `/applications/${id}`}
+		>
+			<button
+				title="Configurations"
+				disabled={$disabledButton}
+				class="icons bg-transparent tooltip-bottom text-sm"
+				data-tooltip="Configurations"
+			>
+				<svg
+					xmlns="http://www.w3.org/2000/svg"
+					class="h-6 w-6"
+					viewBox="0 0 24 24"
+					stroke-width="1.5"
+					stroke="currentColor"
+					fill="none"
+					stroke-linecap="round"
+					stroke-linejoin="round"
+				>
+					<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+					<rect x="4" y="8" width="4" height="4" />
+					<line x1="6" y1="4" x2="6" y2="8" />
+					<line x1="6" y1="12" x2="6" y2="20" />
+					<rect x="10" y="14" width="4" height="4" />
+					<line x1="12" y1="4" x2="12" y2="14" />
+					<line x1="12" y1="18" x2="12" y2="20" />
+					<rect x="16" y="5" width="4" height="4" />
+					<line x1="18" y1="4" x2="18" y2="5" />
+					<line x1="18" y1="9" x2="18" y2="20" />
+				</svg></button
+			></a
+		>
+		<a
+			href={!$disabledButton ? `/applications/${id}/secrets` : null}
+			sveltekit:prefetch
+			class="hover:text-pink-500 rounded"
+			class:text-pink-500={$page.url.pathname === `/applications/${id}/secrets`}
+			class:bg-coolgray-500={$page.url.pathname === `/applications/${id}/secrets`}
+		>
+			<button
+				title="Secret"
+				disabled={$disabledButton}
+				class="icons bg-transparent tooltip-bottom text-sm"
+				data-tooltip="Secret"
+			>
+				<svg
+					xmlns="http://www.w3.org/2000/svg"
+					class="w-6 h-6"
+					viewBox="0 0 24 24"
+					stroke-width="1.5"
+					stroke="currentColor"
+					fill="none"
+					stroke-linecap="round"
+					stroke-linejoin="round"
+				>
+					<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+					<path
+						d="M12 3a12 12 0 0 0 8.5 3a12 12 0 0 1 -8.5 15a12 12 0 0 1 -8.5 -15a12 12 0 0 0 8.5 -3"
+					/>
+					<circle cx="12" cy="11" r="1" />
+					<line x1="12" y1="12" x2="12" y2="14.5" />
+				</svg></button
+			></a
+		>
+		<a
+			href={!$disabledButton ? `/applications/${id}/storage` : null}
+			sveltekit:prefetch
+			class="hover:text-pink-500 rounded"
+			class:text-pink-500={$page.url.pathname === `/applications/${id}/storage`}
+			class:bg-coolgray-500={$page.url.pathname === `/applications/${id}/storage`}
+		>
+			<button
+				title="Persistent Storage"
+				disabled={$disabledButton}
+				class="icons bg-transparent tooltip-bottom text-sm"
+				data-tooltip="Persistent Storage"
+			>
+				<svg
+					xmlns="http://www.w3.org/2000/svg"
+					class="w-6 h-6"
+					viewBox="0 0 24 24"
+					stroke-width="1.5"
+					stroke="currentColor"
+					fill="none"
+					stroke-linecap="round"
+					stroke-linejoin="round"
+				>
+					<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+					<ellipse cx="12" cy="6" rx="8" ry="3" />
+					<path d="M4 6v6a8 3 0 0 0 16 0v-6" />
+					<path d="M4 12v6a8 3 0 0 0 16 0v-6" />
+				</svg>
+			</button></a
+		>
+		<a
+			href={!$disabledButton ? `/applications/${id}/previews` : null}
+			sveltekit:prefetch
+			class="hover:text-orange-500 rounded"
+			class:text-orange-500={$page.url.pathname === `/applications/${id}/previews`}
+			class:bg-coolgray-500={$page.url.pathname === `/applications/${id}/previews`}
+		>
+			<button
+				title="Previews"
+				disabled={$disabledButton}
+				class="icons bg-transparent tooltip-bottom text-sm"
+				data-tooltip="Previews"
+			>
+				<svg
+					xmlns="http://www.w3.org/2000/svg"
+					class="w-6 h-6"
+					viewBox="0 0 24 24"
+					stroke-width="1.5"
+					stroke="currentColor"
+					fill="none"
+					stroke-linecap="round"
+					stroke-linejoin="round"
+				>
+					<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+					<circle cx="7" cy="18" r="2" />
+					<circle cx="7" cy="6" r="2" />
+					<circle cx="17" cy="12" r="2" />
+					<line x1="7" y1="8" x2="7" y2="16" />
+					<path d="M7 8a4 4 0 0 0 4 4h4" />
+				</svg></button
+			></a
+		>
+		<div class="border border-coolgray-500 h-8" />
+		<a
+			href={!$disabledButton ? `/applications/${id}/logs` : null}
+			sveltekit:prefetch
+			class="hover:text-sky-500 rounded"
+			class:text-sky-500={$page.url.pathname === `/applications/${id}/logs`}
+			class:bg-coolgray-500={$page.url.pathname === `/applications/${id}/logs`}
+		>
+			<button
+				title={$t('application.logs')}
+				disabled={$disabledButton}
+				class="icons bg-transparent tooltip-bottom text-sm"
+				data-tooltip={$t('application.logs')}
+			>
+				<svg
+					xmlns="http://www.w3.org/2000/svg"
+					class="h-6 w-6"
+					viewBox="0 0 24 24"
+					stroke-width="1.5"
+					stroke="currentColor"
+					fill="none"
+					stroke-linecap="round"
+					stroke-linejoin="round"
+				>
+					<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+					<path d="M3 19a9 9 0 0 1 9 0a9 9 0 0 1 9 0" />
+					<path d="M3 6a9 9 0 0 1 9 0a9 9 0 0 1 9 0" />
+					<line x1="3" y1="6" x2="3" y2="19" />
+					<line x1="12" y1="6" x2="12" y2="19" />
+					<line x1="21" y1="6" x2="21" y2="19" />
+				</svg>
+			</button></a
+		>
+		<a
+			href={!$disabledButton ? `/applications/${id}/logs/build` : null}
+			sveltekit:prefetch
+			class="hover:text-red-500 rounded"
+			class:text-red-500={$page.url.pathname === `/applications/${id}/logs/build`}
+			class:bg-coolgray-500={$page.url.pathname === `/applications/${id}/logs/build`}
+		>
+			<button
+				title="Build Logs"
+				disabled={$disabledButton}
+				class="icons bg-transparent tooltip-bottom text-sm"
+				data-tooltip="Build Logs"
+			>
+				<svg
+					xmlns="http://www.w3.org/2000/svg"
+					class="h-6 w-6"
+					viewBox="0 0 24 24"
+					stroke-width="1.5"
+					stroke="currentColor"
+					fill="none"
+					stroke-linecap="round"
+					stroke-linejoin="round"
+				>
+					<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+					<circle cx="19" cy="13" r="2" />
+					<circle cx="4" cy="17" r="2" />
+					<circle cx="13" cy="17" r="2" />
+					<line x1="13" y1="19" x2="4" y2="19" />
+					<line x1="4" y1="15" x2="13" y2="15" />
+					<path d="M8 12v-5h2a3 3 0 0 1 3 3v5" />
+					<path d="M5 15v-2a1 1 0 0 1 1 -1h7" />
+					<path d="M19 11v-7l-6 7" />
+				</svg>
+			</button></a
+		>
+		<div class="border border-coolgray-500 h-8" />
+
 		<button
 			on:click={() => deleteApplication(application.name)}
-			title="Delete application"
+			title={$t('application.delete_application')}
 			type="submit"
 			disabled={!$session.isAdmin}
 			class:hover:text-red-500={$session.isAdmin}
 			class="icons bg-transparent  tooltip-bottom text-sm"
 			data-tooltip={$session.isAdmin
-				? 'Delete application'
-				: 'You do not have permission to delete this application'}
+				? $t('application.delete_application')
+				: $t('application.permission_denied_delete_application')}
 		>
 			<DeleteIcon />
 		</button>
diff --git a/src/routes/applications/[id]/check.json.ts b/src/routes/applications/[id]/check.json.ts
index 56ea05ee1..db794e9bd 100644
--- a/src/routes/applications/[id]/check.json.ts
+++ b/src/routes/applications/[id]/check.json.ts
@@ -5,6 +5,7 @@ import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 import { promises as dns } from 'dns';
 import getPort from 'get-port';
+import { t } from '$lib/translations';
 
 export const post: RequestHandler = async (event) => {
 	const { status, body } = await getUserDetails(event);
@@ -19,7 +20,9 @@ export const post: RequestHandler = async (event) => {
 		const found = await db.isDomainConfigured({ id, fqdn });
 		if (found) {
 			throw {
-				message: `Domain ${getDomain(fqdn).replace('www.', '')} is already used.`
+				message: t.get('application.domain_already_in_use', {
+					domain: getDomain(fqdn).replace('www.', '')
+				})
 			};
 		}
 		if (!dev && !forceSave) {
@@ -37,7 +40,7 @@ export const post: RequestHandler = async (event) => {
 			if (localIp?.length > 0) {
 				if (ip?.length === 0 || !ip.includes(localIp[0])) {
 					throw {
-						message: `DNS not set or propogated for ${domain}.<br><br>Please check your DNS settings.`
+						message: t.get('application.dns_not_set_error', { domain: domain })
 					};
 				}
 			}
diff --git a/src/routes/applications/[id]/configuration/_BuildPack.svelte b/src/routes/applications/[id]/configuration/_BuildPack.svelte
index dadbc9dde..80dac5766 100644
--- a/src/routes/applications/[id]/configuration/_BuildPack.svelte
+++ b/src/routes/applications/[id]/configuration/_BuildPack.svelte
@@ -5,6 +5,7 @@
 	import { post } from '$lib/api';
 	import { findBuildPack } from '$lib/components/templates';
 	import { errorNotification } from '$lib/form';
+	import { t } from '$lib/translations';
 
 	const { id } = $page.params;
 	const from = $page.url.searchParams.get('from');
@@ -19,13 +20,14 @@
 			const tempBuildPack = JSON.parse(
 				JSON.stringify(findBuildPack(buildPack.name, packageManager))
 			);
+
 			delete tempBuildPack.name;
 			delete tempBuildPack.fancyName;
 			delete tempBuildPack.color;
 			delete tempBuildPack.hoverColor;
 
 			if (foundConfig.buildPack !== name) {
-				await post(`/applications/${id}.json`, { ...tempBuildPack });
+				await post(`/applications/${id}.json`, { ...tempBuildPack, buildPack: name });
 			}
 			await post(`/applications/${id}/configuration/buildpack.json`, { buildPack: name });
 			return await goto(from || `/applications/${id}`);
@@ -42,7 +44,9 @@
 			buildPack.name && buildPack.color}"
 		><span>{buildPack.fancyName}</span>
 		{#if !scanning && foundConfig?.name === buildPack.name}
-			<span class="absolute bottom-0 pb-2 text-xs">Choose this one...</span>
+			<span class="absolute bottom-0 pb-2 text-xs"
+				>{$t('application.configuration.buildpack.choose_this_one')}</span
+			>
 		{/if}
 	</button>
 </form>
diff --git a/src/routes/applications/[id]/configuration/_GithubRepositories.svelte b/src/routes/applications/[id]/configuration/_GithubRepositories.svelte
index 06e58be58..80a4d246e 100644
--- a/src/routes/applications/[id]/configuration/_GithubRepositories.svelte
+++ b/src/routes/applications/[id]/configuration/_GithubRepositories.svelte
@@ -7,6 +7,7 @@
 	import { errorNotification } from '$lib/form';
 	import { onMount } from 'svelte';
 	import { gitTokens } from '$lib/store';
+	import { t } from '$lib/translations';
 
 	const { id } = $page.params;
 	const from = $page.url.searchParams.get('from');
@@ -36,8 +37,15 @@
 		});
 	}
 
+	async function loadBranchesByPage(page = 0) {
+		return await get(`${apiUrl}/repos/${selected.repository}/branches?per_page=100&page=${page}`, {
+			Authorization: `token ${$gitTokens.githubToken}`
+		});
+	}
+
 	let reposSelectOptions;
 	let branchSelectOptions;
+
 	async function loadRepositories() {
 		let page = 1;
 		let reposCount = 0;
@@ -58,24 +66,28 @@
 		}));
 	}
 	async function loadBranches(event) {
+		branches = [];
 		selected.repository = event.detail.value;
-		loading.branches = true;
-		selected.branch = undefined;
 		selected.projectId = repositories.find((repo) => repo.full_name === selected.repository).id;
-		try {
-			branches = await get(`${apiUrl}/repos/${selected.repository}/branches`, {
-				Authorization: `token ${$gitTokens.githubToken}`
-			});
-			branchSelectOptions = branches.map((branch) => ({
-				value: branch.name,
-				label: branch.name
-			}));
-			return;
-		} catch ({ error }) {
-			return errorNotification(error);
-		} finally {
-			loading.branches = false;
+		let page = 1;
+		let branchCount = 0;
+		loading.branches = true;
+		const loadedBranches = await loadBranchesByPage();
+		branches = branches.concat(loadedBranches);
+		branchCount = branches.length;
+		if (branchCount === 100) {
+			while (branchCount === 100) {
+				page = page + 1;
+				const nextBranches = await loadBranchesByPage(page);
+				branches = branches.concat(nextBranches);
+				branchCount = nextBranches.length;
+			}
 		}
+		loading.branches = false;
+		branchSelectOptions = branches.map((branch) => ({
+			value: branch.name,
+			label: branch.name
+		}));
 	}
 	async function isBranchAlreadyUsed(event) {
 		selected.branch = event.detail.value;
@@ -84,9 +96,7 @@
 				`/applications/${id}/configuration/repository.json?repository=${selected.repository}&branch=${selected.branch}`
 			);
 			if (data.used) {
-				const sure = confirm(
-					`This branch is already used by another application. Webhooks won't work in this case for both applications. Are you sure you want to use it?`
-				);
+				const sure = confirm($t('application.configuration.branch_already_in_use'));
 				if (sure) {
 					selected.autodeploy = false;
 					showSave = true;
@@ -160,36 +170,44 @@
 
 {#if repositories.length === 0 && loading.repositories === false}
 	<div class="flex-col text-center">
-		<div class="pb-4">No repositories configured for your Git Application.</div>
-		<a href={`/sources/${application.gitSource.id}`}><button>Configure it now</button></a>
+		<div class="pb-4">{$t('application.configuration.no_repositories_configured')}</div>
+		<a href={`/sources/${application.gitSource.id}`}
+			><button>{$t('application.configuration.configure_it_now')}</button></a
+		>
 	</div>
 {:else}
 	<form on:submit|preventDefault={handleSubmit} class="flex flex-col justify-center text-center">
 		<div class="flex-col space-y-3 md:space-y-0 space-x-1">
-			<div class="flex gap-4">
+			<div class="flex-col md:flex gap-4">
 				<div class="custom-select-wrapper">
 					<Select
 						placeholder={loading.repositories
-							? 'Loading repositories ...'
-							: 'Please select a repository'}
+							? $t('application.configuration.loading_repositories')
+							: $t('application.configuration.select_a_repository')}
 						id="repository"
+						showIndicator={true}
+						isWaiting={loading.repositories}
 						on:select={loadBranches}
 						items={reposSelectOptions}
 						isDisabled={loading.repositories}
+						isClearable={false}
 					/>
 				</div>
 				<input class="hidden" bind:value={selected.projectId} name="projectId" />
 				<div class="custom-select-wrapper">
 					<Select
 						placeholder={loading.branches
-							? 'Loading branches ...'
+							? $t('application.configuration.loading_branches')
 							: !selected.repository
-							? 'Please select a repository first'
-							: 'Please select a branch'}
-						id="repository"
+							? $t('application.configuration.select_a_repository_first')
+							: $t('application.configuration.select_a_branch')}
+						isWaiting={loading.branches}
+						showIndicator={selected.repository}
+						id="branches"
 						on:select={isBranchAlreadyUsed}
 						items={branchSelectOptions}
 						isDisabled={loading.branches || !selected.repository}
+						isClearable={false}
 					/>
 				</div>
 			</div>
@@ -200,15 +218,8 @@
 				type="submit"
 				disabled={!showSave}
 				class:bg-orange-600={showSave}
-				class:hover:bg-orange-500={showSave}>Save</button
+				class:hover:bg-orange-500={showSave}>{$t('forms.save')}</button
 			>
-			<!-- <button class="w-40"
-				><a
-					class="no-underline"
-					href="{apiUrl}/apps/{application.gitSource.githubApp.name}/installations/new"
-					>Modify Repositories</a
-				></button
-			> -->
 		</div>
 	</form>
 {/if}
diff --git a/src/routes/applications/[id]/configuration/_GitlabRepositories.svelte b/src/routes/applications/[id]/configuration/_GitlabRepositories.svelte
index d83f56d17..a836b3507 100644
--- a/src/routes/applications/[id]/configuration/_GitlabRepositories.svelte
+++ b/src/routes/applications/[id]/configuration/_GitlabRepositories.svelte
@@ -9,6 +9,7 @@
 	import { goto } from '$app/navigation';
 	import { del, get, post, put } from '$lib/api';
 	import { gitTokens } from '$lib/store';
+	import { t } from '$lib/translations';
 
 	const { id } = $page.params;
 	const from = $page.url.searchParams.get('from');
@@ -139,9 +140,7 @@
 				`/applications/${id}/configuration/repository.json?repository=${selected.project.path_with_namespace}&branch=${selected.branch.name}`
 			);
 			if (data.used) {
-				const sure = confirm(
-					`This branch is already used by another application. Webhooks won't work in this case for both applications. Are you sure you want to use it?`
-				);
+				const sure = confirm($t('application.configuration.branch_already_in_use'));
 				if (sure) {
 					autodeploy = false;
 					showSave = true;
@@ -270,11 +269,11 @@
 	<div class="flex flex-col space-y-2 px-4 xl:flex-row xl:space-y-0 xl:space-x-2 ">
 		{#if loading.base}
 			<select name="group" disabled class="w-96">
-				<option selected value="">Loading groups...</option>
+				<option selected value="">{$t('application.configuration.loading_groups')}</option>
 			</select>
 		{:else}
 			<select name="group" class="w-96" bind:value={selected.group} on:change={loadProjects}>
-				<option value="" disabled selected>Please select a group</option>
+				<option value="" disabled selected>{$t('application.configuration.select_a_group')}</option>
 				{#each groups as group}
 					<option value={group}>{group.full_name}</option>
 				{/each}
@@ -282,7 +281,7 @@
 		{/if}
 		{#if loading.projects}
 			<select name="project" disabled class="w-96">
-				<option selected value="">Loading projects...</option>
+				<option selected value="">{$t('application.configuration.loading_projects')}</option>
 			</select>
 		{:else if !loading.projects && projects.length > 0}
 			<select
@@ -292,20 +291,24 @@
 				on:change={loadBranches}
 				disabled={!selected.group}
 			>
-				<option value="" disabled selected>Please select a project</option>
+				<option value="" disabled selected
+					>{$t('application.configuration.select_a_project')}</option
+				>
 				{#each projects as project}
 					<option value={project}>{project.name}</option>
 				{/each}
 			</select>
 		{:else}
 			<select name="project" disabled class="w-96">
-				<option disabled selected value="">No projects found</option>
+				<option disabled selected value=""
+					>{$t('application.configuration.no_projects_found')}</option
+				>
 			</select>
 		{/if}
 
 		{#if loading.branches}
 			<select name="branch" disabled class="w-96">
-				<option selected value="">Loading branches...</option>
+				<option selected value="">{$t('application.configuration.loading_branches')}</option>
 			</select>
 		{:else if !loading.branches && branches.length > 0}
 			<select
@@ -315,14 +318,17 @@
 				on:change={isBranchAlreadyUsed}
 				disabled={!selected.project}
 			>
-				<option value="" disabled selected>Please select a branch</option>
+				<option value="" disabled selected>{$t('application.configuration.select_a_branch')}</option
+				>
 				{#each branches as branch}
 					<option value={branch}>{branch.name}</option>
 				{/each}
 			</select>
 		{:else}
 			<select name="project" disabled class="w-96">
-				<option disabled selected value="">No branches found</option>
+				<option disabled selected value=""
+					>{$t('application.configuration.no_branches_found')}</option
+				>
 			</select>
 		{/if}
 	</div>
@@ -334,7 +340,7 @@
 			disabled={!showSave || loading.save}
 			class:bg-orange-600={showSave && !loading.save}
 			class:hover:bg-orange-500={showSave && !loading.save}
-			>{loading.save ? 'Saving...' : 'Save'}</button
+			>{loading.save ? $t('forms.saving') : $t('forms.save')}</button
 		>
 	</div>
 </form>
diff --git a/src/routes/applications/[id]/configuration/buildpack.svelte b/src/routes/applications/[id]/configuration/buildpack.svelte
index c885f3bf5..437c65cfa 100644
--- a/src/routes/applications/[id]/configuration/buildpack.svelte
+++ b/src/routes/applications/[id]/configuration/buildpack.svelte
@@ -31,11 +31,12 @@
 
 	import { buildPacks, findBuildPack, scanningTemplates } from '$lib/components/templates';
 	import BuildPack from './_BuildPack.svelte';
-	import { page, session } from '$app/stores';
+	import { page } from '$app/stores';
 	import { get } from '$lib/api';
 	import { errorNotification } from '$lib/form';
 	import { gitTokens } from '$lib/store';
 	import { browser } from '$app/env';
+	import { t } from '$lib/translations';
 
 	const { id } = $page.params;
 
@@ -204,24 +205,27 @@
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">Configure Build Pack</div>
+	<div class="mr-4 text-2xl tracking-tight">
+		{$t('application.configuration.configure_build_pack')}
+	</div>
 </div>
 
 {#if scanning}
 	<div class="flex justify-center space-x-1 p-6 font-bold">
-		<div class="text-xl tracking-tight">Scanning repository to suggest a build pack for you...</div>
+		<div class="text-xl tracking-tight">
+			{$t('application.configuration.scanning_repository_suggest_build_pack')}
+		</div>
 	</div>
 {:else}
 	{#if packageManager === 'yarn' || packageManager === 'pnpm'}
 		<div class="flex justify-center p-6">
-			Found lock file for <span class="font-bold text-orange-500 pl-1">{packageManager}</span>.
-			Using it for predefined commands commands.
+			{@html $t('application.configuration.found_lock_file', { packageManager })}
 		</div>
 	{/if}
 	<div class="max-w-7xl mx-auto flex flex-wrap justify-center">
 		{#each buildPacks as buildPack}
 			<div class="p-2">
-				<BuildPack {buildPack} {scanning} {packageManager} bind:foundConfig />
+				<BuildPack {buildPack} {scanning} bind:foundConfig />
 			</div>
 		{/each}
 	</div>
diff --git a/src/routes/applications/[id]/configuration/destination.svelte b/src/routes/applications/[id]/configuration/destination.svelte
index 1b0c6df5c..2e68d658c 100644
--- a/src/routes/applications/[id]/configuration/destination.svelte
+++ b/src/routes/applications/[id]/configuration/destination.svelte
@@ -33,6 +33,7 @@
 	import { errorNotification } from '$lib/form';
 	import { goto } from '$app/navigation';
 	import { post } from '$lib/api';
+	import { t } from '$lib/translations';
 
 	const { id } = $page.params;
 	const from = $page.url.searchParams.get('from');
@@ -60,12 +61,14 @@
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">Configure Destination</div>
+	<div class="mr-4 text-2xl tracking-tight">
+		{$t('application.configuration.configure_destination')}
+	</div>
 </div>
 <div class="flex flex-col justify-center">
 	{#if !destinations || ownDestinations.length === 0}
 		<div class="flex-col">
-			<div class="pb-2">No configurable Destination found</div>
+			<div class="pb-2">{$t('application.configuration.no_configurable_destination')}</div>
 			<div class="flex justify-center">
 				<a href="/new/destination" sveltekit:prefetch class="add-icon bg-sky-600 hover:bg-sky-500">
 					<svg
diff --git a/src/routes/applications/[id]/configuration/repository.svelte b/src/routes/applications/[id]/configuration/repository.svelte
index 330222861..822c0f74f 100644
--- a/src/routes/applications/[id]/configuration/repository.svelte
+++ b/src/routes/applications/[id]/configuration/repository.svelte
@@ -18,6 +18,8 @@
 </script>
 
 <script lang="ts">
+	import { t } from '$lib/translations';
+
 	export let application;
 	export let appId;
 
@@ -26,7 +28,9 @@
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">Select a Repository / Project</div>
+	<div class="mr-4 text-2xl tracking-tight">
+		{$t('application.configuration.select_a_repository_project')}
+	</div>
 </div>
 <div class="flex flex-wrap justify-center">
 	{#if application.gitSource.type === 'github'}
diff --git a/src/routes/applications/[id]/configuration/source.svelte b/src/routes/applications/[id]/configuration/source.svelte
index e5c05ebdd..95d29a81a 100644
--- a/src/routes/applications/[id]/configuration/source.svelte
+++ b/src/routes/applications/[id]/configuration/source.svelte
@@ -33,6 +33,7 @@
 	import { errorNotification } from '$lib/form';
 	import { goto } from '$app/navigation';
 	import { post } from '$lib/api';
+	import { t } from '$lib/translations';
 
 	const { id } = $page.params;
 	const from = $page.url.searchParams.get('from');
@@ -72,12 +73,14 @@
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">Select a Git Source</div>
+	<div class="mr-4 text-2xl tracking-tight">
+		{$t('application.configuration.select_a_git_source')}
+	</div>
 </div>
 <div class="flex flex-col justify-center">
 	{#if !filteredSources || ownSources.length === 0}
 		<div class="flex-col">
-			<div class="pb-2 text-center">No configurable Git Source found</div>
+			<div class="pb-2 text-center">{$t('application.configuration.no_configurable_git')}</div>
 			<div class="flex justify-center">
 				<button on:click={newSource} class="add-icon bg-orange-600 hover:bg-orange-500">
 					<svg
@@ -139,7 +142,7 @@
 							<div class="font-bold text-xl text-center truncate">{source.name}</div>
 							{#if source.gitlabApp && !source.gitlabAppId}
 								<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
-									Configuration missing
+									{$t('application.configuration.configuration_missing')}
 								</div>
 							{/if}
 						</button>
diff --git a/src/routes/applications/[id]/deploy.json.ts b/src/routes/applications/[id]/deploy.json.ts
index e8589cf16..98673154f 100644
--- a/src/routes/applications/[id]/deploy.json.ts
+++ b/src/routes/applications/[id]/deploy.json.ts
@@ -36,6 +36,7 @@ export const post: RequestHandler = async (event) => {
 			data: {
 				id: buildId,
 				applicationId: id,
+				branch: applicationFound.branch,
 				destinationDockerId: applicationFound.destinationDocker.id,
 				gitSourceId: applicationFound.gitSource.id,
 				githubAppId: applicationFound.gitSource.githubApp?.id,
diff --git a/src/routes/applications/[id]/index.json.ts b/src/routes/applications/[id]/index.json.ts
index 4b9e88d79..560ec21e7 100644
--- a/src/routes/applications/[id]/index.json.ts
+++ b/src/routes/applications/[id]/index.json.ts
@@ -1,7 +1,7 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
 import { ErrorHandler } from '$lib/database';
-import { checkContainer } from '$lib/haproxy';
+import { checkContainer, isContainerExited } from '$lib/haproxy';
 import type { RequestHandler } from '@sveltejs/kit';
 import jsonwebtoken from 'jsonwebtoken';
 import { get as getRequest } from '$lib/api';
@@ -16,17 +16,20 @@ export const get: RequestHandler = async (event) => {
 
 	const appId = process.env['COOLIFY_APP_ID'];
 	let isRunning = false;
+	let isExited = false;
 	let githubToken = event.locals.cookies?.githubToken || null;
 	let gitlabToken = event.locals.cookies?.gitlabToken || null;
 	try {
 		const application = await db.getApplication({ id, teamId });
 		if (application.destinationDockerId) {
 			isRunning = await checkContainer(application.destinationDocker.engine, id);
+			isExited = await isContainerExited(application.destinationDocker.engine, id);
 		}
 		return {
 			status: 200,
 			body: {
 				isRunning,
+				isExited,
 				application,
 				appId,
 				githubToken,
@@ -58,16 +61,16 @@ export const post: RequestHandler = async (event) => {
 		publishDirectory,
 		pythonWSGI,
 		pythonModule,
-		pythonVariable
+		pythonVariable,
+		dockerFileLocation,
+		denoMainFile,
+		denoOptions
 	} = await event.request.json();
 	if (port) port = Number(port);
 	if (exposePort) {
 		exposePort = Number(exposePort);
-		const publicPort = await getPort({ port: exposePort });
-		if (exposePort !== publicPort) {
-			exposePort = -1;
-		}
 	}
+	if (denoOptions) denoOptions = denoOptions.trim();
 
 	try {
 		const defaultConfiguration = await setDefaultConfiguration({
@@ -77,7 +80,9 @@ export const post: RequestHandler = async (event) => {
 			startCommand,
 			buildCommand,
 			publishDirectory,
-			baseDirectory
+			baseDirectory,
+			dockerFileLocation,
+			denoMainFile
 		});
 		await db.configureApplication({
 			id,
@@ -94,6 +99,9 @@ export const post: RequestHandler = async (event) => {
 			pythonWSGI,
 			pythonModule,
 			pythonVariable,
+			dockerFileLocation,
+			denoMainFile,
+			denoOptions,
 			...defaultConfiguration
 		});
 		return { status: 201 };
diff --git a/src/routes/applications/[id]/index.svelte b/src/routes/applications/[id]/index.svelte
index c7c0ca125..07bcd4f36 100644
--- a/src/routes/applications/[id]/index.svelte
+++ b/src/routes/applications/[id]/index.svelte
@@ -48,6 +48,8 @@
 	import { post } from '$lib/api';
 	import cuid from 'cuid';
 	import { browser } from '$app/env';
+	import { disabledButton } from '$lib/store';
+	import { t } from '$lib/translations';
 	const { id } = $page.params;
 
 	let domainEl: HTMLInputElement;
@@ -68,11 +70,6 @@
 			value: 'Gunicorn',
 			label: 'Gunicorn'
 		}
-		// },
-		// {
-		// 	value: 'uWSGI',
-		// 	label: 'uWSGI'
-		// }
 	];
 
 	if (browser && window.location.hostname === 'demo.coolify.io' && !application.fqdn) {
@@ -105,7 +102,7 @@
 				branch: application.branch,
 				projectId: application.projectId
 			});
-			return toast.push('Settings saved.');
+			return toast.push($t('application.settings_saved'));
 		} catch ({ error }) {
 			if (name === 'debug') {
 				debug = !debug;
@@ -131,9 +128,10 @@
 				exposePort: application.exposePort
 			});
 			await post(`/applications/${id}.json`, { ...application });
-			return window.location.reload();
+			$disabledButton = false;
+			return toast.push('Configurations saved.');
 		} catch ({ error }) {
-			if (error?.startsWith('DNS not set')) {
+			if (error?.startsWith($t('application.dns_not_set_partial_error'))) {
 				forceSave = true;
 			}
 			return errorNotification(error);
@@ -176,6 +174,29 @@
 			</svg></a
 		>
 	{/if}
+
+	{#if application.exposePort}
+		<a
+			href={`${window.location.origin.split(':').slice(0, 2).join(':')}:${application.exposePort}`}
+			target="_blank"
+			class="icons tooltip-bottom flex items-center bg-transparent text-sm"
+			><svg
+				xmlns="http://www.w3.org/2000/svg"
+				class="h-6 w-6"
+				viewBox="0 0 24 24"
+				stroke-width="1.5"
+				stroke="currentColor"
+				fill="none"
+				stroke-linecap="round"
+				stroke-linejoin="round"
+			>
+				<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+				<path d="M11 7h-5a2 2 0 0 0 -2 2v9a2 2 0 0 0 2 2h9a2 2 0 0 0 2 -2v-5" />
+				<line x1="10" y1="14" x2="20" y2="4" />
+				<polyline points="15 4 20 4 20 9" />
+			</svg></a
+		>
+	{/if}
 	<a
 		href="{application.gitSource.htmlUrl}/{application.repository}/tree/{application.branch}"
 		target="_blank"
@@ -223,7 +244,7 @@
 	<!-- svelte-ignore missing-declaration -->
 	<form on:submit|preventDefault={handleSubmit} class="py-4">
 		<div class="flex space-x-1 pb-5 font-bold">
-			<div class="title">General</div>
+			<div class="title">{$t('general')}</div>
 			{#if $session.isAdmin}
 				<button
 					type="submit"
@@ -232,13 +253,17 @@
 					class:hover:bg-green-500={!loading}
 					class:hover:bg-orange-400={forceSave}
 					disabled={loading}
-					>{loading ? 'Saving...' : forceSave ? 'Are you sure to continue?' : 'Save'}</button
+					>{loading
+						? $t('forms.saving')
+						: forceSave
+						? $t('forms.confirm_continue')
+						: $t('forms.save')}</button
 				>
 			{/if}
 		</div>
 		<div class="grid grid-flow-row gap-2 px-10">
 			<div class="mt-2 grid grid-cols-2 items-center">
-				<label for="name" class="text-base font-bold text-stone-100">Name</label>
+				<label for="name" class="text-base font-bold text-stone-100">{$t('forms.name')}</label>
 				<input
 					readonly={!$session.isAdmin}
 					name="name"
@@ -248,7 +273,9 @@
 				/>
 			</div>
 			<div class="grid grid-cols-2 items-center">
-				<label for="gitSource" class="text-base font-bold text-stone-100">Git Source</label>
+				<label for="gitSource" class="text-base font-bold text-stone-100"
+					>{$t('application.git_source')}</label
+				>
 				<a
 					href={$session.isAdmin
 						? `/applications/${id}/configuration/source?from=/applications/${id}`
@@ -263,7 +290,9 @@
 				>
 			</div>
 			<div class="grid grid-cols-2 items-center">
-				<label for="repository" class="text-base font-bold text-stone-100">Git Repository</label>
+				<label for="repository" class="text-base font-bold text-stone-100"
+					>{$t('application.git_repository')}</label
+				>
 				<a
 					href={$session.isAdmin
 						? `/applications/${id}/configuration/repository?from=/applications/${id}&to=/applications/${id}/configuration/buildpack`
@@ -278,7 +307,9 @@
 				>
 			</div>
 			<div class="grid grid-cols-2 items-center">
-				<label for="buildPack" class="text-base font-bold text-stone-100">Build Pack</label>
+				<label for="buildPack" class="text-base font-bold text-stone-100"
+					>{$t('application.build_pack')}</label
+				>
 				<a
 					href={$session.isAdmin
 						? `/applications/${id}/configuration/buildpack?from=/applications/${id}`
@@ -294,7 +325,9 @@
 				>
 			</div>
 			<div class="grid grid-cols-2 items-center pb-8">
-				<label for="destination" class="text-base font-bold text-stone-100">Destination</label>
+				<label for="destination" class="text-base font-bold text-stone-100"
+					>{$t('application.destination')}</label
+				>
 				<div class="no-underline">
 					<input
 						value={application.destinationDocker.name}
@@ -306,20 +339,20 @@
 			</div>
 		</div>
 		<div class="flex space-x-1 py-5 font-bold">
-			<div class="title">Application</div>
+			<div class="title">{$t('application.application')}</div>
 		</div>
 		<div class="grid grid-flow-row gap-2 px-10">
 			<div class="grid grid-cols-2">
 				<div class="flex-col">
-					<label for="fqdn" class="pt-2 text-base font-bold text-stone-100">URL (FQDN)</label>
+					<label for="fqdn" class="pt-2 text-base font-bold text-stone-100"
+						>{$t('application.url_fqdn')}</label
+					>
 					{#if browser && window.location.hostname === 'demo.coolify.io'}
 						<Explainer
 							text="<span class='text-white font-bold'>You can use the predefined random url name or enter your own domain name.</span>"
 						/>
 					{/if}
-					<Explainer
-						text="If you specify <span class='text-green-500 font-bold'>https</span>, the application will be accessible only over https. SSL certificate will be generated for you.<br>If you specify <span class='text-green-500 font-bold'>www</span>, the application will be redirected (302) from non-www and vice versa.<br><br>To modify the url, you must first stop the application.<br><br><span class='text-white font-bold'>You must set your DNS to point to the server IP in advance.</span>"
-					/>
+					<Explainer text={$t('application.https_explainer')} />
 				</div>
 				<input
 					readonly={!$session.isAdmin || isRunning}
@@ -334,12 +367,12 @@
 			</div>
 			<div class="grid grid-cols-2 items-center pb-8">
 				<Setting
-					dataTooltip="Must be stopped to modify."
+					dataTooltip={$t('forms.must_be_stopped_to_modify')}
 					disabled={isRunning}
 					isCenter={false}
 					bind:setting={dualCerts}
-					title="Generate SSL for www and non-www?"
-					description="It will generate certificates for both www and non-www. <br>You need to have <span class='font-bold text-green-500'>both DNS entries</span> set in advance.<br><br>Useful if you expect to have visitors on both."
+					title={$t('application.ssl_www_and_non_www')}
+					description={$t('application.ssl_explainer')}
 					on:click={() => !isRunning && changeSettings('dualCerts')}
 				/>
 			</div>
@@ -378,13 +411,13 @@
 			{/if}
 			{#if !staticDeployments.includes(application.buildPack)}
 				<div class="grid grid-cols-2 items-center">
-					<label for="port" class="text-base font-bold text-stone-100">Port</label>
+					<label for="port" class="text-base font-bold text-stone-100">{$t('forms.port')}</label>
 					<input
 						readonly={!$session.isAdmin}
 						name="port"
 						id="port"
 						bind:value={application.port}
-						placeholder={application.buildPack === 'python' ? '8000' : '3000'}
+						placeholder="{$t('forms.default')}: 'python' ? '8000' : '3000'"
 					/>
 				</div>
 			{/if}
@@ -403,63 +436,105 @@
 			{#if !notNodeDeployments.includes(application.buildPack)}
 				<div class="grid grid-cols-2 items-center">
 					<label for="installCommand" class="text-base font-bold text-stone-100"
-						>Install Command</label
+						>{$t('application.install_command')}</label
 					>
 					<input
 						readonly={!$session.isAdmin}
 						name="installCommand"
 						id="installCommand"
 						bind:value={application.installCommand}
-						placeholder="default: yarn install"
+						placeholder="{$t('forms.default')}: yarn install"
 					/>
 				</div>
 				<div class="grid grid-cols-2 items-center">
-					<label for="buildCommand" class="text-base font-bold text-stone-100">Build Command</label>
+					<label for="buildCommand" class="text-base font-bold text-stone-100"
+						>{$t('application.build_command')}</label
+					>
 					<input
 						readonly={!$session.isAdmin}
 						name="buildCommand"
 						id="buildCommand"
 						bind:value={application.buildCommand}
-						placeholder="default: yarn build"
+						placeholder="{$t('forms.default')}: yarn build"
 					/>
 				</div>
 				<div class="grid grid-cols-2 items-center">
-					<label for="startCommand" class="text-base font-bold text-stone-100">Start Command</label>
+					<label for="startCommand" class="text-base font-bold text-stone-100"
+						>{$t('application.start_command')}</label
+					>
 					<input
 						readonly={!$session.isAdmin}
 						name="startCommand"
 						id="startCommand"
 						bind:value={application.startCommand}
-						placeholder="default: yarn start"
+						placeholder="{$t('forms.default')}: yarn start"
+					/>
+				</div>
+			{/if}
+			{#if application.buildPack === 'docker'}
+				<div class="grid grid-cols-2 items-center">
+					<label for="dockerFileLocation" class="text-base font-bold text-stone-100"
+						>Dockerfile Location</label
+					>
+					<input
+						readonly={!$session.isAdmin}
+						name="dockerFileLocation"
+						id="dockerFileLocation"
+						bind:value={application.dockerFileLocation}
+						placeholder="default: /Dockerfile"
+					/>
+					<Explainer
+						text="Does not rely on Base Directory. <br>Should be absolute path, like <span class='text-green-500 font-bold'>/data/Dockerfile</span> or <span class='text-green-500 font-bold'>/Dockerfile.</span>"
+					/>
+				</div>
+			{/if}
+			{#if application.buildPack === 'deno'}
+				<div class="grid grid-cols-2 items-center">
+					<label for="denoMainFile" class="text-base font-bold text-stone-100">Main File</label>
+					<input
+						readonly={!$session.isAdmin}
+						name="denoMainFile"
+						id="denoMainFile"
+						bind:value={application.denoMainFile}
+						placeholder="default: main.ts"
+					/>
+				</div>
+				<div class="grid grid-cols-2 items-center">
+					<label for="denoOptions" class="text-base font-bold text-stone-100">Arguments</label>
+					<input
+						readonly={!$session.isAdmin}
+						name="denoOptions"
+						id="denoOptions"
+						bind:value={application.denoOptions}
+						placeholder="eg: --allow-net --allow-hrtime --config path/to/file.json"
+					/>
+					<Explainer
+						text="List of arguments to pass to <span class='text-green-500 font-bold'>deno run</span> command. Could include permissions, configurations files, etc."
 					/>
 				</div>
 			{/if}
 			<div class="grid grid-cols-2 items-center">
 				<div class="flex-col">
 					<label for="baseDirectory" class="pt-2 text-base font-bold text-stone-100"
-						>Base Directory</label
+						>{$t('forms.base_directory')}</label
 					>
-					<Explainer
-						text="Directory to use as the base for all commands.<br>Could be useful with <span class='text-green-500 font-bold'>monorepos</span>."
-					/>
+					<Explainer text={$t('application.directory_to_use_explainer')} />
 				</div>
 				<input
 					readonly={!$session.isAdmin}
 					name="baseDirectory"
 					id="baseDirectory"
 					bind:value={application.baseDirectory}
-					placeholder="default: /"
+					placeholder="{$t('forms.default')}: /"
 				/>
 			</div>
 			{#if !notNodeDeployments.includes(application.buildPack)}
 				<div class="grid grid-cols-2 items-center">
 					<div class="flex-col">
 						<label for="publishDirectory" class="pt-2 text-base font-bold text-stone-100"
-							>Publish Directory</label
+							>{$t('forms.publish_directory')}</label
 						>
-						<Explainer
-							text="Directory containing all the assets for deployment. <br> For example: <span class='text-green-500 font-bold'>dist</span>,<span class='text-green-500 font-bold'>_site</span> or <span class='text-green-500 font-bold'>public</span>."
-						/>
+						<Explainer text={$t('application.publish_directory_explainer')} />
 					</div>
 
 					<input
@@ -467,14 +542,14 @@
 						name="publishDirectory"
 						id="publishDirectory"
 						bind:value={application.publishDirectory}
-						placeholder=" default: /"
+						placeholder=" {$t('forms.default')}: /"
 					/>
 				</div>
 			{/if}
 		</div>
 	</form>
 	<div class="flex space-x-1 pb-5 font-bold">
-		<div class="title">Features</div>
+		<div class="title">{$t('application.features')}</div>
 	</div>
 	<div class="px-10 pb-10">
 		<div class="grid grid-cols-2 items-center">
@@ -482,8 +557,8 @@
 				isCenter={false}
 				bind:setting={autodeploy}
 				on:click={() => changeSettings('autodeploy')}
-				title="Enable Automatic Deployment"
-				description="Enable automatic deployment through webhooks."
+				title={$t('application.enable_automatic_deployment')}
+				description={$t('application.enable_auto_deploy_webhooks')}
 			/>
 		</div>
 		<div class="grid grid-cols-2 items-center">
@@ -491,8 +566,8 @@
 				isCenter={false}
 				bind:setting={previews}
 				on:click={() => changeSettings('previews')}
-				title="Enable MR/PR Previews"
-				description="Enable preview deployments from pull or merge requests."
+				title={$t('application.enable_mr_pr_previews')}
+				description={$t('application.enable_preview_deploy_mr_pr_requests')}
 			/>
 		</div>
 		<div class="grid grid-cols-2 items-center">
@@ -500,8 +575,8 @@
 				isCenter={false}
 				bind:setting={debug}
 				on:click={() => changeSettings('debug')}
-				title="Debug Logs"
-				description="Enable debug logs during build phase.<br><span class='text-red-500 font-bold'>Sensitive information</span> could be visible and saved in logs."
+				title={$t('application.debug_logs')}
+				description={$t('application.enable_debug_log_during_build')}
 			/>
 		</div>
 	</div>
diff --git a/src/routes/applications/[id]/logs/build/_BuildLog.svelte b/src/routes/applications/[id]/logs/build/_BuildLog.svelte
index 4379d2d27..9a8dea4cc 100644
--- a/src/routes/applications/[id]/logs/build/_BuildLog.svelte
+++ b/src/routes/applications/[id]/logs/build/_BuildLog.svelte
@@ -10,6 +10,7 @@
 	import LoadingLogs from '../_Loading.svelte';
 	import { get } from '$lib/api';
 	import { errorNotification } from '$lib/form';
+	import { t } from '$lib/translations';
 
 	let logs = [];
 	let loading = true;
@@ -84,7 +85,7 @@
 			<LoadingLogs />
 		{/if}
 		{#if currentStatus === 'queued'}
-			<div class="text-center font-bold text-xl">Queued and waiting for execution.</div>
+			<div class="text-center font-bold text-xl">{$t('application.build.queued_waiting_exec')}</div>
 		{:else}
 			<div class="flex justify-end sticky top-0 p-2">
 				<button
diff --git a/src/routes/applications/[id]/logs/build/index.svelte b/src/routes/applications/[id]/logs/build/index.svelte
index aa321172b..8c91a2f7f 100644
--- a/src/routes/applications/[id]/logs/build/index.svelte
+++ b/src/routes/applications/[id]/logs/build/index.svelte
@@ -21,12 +21,12 @@
 
 <script lang="ts">
 	import { page } from '$app/stores';
-	import { changeQueryParams, dateOptions, getDomain } from '$lib/components/common';
+	import { changeQueryParams, dateOptions } from '$lib/components/common';
 
 	import BuildLog from './_BuildLog.svelte';
 	import { get } from '$lib/api';
 	import { errorNotification } from '$lib/form';
-	import { goto } from '$app/navigation';
+	import { t } from '$lib/translations';
 
 	export let builds;
 	export let application;
@@ -87,7 +87,9 @@
 
 <div class="flex items-center space-x-2 p-5 px-6 font-bold">
 	<div class="-mb-5 flex-col">
-		<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">Build Logs</div>
+		<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">
+			{$t('application.build_logs')}
+		</div>
 		<span class="text-xs">{application.name} </span>
 	</div>
 
@@ -174,7 +176,7 @@
 				>
 					<div class="flex-col px-2">
 						<div class="text-sm font-bold">
-							{application.branch}
+							{build.branch || application.branch}
 						</div>
 						<div class="text-xs">
 							{build.type}
@@ -184,12 +186,14 @@
 
 					<div class="w-48 text-center text-xs">
 						{#if build.status === 'running'}
-							<div class="font-bold">Running</div>
+							<div class="font-bold">{$t('application.build.running')}</div>
 						{:else if build.status === 'queued'}
-							<div class="font-bold">Queued</div>
+							<div class="font-bold">{$t('application.build.queued')}</div>
 						{:else}
 							<div>{build.since}</div>
-							<div>Finished in <span class="font-bold">{build.took}s</span></div>
+							<div>
+								{$t('application.build.finished_in')} <span class="font-bold">{build.took}s</span>
+							</div>
 						{/if}
 					</div>
 				</div>
@@ -198,7 +202,8 @@
 		{#if !noMoreBuilds}
 			{#if buildCount > 5}
 				<div class="flex space-x-2">
-					<button disabled={noMoreBuilds} class="w-full" on:click={loadMoreBuilds}>Load More</button
+					<button disabled={noMoreBuilds} class="w-full" on:click={loadMoreBuilds}
+						>{$t('application.build.load_more')}</button
 					>
 				</div>
 			{/if}
@@ -213,5 +218,5 @@
 	</div>
 </div>
 {#if buildCount === 0}
-	<div class="text-center text-xl font-bold">No logs found</div>
+	<div class="text-center text-xl font-bold">{$t('application.build.no_logs')}</div>
 {/if}
diff --git a/src/routes/applications/[id]/logs/index.json.ts b/src/routes/applications/[id]/logs/index.json.ts
index f3ab6b9ca..9ef7653bc 100644
--- a/src/routes/applications/[id]/logs/index.json.ts
+++ b/src/routes/applications/[id]/logs/index.json.ts
@@ -10,6 +10,10 @@ export const get: RequestHandler = async (event) => {
 	if (status === 401) return { status, body };
 
 	const { id } = event.params;
+	let since = event.url.searchParams.get('since') || 0;
+	if (since !== 0) {
+		since = dayjs(since).unix();
+	}
 	try {
 		const { destinationDockerId, destinationDocker } = await db.prisma.application.findUnique({
 			where: { id },
@@ -20,13 +24,22 @@ export const get: RequestHandler = async (event) => {
 			try {
 				const container = await docker.engine.getContainer(id);
 				if (container) {
+					const logs = (
+						await container.logs({
+							stdout: true,
+							stderr: true,
+							timestamps: true,
+							since,
+							tail: 5000
+						})
+					)
+						.toString()
+						.split('\n')
+						.map((l) => l.slice(8))
+						.filter((a) => a);
 					return {
 						body: {
-							logs: (await container.logs({ stdout: true, stderr: true, timestamps: true }))
-								.toString()
-								.split('\n')
-								.map((l) => l.slice(8))
-								.filter((a) => a)
+							logs
 						}
 					};
 				}
diff --git a/src/routes/applications/[id]/logs/index.svelte b/src/routes/applications/[id]/logs/index.svelte
index 30b6be9a0..81306a71f 100644
--- a/src/routes/applications/[id]/logs/index.svelte
+++ b/src/routes/applications/[id]/logs/index.svelte
@@ -24,19 +24,21 @@
 	export let application;
 	import { page } from '$app/stores';
 	import LoadingLogs from './_Loading.svelte';
-	import { getDomain } from '$lib/components/common';
 	import { get } from '$lib/api';
 	import { errorNotification } from '$lib/form';
+	import { t } from '$lib/translations';
 
 	let loadLogsInterval = null;
 	let logs = [];
-	let followingBuild;
+	let lastLog = null;
 	let followingInterval;
+	let followingLogs;
 	let logsEl;
+	let position = 0;
 
 	const { id } = $page.params;
 	onMount(async () => {
-		loadLogs();
+		loadAllLogs();
 		loadLogsInterval = setInterval(() => {
 			loadLogs();
 		}, 1000);
@@ -45,25 +47,53 @@
 		clearInterval(loadLogsInterval);
 		clearInterval(followingInterval);
 	});
+	async function loadAllLogs() {
+		try {
+			const data: any = await get(`/applications/${id}/logs.json`);
+			if (data?.logs) {
+				lastLog = data.logs[data.logs.length - 1];
+				logs = data.logs;
+			}
+		} catch (error) {
+			console.log(error);
+			return errorNotification(error);
+		}
+	}
 	async function loadLogs() {
 		try {
-			const newLogs = await get(`/applications/${id}/logs.json`);
-			logs = newLogs.logs;
-			return;
-		} catch ({ error }) {
+			const newLogs: any = await get(
+				`/applications/${id}/logs.json?since=${lastLog?.split(' ')[0] || 0}`
+			);
+
+			if (newLogs?.logs && newLogs.logs[newLogs.logs.length - 1] !== logs[logs.length - 1]) {
+				logs = logs.concat(newLogs.logs);
+				lastLog = newLogs.logs[newLogs.logs.length - 1];
+			}
+		} catch (error) {
 			return errorNotification(error);
 		}
 	}
+	function detect() {
+		if (position < logsEl.scrollTop) {
+			position = logsEl.scrollTop;
+		} else {
+			if (followingLogs) {
+				clearInterval(followingInterval);
+				followingLogs = false;
+			}
+			position = logsEl.scrollTop;
+		}
+	}
 
 	function followBuild() {
-		followingBuild = !followingBuild;
-		if (followingBuild) {
+		followingLogs = !followingLogs;
+		if (followingLogs) {
 			followingInterval = setInterval(() => {
 				logsEl.scrollTop = logsEl.scrollHeight;
 				window.scrollTo(0, document.body.scrollHeight);
-			}, 100);
+			}, 1000);
 		} else {
-			window.clearInterval(followingInterval);
+			clearInterval(followingInterval);
 		}
 	}
 </script>
@@ -142,16 +172,19 @@
 </div>
 <div class="flex flex-row justify-center space-x-2 px-10 pt-6">
 	{#if logs.length === 0}
-		<div class="text-xl font-bold tracking-tighter">Waiting for the logs...</div>
+		<div class="text-xl font-bold tracking-tighter">{$t('application.build.waiting_logs')}</div>
 	{:else}
 		<div class="relative w-full">
-			<LoadingLogs />
-			<div class="flex justify-end sticky top-0 p-2">
+			<div class="text-right " />
+			{#if loadLogsInterval}
+				<LoadingLogs />
+			{/if}
+			<div class="flex justify-end sticky top-0 p-2 mx-1">
 				<button
 					on:click={followBuild}
 					class="bg-transparent"
 					data-tooltip="Follow logs"
-					class:text-green-500={followingBuild}
+					class:text-green-500={followingLogs}
 				>
 					<svg
 						xmlns="http://www.w3.org/2000/svg"
@@ -174,8 +207,9 @@
 			<div
 				class="font-mono w-full leading-6 text-left text-md tracking-tighter rounded bg-coolgray-200 py-5 px-6 whitespace-pre-wrap break-words overflow-auto max-h-[80vh] -mt-12 overflow-y-scroll scrollbar-w-1 scrollbar-thumb-coollabs scrollbar-track-coolgray-200"
 				bind:this={logsEl}
+				on:scroll={detect}
 			>
-				<div class="px-2">
+				<div class="px-2 pr-14">
 					{#each logs as log}
 						{log + '\n'}
 					{/each}
diff --git a/src/routes/applications/[id]/previews/index.svelte b/src/routes/applications/[id]/previews/index.svelte
index 9cc16c80c..152aa00d2 100644
--- a/src/routes/applications/[id]/previews/index.svelte
+++ b/src/routes/applications/[id]/previews/index.svelte
@@ -30,6 +30,7 @@
 	import Explainer from '$lib/components/Explainer.svelte';
 	import { errorNotification } from '$lib/form';
 	import { toast } from '@zerodevx/svelte-toast';
+	import { t } from '$lib/translations';
 
 	const { id } = $page.params;
 	async function refreshSecrets() {
@@ -134,10 +135,12 @@
 		<table class="mx-auto border-separate text-left">
 			<thead>
 				<tr class="h-12">
-					<th scope="col">Name</th>
-					<th scope="col">Value</th>
-					<th scope="col" class="w-64 text-center">Need during buildtime?</th>
-					<th scope="col" class="w-96 text-center">Action</th>
+					<th scope="col">{$t('forms.name')}</th>
+					<th scope="col">{$t('forms.value')}</th>
+					<th scope="col" class="w-64 text-center"
+						>{$t('application.preview.need_during_buildtime')}</th
+					>
+					<th scope="col" class="w-96 text-center">{$t('forms.action')}</th>
 				</tr>
 			</thead>
 			<tbody>
@@ -171,13 +174,15 @@
 				</a>
 				<div class="flex items-center justify-center">
 					<button class="bg-coollabs hover:bg-coollabs-100" on:click={() => redeploy(container)}
-						>Redeploy</button
+						>{$t('application.preview.redeploy')}</button
 					>
 				</div>
 			{/each}
 		{:else}
 			<div class="flex-col">
-				<div class="text-center font-bold text-xl">No previews available</div>
+				<div class="text-center font-bold text-xl">
+					{$t('application.preview.no_previews_available')}
+				</div>
 			</div>
 		{/if}
 	</div>
diff --git a/src/routes/applications/[id]/secrets/_BatchSecrets.svelte b/src/routes/applications/[id]/secrets/_BatchSecrets.svelte
index 8d0a65aee..d7c23938f 100644
--- a/src/routes/applications/[id]/secrets/_BatchSecrets.svelte
+++ b/src/routes/applications/[id]/secrets/_BatchSecrets.svelte
@@ -6,6 +6,7 @@
 	import { saveSecret } from './utils';
 	import pLimit from 'p-limit';
 	import { createEventDispatcher } from 'svelte';
+	import { t } from '$lib/translations';
 	const dispatch = createEventDispatcher();
 
 	let batchSecrets = '';
@@ -38,11 +39,11 @@
 	}
 </script>
 
-<h2 class="title my-6 font-bold">Paste .env file</h2>
+<h2 class="title my-6 font-bold">{$t('application.secret__batch_dot_env')}</h2>
 <form on:submit|preventDefault={getValues} class="mb-12 w-full">
 	<textarea bind:value={batchSecrets} class="mb-2 min-h-[200px] w-full" />
 	<button
 		class="bg-green-600 hover:bg-green-500 disabled:text-white disabled:opacity-40"
-		type="submit">Batch add secrets</button
+		type="submit">{$t('application.batch_secrets')}</button
 	>
 </form>
diff --git a/src/routes/applications/[id]/secrets/_Secret.svelte b/src/routes/applications/[id]/secrets/_Secret.svelte
index 48f750e61..18ed868ce 100644
--- a/src/routes/applications/[id]/secrets/_Secret.svelte
+++ b/src/routes/applications/[id]/secrets/_Secret.svelte
@@ -12,6 +12,7 @@
 	import { del } from '$lib/api';
 	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
 	import { errorNotification } from '$lib/form';
+	import { t } from '$lib/translations';
 	import { toast } from '@zerodevx/svelte-toast';
 	import { createEventDispatcher } from 'svelte';
 	import { saveSecret } from './utils';
@@ -104,7 +105,7 @@
 		class:cursor-not-allowed={isPRMRSecret}
 		class:cursor-pointer={!isPRMRSecret}
 	>
-		<span class="sr-only">Use isBuildSecret</span>
+		<span class="sr-only">{$t('application.secrets.use_isbuildsecret')}</span>
 		<span
 			class="pointer-events-none relative inline-block h-5 w-5 transform rounded-full bg-white shadow transition duration-200 ease-in-out"
 			class:translate-x-5={isBuildSecret}
@@ -145,17 +146,19 @@
 	{#if isNewSecret}
 		<div class="flex items-center justify-center">
 			<button class="bg-green-600 hover:bg-green-500" on:click={() => createSecret(true)}
-				>Add</button
+				>{$t('forms.add')}</button
 			>
 		</div>
 	{:else}
 		<div class="flex flex-row justify-center space-x-2">
 			<div class="flex items-center justify-center">
-				<button class="" on:click={() => createSecret(false)}>Set</button>
+				<button class="" on:click={() => createSecret(false)}>{$t('forms.set')}</button>
 			</div>
 			{#if !isPRMRSecret}
 				<div class="flex justify-center items-end">
-					<button class="bg-red-600 hover:bg-red-500" on:click={removeSecret}>Remove</button>
+					<button class="bg-red-600 hover:bg-red-500" on:click={removeSecret}
+						>{$t('forms.remove')}</button
+					>
 				</div>
 			{/if}
 		</div>
diff --git a/src/routes/applications/[id]/secrets/index.svelte b/src/routes/applications/[id]/secrets/index.svelte
index 5ca2bbfcb..b7105fe48 100644
--- a/src/routes/applications/[id]/secrets/index.svelte
+++ b/src/routes/applications/[id]/secrets/index.svelte
@@ -25,6 +25,7 @@
 	import pLimit from 'p-limit';
 	import Secret from './_Secret.svelte';
 	import { page } from '$app/stores';
+	import { t } from '$lib/translations';
 	import { get } from '$lib/api';
 	import { saveSecret } from './utils';
 	import { toast } from '@zerodevx/svelte-toast';
@@ -61,14 +62,13 @@
 		await refreshSecrets();
 		toast.push('Secrets saved');
 	}
-	function asd() {
-		console.log(secrets);
-	}
 </script>
 
 <div class="flex items-center space-x-2 p-5 px-6 font-bold">
 	<div class="-mb-5 flex-col">
-		<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">Secrets</div>
+		<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">
+			{$t('application.secret')}
+		</div>
 		<span class="text-xs">{application.name} </span>
 	</div>
 
@@ -140,10 +140,12 @@
 	<table class="mx-auto border-separate text-left">
 		<thead>
 			<tr class="h-12">
-				<th scope="col">Name</th>
-				<th scope="col">Value</th>
-				<th scope="col" class="w-64 text-center">Need during buildtime?</th>
-				<th scope="col" class="w-96 text-center">Action</th>
+				<th scope="col">{$t('forms.name')}</th>
+				<th scope="col">{$t('forms.value')}</th>
+				<th scope="col" class="w-64 text-center"
+					>{$t('application.preview.need_during_buildtime')}</th
+				>
+				<th scope="col" class="w-96 text-center">{$t('forms.action')}</th>
 			</tr>
 		</thead>
 		<tbody>
@@ -164,7 +166,6 @@
 			</tr>
 		</tbody>
 	</table>
-	<button on:click={asd}>Save</button>
 	<h2 class="title my-6 font-bold">Paste .env file</h2>
 	<form on:submit|preventDefault={getValues} class="mb-12 w-full">
 		<textarea bind:value={batchSecrets} class="mb-2 min-h-[200px] w-full" />
diff --git a/src/routes/applications/[id]/secrets/utils.ts b/src/routes/applications/[id]/secrets/utils.ts
index d86acbe2c..965802d8c 100644
--- a/src/routes/applications/[id]/secrets/utils.ts
+++ b/src/routes/applications/[id]/secrets/utils.ts
@@ -1,6 +1,7 @@
 import { toast } from '@zerodevx/svelte-toast';
 import { errorNotification } from '$lib/form';
 import { post } from '$lib/api';
+import { t } from '$lib/translations';
 
 type Props = {
 	isNew: boolean;
@@ -21,8 +22,8 @@ export async function saveSecret({
 	isNewSecret,
 	applicationId
 }: Props): Promise<void> {
-	if (!name) return errorNotification('Name is required.');
-	if (!value) return errorNotification('Value is required.');
+	if (!name) return errorNotification(`${t.get('forms.name')} ${t.get('forms.is_required')}`);
+	if (!value) return errorNotification(`${t.get('forms.value')} ${t.get('forms.is_required')}`);
 	try {
 		await post(`/applications/${applicationId}/secrets.json`, {
 			name,
diff --git a/src/routes/applications/[id]/settings.json.ts b/src/routes/applications/[id]/settings.json.ts
index aea78ff96..77c4bc886 100644
--- a/src/routes/applications/[id]/settings.json.ts
+++ b/src/routes/applications/[id]/settings.json.ts
@@ -1,6 +1,7 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
 import { ErrorHandler } from '$lib/database';
+import { t } from '$lib/translations';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const post: RequestHandler = async (event) => {
@@ -14,8 +15,7 @@ export const post: RequestHandler = async (event) => {
 		const isDouble = await db.checkDoubleBranch(branch, projectId);
 		if (isDouble && autodeploy) {
 			throw {
-				message:
-					'Cannot activate automatic deployments until only one application is defined for this repository / branch.'
+				message: t.get('application.cant_activate_auto_deploy_without_repo')
 			};
 		}
 		await db.setApplicationSettings({ id, debug, previews, dualCerts, autodeploy });
diff --git a/src/routes/applications/[id]/storage/_Storage.svelte b/src/routes/applications/[id]/storage/_Storage.svelte
index 0b75ec717..363c93390 100644
--- a/src/routes/applications/[id]/storage/_Storage.svelte
+++ b/src/routes/applications/[id]/storage/_Storage.svelte
@@ -10,12 +10,13 @@
 
 	import { errorNotification } from '$lib/form';
 	import { toast } from '@zerodevx/svelte-toast';
+	import { t } from '$lib/translations';
 	const { id } = $page.params;
 
 	const dispatch = createEventDispatcher();
 	async function saveStorage(newStorage = false) {
 		try {
-			if (!storage.path) return errorNotification('Path is required.');
+			if (!storage.path) return errorNotification($t('application.storage.path_is_required'));
 			storage.path = storage.path.startsWith('/') ? storage.path : `/${storage.path}`;
 			storage.path = storage.path.endsWith('/') ? storage.path.slice(0, -1) : storage.path;
 			storage.path.replace(/\/\//g, '/');
@@ -29,8 +30,8 @@
 				storage.path = null;
 				storage.id = null;
 			}
-			if (newStorage) toast.push('Storage saved.');
-			else toast.push('Storage updated.');
+			if (newStorage) toast.push($t('application.storage.storage_saved'));
+			else toast.push($t('application.storage.storage_updated'));
 		} catch ({ error }) {
 			return errorNotification(error);
 		}
@@ -39,7 +40,7 @@
 		try {
 			await del(`/applications/${id}/storage.json`, { path: storage.path });
 			dispatch('refresh');
-			toast.push('Storage deleted.');
+			toast.push($t('application.storage.storage_deleted'));
 		} catch ({ error }) {
 			return errorNotification(error);
 		}
@@ -57,16 +58,19 @@
 <td>
 	{#if isNew}
 		<div class="flex items-center justify-center">
-			<button class="bg-green-600 hover:bg-green-500" on:click={() => saveStorage(true)}>Add</button
+			<button class="bg-green-600 hover:bg-green-500" on:click={() => saveStorage(true)}
+				>{$t('forms.add')}</button
 			>
 		</div>
 	{:else}
 		<div class="flex flex-row justify-center space-x-2">
 			<div class="flex items-center justify-center">
-				<button class="" on:click={() => saveStorage(false)}>Set</button>
+				<button class="" on:click={() => saveStorage(false)}>{$t('forms.set')}</button>
 			</div>
 			<div class="flex justify-center items-end">
-				<button class="bg-red-600 hover:bg-red-500" on:click={removeStorage}>Remove</button>
+				<button class="bg-red-600 hover:bg-red-500" on:click={removeStorage}
+					>{$t('forms.remove')}</button
+				>
 			</div>
 		</div>
 	{/if}
diff --git a/src/routes/applications/[id]/storage/index.svelte b/src/routes/applications/[id]/storage/index.svelte
index ffcd71847..9ea667b45 100644
--- a/src/routes/applications/[id]/storage/index.svelte
+++ b/src/routes/applications/[id]/storage/index.svelte
@@ -28,6 +28,7 @@
 	import Storage from './_Storage.svelte';
 	import { get } from '$lib/api';
 	import Explainer from '$lib/components/Explainer.svelte';
+	import { t } from '$lib/translations';
 
 	const { id } = $page.params;
 	async function refreshStorage() {
@@ -111,15 +112,12 @@
 
 <div class="mx-auto max-w-6xl rounded-xl px-6 pt-4">
 	<div class="flex justify-center py-4 text-center">
-		<Explainer
-			customClass="w-full"
-			text={'You can specify any folder that you want to be persistent across deployments. <br>This is useful for storing data such as a database (SQLite) or a cache.'}
-		/>
+		<Explainer customClass="w-full" text={$t('application.storage.persistent_storage_explainer')} />
 	</div>
 	<table class="mx-auto border-separate text-left">
 		<thead>
 			<tr class="h-12">
-				<th scope="col">Path</th>
+				<th scope="col">{$t('forms.path')}</th>
 			</tr>
 		</thead>
 		<tbody>
diff --git a/src/routes/applications/index.svelte b/src/routes/applications/index.svelte
index 3cfcbf141..3295b8eeb 100644
--- a/src/routes/applications/index.svelte
+++ b/src/routes/applications/index.svelte
@@ -3,6 +3,8 @@
 	import { session } from '$app/stores';
 	import { post } from '$lib/api';
 	import { goto } from '$app/navigation';
+	import { t } from '$lib/translations';
+	import { getDomain } from '$lib/components/common';
 
 	import Rust from '$lib/components/svg/applications/Rust.svelte';
 	import Nodejs from '$lib/components/svg/applications/Nodejs.svelte';
@@ -19,7 +21,7 @@
 	import Docker from '$lib/components/svg/applications/Docker.svelte';
 	import Astro from '$lib/components/svg/applications/Astro.svelte';
 	import Eleventy from '$lib/components/svg/applications/Eleventy.svelte';
-	import { getDomain } from '$lib/components/common';
+	import Deno from '$lib/components/svg/applications/Deno.svelte';
 
 	async function newApplication() {
 		const { id } = await post('/applications/new', {});
@@ -38,7 +40,7 @@
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl ">Applications</div>
+	<div class="mr-4 text-2xl ">{$t('index.applications')}</div>
 	{#if $session.isAdmin}
 		<div on:click={newApplication} class="add-icon cursor-pointer bg-green-600 hover:bg-green-500">
 			<svg
@@ -60,7 +62,7 @@
 <div class="flex flex-col flex-wrap justify-center">
 	{#if !applications || ownApplications.length === 0}
 		<div class="flex-col">
-			<div class="text-center text-xl font-bold">No applications found</div>
+			<div class="text-center text-xl font-bold">{$t('application.no_applications_found')}</div>
 		</div>
 	{/if}
 	{#if ownApplications.length > 0 || otherApplications.length > 0}
@@ -100,6 +102,8 @@
 									<Astro />
 								{:else if application.buildPack.toLowerCase() === 'eleventy'}
 									<Eleventy />
+								{:else if application.buildPack.toLowerCase() === 'deno'}
+									<Deno />
 								{/if}
 							{/if}
 
@@ -156,6 +160,8 @@
 										<Astro />
 									{:else if application.buildPack.toLowerCase() === 'eleventy'}
 										<Eleventy />
+									{:else if application.buildPack.toLowerCase() === 'deno'}
+										<Deno />
 									{/if}
 								{/if}
 
diff --git a/src/routes/dashboard.json.ts b/src/routes/dashboard.json.ts
index 11ff9bab3..ff01dbfd8 100644
--- a/src/routes/dashboard.json.ts
+++ b/src/routes/dashboard.json.ts
@@ -1,4 +1,4 @@
-import { getTeam, getUserDetails } from '$lib/common';
+import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
 import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
@@ -57,7 +57,8 @@ export const post: RequestHandler = async (event) => {
 		headers: {
 			'set-cookie': [
 				`${cookie}=${value}; HttpOnly; Path=/; Max-Age=15778800;`,
-				'gitlabToken=; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT'
+				'gitlabToken=; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT',
+				'githubToken=; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT'
 			],
 			Location: from
 		}
diff --git a/src/routes/databases/[id]/_Databases/_CouchDb.svelte b/src/routes/databases/[id]/_Databases/_CouchDb.svelte
index 861e21cb5..f8f9ebc10 100644
--- a/src/routes/databases/[id]/_Databases/_CouchDb.svelte
+++ b/src/routes/databases/[id]/_Databases/_CouchDb.svelte
@@ -1,6 +1,7 @@
 <script>
 	export let database;
 	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
+	import { t } from '$lib/translations';
 </script>
 
 <div class="flex space-x-1 py-5 font-bold">
@@ -8,34 +9,38 @@
 </div>
 <div class="space-y-2 px-10">
 	<div class="grid grid-cols-2 items-center">
-		<label for="defaultDatabase" class="text-base font-bold text-stone-100">Default Database</label>
+		<label for="defaultDatabase" class="text-base font-bold text-stone-100"
+			>{$t('database.default_database')}</label
+		>
 		<CopyPasswordField
 			required
 			readonly={database.defaultDatabase}
 			disabled={database.defaultDatabase}
-			placeholder="eg: mydb"
+			placeholder="{$t('forms.eg')}: mydb"
 			id="defaultDatabase"
 			name="defaultDatabase"
 			bind:value={database.defaultDatabase}
 		/>
 	</div>
 	<div class="grid grid-cols-2 items-center">
-		<label for="dbUser" class="text-base font-bold text-stone-100">User</label>
+		<label for="dbUser" class="text-base font-bold text-stone-100">{$t('forms.user')}</label>
 		<CopyPasswordField
 			readonly
 			disabled
-			placeholder="Generated automatically after start"
+			placeholder={$t('forms.generated_automatically_after_start')}
 			id="dbUser"
 			name="dbUser"
 			value={database.dbUser}
 		/>
 	</div>
 	<div class="grid grid-cols-2 items-center">
-		<label for="dbUserPassword" class="text-base font-bold text-stone-100">Password</label>
+		<label for="dbUserPassword" class="text-base font-bold text-stone-100"
+			>{$t('forms.password')}</label
+		>
 		<CopyPasswordField
 			readonly
 			disabled
-			placeholder="Generated automatically after start"
+			placeholder={$t('forms.generated_automatically_after_start')}
 			isPasswordField
 			id="dbUserPassword"
 			name="dbUserPassword"
@@ -43,22 +48,24 @@
 		/>
 	</div>
 	<div class="grid grid-cols-2 items-center">
-		<label for="rootUser" class="text-base font-bold text-stone-100">Root User</label>
+		<label for="rootUser" class="text-base font-bold text-stone-100">{$t('forms.root_user')}</label>
 		<CopyPasswordField
 			readonly
 			disabled
-			placeholder="Generated automatically after start"
+			placeholder={$t('forms.generated_automatically_after_start')}
 			id="rootUser"
 			name="rootUser"
 			value={database.rootUser}
 		/>
 	</div>
 	<div class="grid grid-cols-2 items-center">
-		<label for="rootUserPassword" class="text-base font-bold text-stone-100">Root's Password</label>
+		<label for="rootUserPassword" class="text-base font-bold text-stone-100"
+			>{$t('forms.roots_password')}</label
+		>
 		<CopyPasswordField
 			readonly
 			disabled
-			placeholder="Generated automatically after start"
+			placeholder={$t('forms.generated_automatically_after_start')}
 			isPasswordField
 			id="rootUserPassword"
 			name="rootUserPassword"
diff --git a/src/routes/databases/[id]/_Databases/_Databases.svelte b/src/routes/databases/[id]/_Databases/_Databases.svelte
index c441534e4..1034a3543 100644
--- a/src/routes/databases/[id]/_Databases/_Databases.svelte
+++ b/src/routes/databases/[id]/_Databases/_Databases.svelte
@@ -18,6 +18,7 @@
 	import { post } from '$lib/api';
 	import { getDomain } from '$lib/components/common';
 	import { toast } from '@zerodevx/svelte-toast';
+	import { t } from '$lib/translations';
 
 	const { id } = $page.params;
 
@@ -59,7 +60,7 @@
 							: window.location.hostname
 						: database.id
 			  }:${isPublic ? database.publicPort : privatePort}/${databaseDefault}`
-			: 'Loading...');
+			: $t('forms.loading'));
 	}
 
 	async function changeSettings(name) {
@@ -110,20 +111,20 @@
 <div class="mx-auto max-w-4xl px-6">
 	<form on:submit|preventDefault={handleSubmit} class="py-4">
 		<div class="flex space-x-1 pb-5 font-bold">
-			<div class="title">General</div>
+			<div class="title">{$t('general')}</div>
 			{#if $session.isAdmin}
 				<button
 					type="submit"
 					class:bg-purple-600={!loading}
 					class:hover:bg-purple-500={!loading}
-					disabled={loading}>{loading ? 'Saving...' : 'Save'}</button
+					disabled={loading}>{loading ? $t('forms.saving') : $t('forms.save')}</button
 				>
 			{/if}
 		</div>
 
 		<div class="grid grid-flow-row gap-2 px-10">
 			<div class="grid grid-cols-2 items-center">
-				<label for="name" class="text-base font-bold text-stone-100">Name</label>
+				<label for="name" class="text-base font-bold text-stone-100">{$t('forms.name')}</label>
 				<input
 					readonly={!$session.isAdmin}
 					name="name"
@@ -133,7 +134,9 @@
 				/>
 			</div>
 			<div class="grid grid-cols-2 items-center">
-				<label for="destination" class="text-base font-bold text-stone-100">Destination</label>
+				<label for="destination" class="text-base font-bold text-stone-100"
+					>{$t('application.destination')}</label
+				>
 				{#if database.destinationDockerId}
 					<div class="no-underline">
 						<input
@@ -148,16 +151,17 @@
 			</div>
 
 			<div class="grid grid-cols-2 items-center">
-				<label for="version" class="text-base font-bold text-stone-100">Version</label>
+				<label for="version" class="text-base font-bold text-stone-100">{$t('forms.version')}</label
+				>
 				<input value={database.version} readonly disabled class="bg-transparent " />
 			</div>
 		</div>
 
 		<div class="grid grid-flow-row gap-2 px-10 pt-2">
 			<div class="grid grid-cols-2 items-center">
-				<label for="host" class="text-base font-bold text-stone-100">Host</label>
+				<label for="host" class="text-base font-bold text-stone-100">{$t('forms.host')}</label>
 				<CopyPasswordField
-					placeholder="Generated automatically after start"
+					placeholder={$t('forms.generated_automatically_after_start')}
 					isPasswordField={false}
 					readonly
 					disabled
@@ -167,9 +171,10 @@
 				/>
 			</div>
 			<div class="grid grid-cols-2 items-center">
-				<label for="publicPort" class="text-base font-bold text-stone-100">Port</label>
+				<label for="publicPort" class="text-base font-bold text-stone-100">{$t('forms.port')}</label
+				>
 				<CopyPasswordField
-					placeholder="Generated automatically after set to public"
+					placeholder={$t('database.generated_automatically_after_set_to_public')}
 					id="publicPort"
 					readonly
 					disabled
@@ -191,10 +196,12 @@
 				<CouchDb {database} />
 			{/if}
 			<div class="grid grid-cols-2 items-center px-10 pb-8">
-				<label for="url" class="text-base font-bold text-stone-100">Connection String</label>
+				<label for="url" class="text-base font-bold text-stone-100"
+					>{$t('database.connection_string')}</label
+				>
 				<CopyPasswordField
 					textarea={true}
-					placeholder="Generated automatically after start"
+					placeholder={$t('forms.generated_automatically_after_start')}
 					isPasswordField={false}
 					id="url"
 					name="url"
@@ -206,7 +213,7 @@
 		</div>
 	</form>
 	<div class="flex space-x-1 pb-5 font-bold">
-		<div class="title">Features</div>
+		<div class="title">{$t('application.features')}</div>
 	</div>
 	<div class="px-10 pb-10">
 		<div class="grid grid-cols-2 items-center">
@@ -214,8 +221,8 @@
 				loading={publicLoading}
 				bind:setting={isPublic}
 				on:click={() => changeSettings('isPublic')}
-				title="Set it public"
-				description="Your database will be reachable over the internet. <br>Take security seriously in this case!"
+				title={$t('database.set_public')}
+				description={$t('database.warning_database_public')}
 				disabled={!isRunning}
 			/>
 		</div>
@@ -224,8 +231,8 @@
 				<Setting
 					bind:setting={appendOnly}
 					on:click={() => changeSettings('appendOnly')}
-					title="Change append only mode"
-					description="Useful if you would like to restore redis data from a backup.<br><span class='font-bold text-white'>Database restart is required.</span>"
+					title={$t('database.change_append_only_mode')}
+					description={$t('database.warning_append_only')}
 				/>
 			</div>
 		{/if}
diff --git a/src/routes/databases/[id]/_Databases/_MongoDB.svelte b/src/routes/databases/[id]/_Databases/_MongoDB.svelte
index fa73b870e..a732556d2 100644
--- a/src/routes/databases/[id]/_Databases/_MongoDB.svelte
+++ b/src/routes/databases/[id]/_Databases/_MongoDB.svelte
@@ -3,6 +3,7 @@
 	export let isRunning;
 	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
 	import Explainer from '$lib/components/Explainer.svelte';
+	import { t } from '$lib/translations';
 </script>
 
 <div class="flex space-x-1 py-5 font-bold">
@@ -10,9 +11,9 @@
 </div>
 <div class="space-y-2 px-10">
 	<div class="grid grid-cols-2 items-center">
-		<label for="rootUser" class="text-base font-bold text-stone-100">Root User</label>
+		<label for="rootUser" class="text-base font-bold text-stone-100">{$t('forms.root_user')}</label>
 		<CopyPasswordField
-			placeholder="Generated automatically after start"
+			placeholder={$t('forms.generated_automatically_after_start')}
 			id="rootUser"
 			readonly
 			disabled
@@ -21,11 +22,13 @@
 		/>
 	</div>
 	<div class="grid grid-cols-2 items-center">
-		<label for="rootUserPassword" class="text-base font-bold text-stone-100">Root's Password</label>
+		<label for="rootUserPassword" class="text-base font-bold text-stone-100"
+			>{$t('forms.roots_password')}</label
+		>
 		<CopyPasswordField
 			disabled={!isRunning}
 			readonly={!isRunning}
-			placeholder="Generated automatically after start"
+			placeholder={$t('forms.generated_automatically_after_start')}
 			isPasswordField={true}
 			id="rootUserPassword"
 			name="rootUserPassword"
diff --git a/src/routes/databases/[id]/_Databases/_MySQL.svelte b/src/routes/databases/[id]/_Databases/_MySQL.svelte
index 27057049b..3e96e276d 100644
--- a/src/routes/databases/[id]/_Databases/_MySQL.svelte
+++ b/src/routes/databases/[id]/_Databases/_MySQL.svelte
@@ -3,6 +3,7 @@
 	export let isRunning;
 	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
 	import Explainer from '$lib/components/Explainer.svelte';
+	import { t } from '$lib/translations';
 </script>
 
 <div class="flex space-x-1 py-5 font-bold">
@@ -10,34 +11,38 @@
 </div>
 <div class="space-y-2 px-10">
 	<div class="grid grid-cols-2 items-center">
-		<label for="defaultDatabase" class="text-base font-bold text-stone-100">Default Database</label>
+		<label for="defaultDatabase" class="text-base font-bold text-stone-100"
+			>{$t('database.default_database')}</label
+		>
 		<CopyPasswordField
 			required
 			readonly={database.defaultDatabase}
 			disabled={database.defaultDatabase}
-			placeholder="eg: mydb"
+			placeholder="{$t('forms.eg')}: mydb"
 			id="defaultDatabase"
 			name="defaultDatabase"
 			bind:value={database.defaultDatabase}
 		/>
 	</div>
 	<div class="grid grid-cols-2 items-center">
-		<label for="dbUser" class="text-base font-bold text-stone-100">User</label>
+		<label for="dbUser" class="text-base font-bold text-stone-100">{$t('forms.user')}</label>
 		<CopyPasswordField
 			readonly
 			disabled
-			placeholder="Generated automatically after start"
+			placeholder={$t('forms.generated_automatically_after_start')}
 			id="dbUser"
 			name="dbUser"
 			value={database.dbUser}
 		/>
 	</div>
 	<div class="grid grid-cols-2 items-center">
-		<label for="dbUserPassword" class="text-base font-bold text-stone-100">Password</label>
+		<label for="dbUserPassword" class="text-base font-bold text-stone-100"
+			>{$t('forms.password')}</label
+		>
 		<CopyPasswordField
 			disabled={!isRunning}
 			readonly={!isRunning}
-			placeholder="Generated automatically after start"
+			placeholder={$t('forms.generated_automatically_after_start')}
 			isPasswordField
 			id="dbUserPassword"
 			name="dbUserPassword"
@@ -46,22 +51,24 @@
 		<Explainer text="Could be changed while the database is running." />
 	</div>
 	<div class="grid grid-cols-2 items-center">
-		<label for="rootUser" class="text-base font-bold text-stone-100">Root User</label>
+		<label for="rootUser" class="text-base font-bold text-stone-100">{$t('forms.root_user')}</label>
 		<CopyPasswordField
 			readonly
 			disabled
-			placeholder="Generated automatically after start"
+			placeholder={$t('forms.generated_automatically_after_start')}
 			id="rootUser"
 			name="rootUser"
 			value={database.rootUser}
 		/>
 	</div>
 	<div class="grid grid-cols-2 items-center">
-		<label for="rootUserPassword" class="text-base font-bold text-stone-100">Root's Password</label>
+		<label for="rootUserPassword" class="text-base font-bold text-stone-100"
+			>{$t('forms.roots_password')}</label
+		>
 		<CopyPasswordField
 			disabled={!isRunning}
 			readonly={!isRunning}
-			placeholder="Generated automatically after start"
+			placeholder={$t('forms.generated_automatically_after_start')}
 			isPasswordField
 			id="rootUserPassword"
 			name="rootUserPassword"
diff --git a/src/routes/databases/[id]/_Databases/_PostgreSQL.svelte b/src/routes/databases/[id]/_Databases/_PostgreSQL.svelte
index 343ad74d6..c6bacd4ec 100644
--- a/src/routes/databases/[id]/_Databases/_PostgreSQL.svelte
+++ b/src/routes/databases/[id]/_Databases/_PostgreSQL.svelte
@@ -3,6 +3,7 @@
 	export let isRunning;
 	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
 	import Explainer from '$lib/components/Explainer.svelte';
+	import { t } from '$lib/translations';
 </script>
 
 <div class="flex space-x-1 py-5 font-bold">
@@ -10,12 +11,14 @@
 </div>
 <div class="space-y-2 px-10">
 	<div class="grid grid-cols-2 items-center">
-		<label for="defaultDatabase" class="text-base font-bold text-stone-100">Default Database</label>
+		<label for="defaultDatabase" class="text-base font-bold text-stone-100"
+			>{$t('database.default_database')}</label
+		>
 		<CopyPasswordField
 			required
 			readonly={database.defaultDatabase}
 			disabled={database.defaultDatabase}
-			placeholder="eg: mydb"
+			placeholder="{$t('forms.eg')}: mydb"
 			id="defaultDatabase"
 			name="defaultDatabase"
 			bind:value={database.defaultDatabase}
@@ -29,28 +32,32 @@
 			disabled={!isRunning}
 			readonly={!isRunning}
 			placeholder="Generated automatically after start"
+			isPasswordField
 			id="rootUserPassword"
 			name="rootUserPassword"
 			bind:value={database.rootUserPassword}
 		/>
+		<Explainer text="Could be changed while the database is running." />
 	</div>
 	<div class="grid grid-cols-2 items-center">
-		<label for="dbUser" class="text-base font-bold text-stone-100">User</label>
+		<label for="dbUser" class="text-base font-bold text-stone-100">{$t('forms.user')}</label>
 		<CopyPasswordField
 			readonly
 			disabled
-			placeholder="Generated automatically after start"
+			placeholder={$t('forms.generated_automatically_after_start')}
 			id="dbUser"
 			name="dbUser"
 			value={database.dbUser}
 		/>
 	</div>
 	<div class="grid grid-cols-2 items-center">
-		<label for="dbUserPassword" class="text-base font-bold text-stone-100">Password</label>
+		<label for="dbUserPassword" class="text-base font-bold text-stone-100"
+			>{$t('forms.password')}</label
+		>
 		<CopyPasswordField
 			disabled={!isRunning}
 			readonly={!isRunning}
-			placeholder="Generated automatically after start"
+			placeholder={$t('forms.generated_automatically_after_start')}
 			isPasswordField
 			id="dbUserPassword"
 			name="dbUserPassword"
diff --git a/src/routes/databases/[id]/_Databases/_Redis.svelte b/src/routes/databases/[id]/_Databases/_Redis.svelte
index fdd2ce5f1..100594343 100644
--- a/src/routes/databases/[id]/_Databases/_Redis.svelte
+++ b/src/routes/databases/[id]/_Databases/_Redis.svelte
@@ -3,6 +3,7 @@
 	export let isRunning;
 	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
 	import Explainer from '$lib/components/Explainer.svelte';
+	import { t } from '$lib/translations';
 </script>
 
 <div class="flex space-x-1 py-5 font-bold">
@@ -10,11 +11,13 @@
 </div>
 <div class="space-y-2 px-10">
 	<div class="grid grid-cols-2 items-center">
-		<label for="dbUserPassword" class="text-base font-bold text-stone-100">Password</label>
+		<label for="dbUserPassword" class="text-base font-bold text-stone-100"
+			>{$t('forms.password')}</label
+		>
 		<CopyPasswordField
 			disabled={!isRunning}
 			readonly={!isRunning}
-			placeholder="Generated automatically after start"
+			placeholder={$t('forms.generated_automatically_after_start')}
 			isPasswordField
 			id="dbUserPassword"
 			name="dbUserPassword"
diff --git a/src/routes/databases/[id]/__layout.svelte b/src/routes/databases/[id]/__layout.svelte
index 45016da69..6b62c2cd1 100644
--- a/src/routes/databases/[id]/__layout.svelte
+++ b/src/routes/databases/[id]/__layout.svelte
@@ -63,6 +63,7 @@
 	import Loading from '$lib/components/Loading.svelte';
 	import { del, post } from '$lib/api';
 	import { goto } from '$app/navigation';
+	import { t } from '$lib/translations';
 
 	export let database;
 	export let isRunning;
@@ -83,7 +84,7 @@
 		}
 	}
 	async function stopDatabase() {
-		const sure = confirm(`Are you sure you would like to stop '${database.name}'?`);
+		const sure = confirm($t('database.confirm_stop', { name: database.name }));
 		if (sure) {
 			loading = true;
 			try {
@@ -113,13 +114,13 @@
 			{#if isRunning}
 				<button
 					on:click={stopDatabase}
-					title="Stop database"
+					title={$t('database.stop_database')}
 					type="submit"
 					disabled={!$session.isAdmin}
 					class="icons bg-transparent tooltip-bottom text-sm flex items-center space-x-2 text-red-500"
 					data-tooltip={$session.isAdmin
-						? 'Stop database'
-						: 'You do not have permission to stop the database.'}
+						? $t('database.stop_database')
+						: $t('database.permission_denied_stop_database')}
 				>
 					<svg
 						xmlns="http://www.w3.org/2000/svg"
@@ -139,13 +140,13 @@
 			{:else}
 				<button
 					on:click={startDatabase}
-					title="Start database"
+					title={$t('database.start_database')}
 					type="submit"
 					disabled={!$session.isAdmin}
 					class="icons bg-transparent tooltip-bottom text-sm flex items-center space-x-2 text-green-500"
 					data-tooltip={$session.isAdmin
-						? 'Start database'
-						: 'You do not have permission to start the database.'}
+						? $t('database.start_database')
+						: $t('database.permission_denied_start_database')}
 					><svg
 						xmlns="http://www.w3.org/2000/svg"
 						class="w-6 h-6"
@@ -164,14 +165,14 @@
 		{/if}
 		<button
 			on:click={deleteDatabase}
-			title="Delete Database"
+			title={$t('database.delete_database')}
 			type="submit"
 			disabled={!$session.isAdmin}
 			class:hover:text-red-500={$session.isAdmin}
 			class="icons bg-transparent tooltip-bottom text-sm"
 			data-tooltip={$session.isAdmin
-				? 'Delete Database'
-				: 'You do not have permission to delete a Database'}><DeleteIcon /></button
+				? $t('database.delete_database')
+				: $t('database.permission_denied_delete_database')}><DeleteIcon /></button
 		>
 	{/if}
 </nav>
diff --git a/src/routes/databases/[id]/configuration/destination.svelte b/src/routes/databases/[id]/configuration/destination.svelte
index 1a8afc817..a7c96c145 100644
--- a/src/routes/databases/[id]/configuration/destination.svelte
+++ b/src/routes/databases/[id]/configuration/destination.svelte
@@ -34,6 +34,7 @@
 	import { errorNotification } from '$lib/form';
 	import { goto } from '$app/navigation';
 	import { post } from '$lib/api';
+	import { t } from '$lib/translations';
 
 	const { id } = $page.params;
 	const from = $page.url.searchParams.get('from');
@@ -52,12 +53,14 @@
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">Configure Destination</div>
+	<div class="mr-4 text-2xl tracking-tight">
+		{$t('application.configuration.configure_destination')}
+	</div>
 </div>
 <div class="flex justify-center">
 	{#if !destinations || destinations.length === 0}
 		<div class="flex-col">
-			<div class="pb-2">No configurable Destination found</div>
+			<div class="pb-2">{$t('application.configuration.no_configurable_destination')}</div>
 			<div class="flex justify-center">
 				<a href="/new/destination" sveltekit:prefetch class="add-icon bg-sky-600 hover:bg-sky-500">
 					<svg
diff --git a/src/routes/databases/[id]/configuration/type.svelte b/src/routes/databases/[id]/configuration/type.svelte
index 2d527a7b9..a73163058 100644
--- a/src/routes/databases/[id]/configuration/type.svelte
+++ b/src/routes/databases/[id]/configuration/type.svelte
@@ -42,6 +42,7 @@
 	import Redis from '$lib/components/svg/databases/Redis.svelte';
 	import { goto } from '$app/navigation';
 	import { post } from '$lib/api';
+	import { t } from '$lib/translations';
 	async function handleSubmit(type) {
 		try {
 			await post(`/databases/${id}/configuration/type.json`, { type });
@@ -53,7 +54,7 @@
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">Select a Database type</div>
+	<div class="mr-4 text-2xl tracking-tight">{$t('database.select_database_type')}</div>
 </div>
 
 <div class="flex flex-wrap justify-center">
diff --git a/src/routes/databases/[id]/configuration/version.svelte b/src/routes/databases/[id]/configuration/version.svelte
index 9e0761130..841190dc5 100644
--- a/src/routes/databases/[id]/configuration/version.svelte
+++ b/src/routes/databases/[id]/configuration/version.svelte
@@ -31,6 +31,7 @@
 	import { enhance, errorNotification } from '$lib/form';
 	import { goto } from '$app/navigation';
 	import { post } from '$lib/api';
+	import { t } from '$lib/translations';
 
 	const { id } = $page.params;
 	const from = $page.url.searchParams.get('from');
@@ -47,7 +48,7 @@
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">Select a Database version</div>
+	<div class="mr-4 text-2xl tracking-tight">{$t('database.select_database_version')}</div>
 </div>
 
 <div class="flex flex-wrap justify-center">
diff --git a/src/routes/databases/[id]/delete.json.ts b/src/routes/databases/[id]/delete.json.ts
index c81916504..d731492ad 100644
--- a/src/routes/databases/[id]/delete.json.ts
+++ b/src/routes/databases/[id]/delete.json.ts
@@ -1,7 +1,7 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
 import { ErrorHandler, stopDatabase } from '$lib/database';
-import { deleteProxy } from '$lib/haproxy';
+import { stopTcpHttpProxy } from '$lib/haproxy';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const del: RequestHandler = async (event) => {
@@ -12,7 +12,7 @@ export const del: RequestHandler = async (event) => {
 		const database = await db.getDatabase({ id, teamId });
 		if (database.destinationDockerId) {
 			const everStarted = await stopDatabase(database);
-			if (everStarted) await deleteProxy({ id });
+			if (everStarted) await stopTcpHttpProxy(database.destinationDocker, database.publicPort);
 		}
 		await db.removeDatabase({ id });
 		return { status: 200 };
diff --git a/src/routes/databases/[id]/settings.json.ts b/src/routes/databases/[id]/settings.json.ts
index 042bb36ef..1f09946c6 100644
--- a/src/routes/databases/[id]/settings.json.ts
+++ b/src/routes/databases/[id]/settings.json.ts
@@ -1,20 +1,16 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { generateDatabaseConfiguration, ErrorHandler } from '$lib/database';
+import { generateDatabaseConfiguration, ErrorHandler, getFreePort } from '$lib/database';
 import { startTcpProxy, stopTcpHttpProxy } from '$lib/haproxy';
 import type { RequestHandler } from '@sveltejs/kit';
-import getPort, { portNumbers } from 'get-port';
 
 export const post: RequestHandler = async (event) => {
 	const { status, body, teamId } = await getUserDetails(event);
 	if (status === 401) return { status, body };
 
 	const { id } = event.params;
-	const data = await db.prisma.setting.findFirst();
-	const { minPort, maxPort } = data;
-
 	const { isPublic, appendOnly = true } = await event.request.json();
-	const publicPort = await getPort({ port: portNumbers(minPort, maxPort) });
+	const publicPort = await getFreePort();
 
 	try {
 		await db.setDatabase({ id, isPublic, appendOnly });
diff --git a/src/routes/databases/[id]/start.json.ts b/src/routes/databases/[id]/start.json.ts
index 59fd7c1ea..7a7d8dedf 100644
--- a/src/routes/databases/[id]/start.json.ts
+++ b/src/routes/databases/[id]/start.json.ts
@@ -45,7 +45,15 @@ export const post: RequestHandler = async (event) => {
 					volumes: [volume],
 					ulimits,
 					labels,
-					restart: 'always'
+					restart: 'always',
+					deploy: {
+						restart_policy: {
+							condition: 'on-failure',
+							delay: '5s',
+							max_attempts: 3,
+							window: '120s'
+						}
+					}
 				}
 			},
 			networks: {
diff --git a/src/routes/databases/index.svelte b/src/routes/databases/index.svelte
index a47dbc66f..6717ac88a 100644
--- a/src/routes/databases/index.svelte
+++ b/src/routes/databases/index.svelte
@@ -9,6 +9,7 @@
 	import { post } from '$lib/api';
 	import { goto } from '$app/navigation';
 	import { session } from '$app/stores';
+	import { t } from '$lib/translations';
 
 	async function newDatabase() {
 		const { id } = await post('/databases/new', {});
@@ -27,7 +28,7 @@
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">Databases</div>
+	<div class="mr-4 text-2xl tracking-tight">{$t('index.databases')}</div>
 	<div on:click={newDatabase} class="add-icon cursor-pointer bg-purple-600 hover:bg-purple-500">
 		<svg
 			class="w-6"
@@ -48,7 +49,7 @@
 <div class="flex flex-col flex-wrap justify-center">
 	{#if !databases || ownDatabases.length === 0}
 		<div class="flex-col">
-			<div class="text-center text-xl font-bold">No databases found</div>
+			<div class="text-center text-xl font-bold">{$t('database.no_databases_found')}</div>
 		</div>
 	{/if}
 	{#if ownDatabases.length > 0 || otherDatabases.length > 0}
@@ -78,7 +79,7 @@
 							{/if}
 							{#if !database.type}
 								<div class="truncate text-center font-bold text-red-500 group-hover:text-white">
-									Configuration missing
+									{$t('application.configuration.configuration_missing')}
 								</div>
 							{/if}
 						</div>
diff --git a/src/routes/destinations/[id]/_FoundApp.svelte b/src/routes/destinations/[id]/_FoundApp.svelte
index 835c121bf..f6c44bb25 100644
--- a/src/routes/destinations/[id]/_FoundApp.svelte
+++ b/src/routes/destinations/[id]/_FoundApp.svelte
@@ -2,6 +2,7 @@
 	export let app;
 	import { onMount } from 'svelte';
 	import { page } from '$app/stores';
+	import { t } from '$lib/translations';
 	const { id } = $page.params;
 	let loading = true;
 	async function checkApp() {
@@ -58,20 +59,20 @@
 <div class="box-selection hover:border-transparent hover:bg-coolgray-200">
 	<div class="truncate pb-2 text-center text-xl font-bold">{app.domain}</div>
 	{#if loading}
-		<div class="w-full text-center font-bold">Loading...</div>
+		<div class="w-full text-center font-bold">{$t('forms.loading')}</div>
 	{:else if app.foundByDomain}
 		<div class="w-full bg-coolgray-200 text-xs">
-			<span class="text-red-500">Domain</span> already used for
+			{@html $t('forms.already_used_for', { type: 'Domains' })}
 			<span class="text-red-500">{app.foundName}</span>
 		</div>
 	{:else if app.foundByRepository}
 		<div class="w-full bg-coolgray-200 text-xs">
-			<span class="text-red-500">Repository</span> already used for
+			{@html $t('forms.already_used_for', { type: 'Repository' })}
 			<span class="text-red-500">{app.foundName}</span>
 		</div>
 	{:else}
 		<button class="bg-green-600 hover:bg-green-500 w-full" on:click={addToCoolify}
-			>Add to Coolify</button
+			>{$t('destination.add_to_coolify')}</button
 		>
 	{/if}
 </div>
diff --git a/src/routes/destinations/[id]/_LocalDocker.svelte b/src/routes/destinations/[id]/_LocalDocker.svelte
index ecbd0313b..30112eec8 100644
--- a/src/routes/destinations/[id]/_LocalDocker.svelte
+++ b/src/routes/destinations/[id]/_LocalDocker.svelte
@@ -10,6 +10,7 @@
 	import { post } from '$lib/api';
 	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
 	import { onMount } from 'svelte';
+	import { t } from '$lib/translations';
 	const { id } = $page.params;
 	let cannotDisable = settings.fqdn && destination.engine === '/var/run/docker.sock';
 	let loading = false;
@@ -85,7 +86,7 @@
 	async function stopProxy() {
 		try {
 			await post(`/destinations/${id}/stop.json`, { engine: destination.engine });
-			return toast.push('Coolify Proxy stopped!');
+			return toast.push($t('destination.coolify_proxy_stopped'));
 		} catch ({ error }) {
 			return errorNotification(error);
 		}
@@ -93,19 +94,17 @@
 	async function startProxy() {
 		try {
 			await post(`/destinations/${id}/start.json`, { engine: destination.engine });
-			return toast.push('Coolify Proxy started!');
+			return toast.push($t('destination.coolify_proxy_started'));
 		} catch ({ error }) {
 			return errorNotification(error);
 		}
 	}
 	async function forceRestartProxy() {
-		const sure = confirm(
-			'Are you sure you want to restart the proxy? Everything will be reconfigured in ~10 secs.'
-		);
+		const sure = confirm($t('destination.confirm_restart_proxy'));
 		if (sure) {
 			try {
 				restarting = true;
-				toast.push('Coolify Proxy restarting...');
+				toast.push($t('destination.coolify_proxy_restarting'));
 				await post(`/destinations/${id}/restart.json`, {
 					engine: destination.engine,
 					fqdn: settings.fqdn
@@ -123,7 +122,7 @@
 
 <form on:submit|preventDefault={handleSubmit} class="grid grid-flow-row gap-2 py-4">
 	<div class="flex space-x-1 pb-5">
-		<div class="title font-bold">Configuration</div>
+		<div class="title font-bold">{$t('forms.configuration')}</div>
 		{#if $session.isAdmin}
 			<button
 				type="submit"
@@ -131,13 +130,15 @@
 				class:bg-sky-600={!loading}
 				class:hover:bg-sky-500={!loading}
 				disabled={loading}
-				>{loading ? 'Saving...' : 'Save'}
+				>{loading ? $t('forms.saving') : $t('forms.save')}
 			</button>
 			<button
 				class={restarting ? '' : 'bg-red-600 hover:bg-red-500'}
 				disabled={restarting}
 				on:click|preventDefault={forceRestartProxy}
-				>{restarting ? 'Restarting... please wait...' : 'Force restart proxy'}</button
+				>{restarting
+					? $t('destination.restarting_please_wait')
+					: $t('destination.force_restart_proxy')}</button
 			>
 		{/if}
 		<!-- <button type="button" class="bg-coollabs hover:bg-coollabs-100" on:click={scanApps}
@@ -145,10 +146,10 @@
 			> -->
 	</div>
 	<div class="grid grid-cols-2 items-center px-10 ">
-		<label for="name" class="text-base font-bold text-stone-100">Name</label>
+		<label for="name" class="text-base font-bold text-stone-100">{$t('forms.name')}</label>
 		<input
 			name="name"
-			placeholder="name"
+			placeholder={$t('forms.name')}
 			disabled={!$session.isAdmin}
 			readonly={!$session.isAdmin}
 			bind:value={destination.name}
@@ -156,13 +157,13 @@
 	</div>
 
 	<div class="grid grid-cols-2 items-center px-10">
-		<label for="engine" class="text-base font-bold text-stone-100">Engine</label>
+		<label for="engine" class="text-base font-bold text-stone-100">{$t('forms.engine')}</label>
 		<CopyPasswordField
 			id="engine"
 			readonly
 			disabled
 			name="engine"
-			placeholder="eg: /var/run/docker.sock"
+			placeholder="{$t('forms.eg')}: /var/run/docker.sock"
 			value={destination.engine}
 		/>
 	</div>
@@ -171,13 +172,13 @@
 			<input name="remoteEngine" type="checkbox" bind:checked={payload.remoteEngine} />
 		</div> -->
 	<div class="grid grid-cols-2 items-center px-10">
-		<label for="network" class="text-base font-bold text-stone-100">Network</label>
+		<label for="network" class="text-base font-bold text-stone-100">{$t('forms.network')}</label>
 		<CopyPasswordField
 			id="network"
 			readonly
 			disabled
 			name="network"
-			placeholder="default: coolify"
+			placeholder="{$t('forms.default')}: coolify"
 			value={destination.network}
 		/>
 	</div>
@@ -188,7 +189,7 @@
 				disabled={cannotDisable}
 				bind:setting={destination.isCoolifyProxyUsed}
 				on:click={changeProxySetting}
-				title="Use Coolify Proxy?"
+				title={$t('destination.use_coolify_proxy')}
 				description={`This will install a proxy on the destination to allow you to access your applications and services without any manual configuration. Databases will have their own proxy. <br><br>${
 					cannotDisable
 						? '<span class="font-bold text-white">You cannot disable this proxy as FQDN is configured for Coolify.</span>'
diff --git a/src/routes/destinations/[id]/_RemoteDocker.svelte b/src/routes/destinations/[id]/_RemoteDocker.svelte
index 4de1b82ce..c17d0239b 100644
--- a/src/routes/destinations/[id]/_RemoteDocker.svelte
+++ b/src/routes/destinations/[id]/_RemoteDocker.svelte
@@ -11,6 +11,7 @@
 	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
 	import { onMount } from 'svelte';
 	import { generateRemoteEngine } from '$lib/components/common';
+	import { t } from '$lib/translations';
 	const { id } = $page.params;
 	let cannotDisable = settings.fqdn && destination.engine === '/var/run/docker.sock';
 	// let scannedApps = [];
@@ -90,7 +91,7 @@
 		try {
 			const engine = generateRemoteEngine(destination);
 			await post(`/destinations/${id}/stop.json`, { engine });
-			return toast.push('Coolify Proxy stopped!');
+			return toast.push($t('destination.coolify_proxy_stopped'));
 		} catch ({ error }) {
 			return errorNotification(error);
 		}
@@ -99,19 +100,17 @@
 		try {
 			const engine = generateRemoteEngine(destination);
 			await post(`/destinations/${id}/start.json`, { engine });
-			return toast.push('Coolify Proxy started!');
+			return toast.push($t('destination.coolify_proxy_started'));
 		} catch ({ error }) {
 			return errorNotification(error);
 		}
 	}
 	async function forceRestartProxy() {
-		const sure = confirm(
-			'Are you sure you want to restart the proxy? Everything will be reconfigured in ~10 secs.'
-		);
+		const sure = confirm($t('destination.confirm_restart_proxy'));
 		if (sure) {
 			try {
 				restarting = true;
-				toast.push('Coolify Proxy restarting...');
+				toast.push($t('destination.coolify_proxy_restarting'));
 				await post(`/destinations/${id}/restart.json`, {
 					engine: destination.engine,
 					fqdn: settings.fqdn
@@ -127,7 +126,7 @@
 
 <form on:submit|preventDefault={handleSubmit} class="grid grid-flow-row gap-2 py-4">
 	<div class="flex space-x-1 pb-5">
-		<div class="title font-bold">Configuration</div>
+		<div class="title font-bold">{$t('forms.configuration')}</div>
 		{#if $session.isAdmin}
 			<button
 				type="submit"
@@ -135,13 +134,15 @@
 				class:bg-sky-600={!loading}
 				class:hover:bg-sky-500={!loading}
 				disabled={loading}
-				>{loading ? 'Saving...' : 'Save'}
+				>{loading ? $t('forms.saving') : $t('forms.save')}
 			</button>
 			<button
 				class={restarting ? '' : 'bg-red-600 hover:bg-red-500'}
 				disabled={restarting}
 				on:click|preventDefault={forceRestartProxy}
-				>{restarting ? 'Restarting... please wait...' : 'Force restart proxy'}</button
+				>{restarting
+					? $t('destination.restarting_please_wait')
+					: $t('destination.force_restart_proxy')}</button
 			>
 		{/if}
 		<!-- <button type="button" class="bg-coollabs hover:bg-coollabs-100" on:click={scanApps}
@@ -149,10 +150,10 @@
 			> -->
 	</div>
 	<div class="grid grid-cols-2 items-center px-10 ">
-		<label for="name" class="text-base font-bold text-stone-100">Name</label>
+		<label for="name" class="text-base font-bold text-stone-100">{$t('forms.name')}</label>
 		<input
 			name="name"
-			placeholder="name"
+			placeholder={$t('forms.name')}
 			disabled={!$session.isAdmin}
 			readonly={!$session.isAdmin}
 			bind:value={destination.name}
@@ -160,13 +161,13 @@
 	</div>
 
 	<div class="grid grid-cols-2 items-center px-10">
-		<label for="engine" class="text-base font-bold text-stone-100">Engine</label>
+		<label for="engine" class="text-base font-bold text-stone-100">{$t('forms.engine')}</label>
 		<CopyPasswordField
 			id="engine"
 			readonly
 			disabled
 			name="engine"
-			placeholder="eg: /var/run/docker.sock"
+			placeholder="{$t('forms.eg')}: /var/run/docker.sock"
 			value={destination.engine}
 		/>
 	</div>
@@ -175,13 +176,13 @@
 			<input name="remoteEngine" type="checkbox" bind:checked={payload.remoteEngine} />
 		</div> -->
 	<div class="grid grid-cols-2 items-center px-10">
-		<label for="network" class="text-base font-bold text-stone-100">Network</label>
+		<label for="network" class="text-base font-bold text-stone-100">{$t('forms.network')}</label>
 		<CopyPasswordField
 			id="network"
 			readonly
 			disabled
 			name="network"
-			placeholder="default: coolify"
+			placeholder="{$t('forms.default')}: coolify"
 			value={destination.network}
 		/>
 	</div>
@@ -190,7 +191,7 @@
 			disabled={cannotDisable}
 			bind:setting={destination.isCoolifyProxyUsed}
 			on:click={changeProxySetting}
-			title="Use Coolify Proxy?"
+			title={$t('destination.use_coolify_proxy')}
 			description={`This will install a proxy on the destination to allow you to access your applications and services without any manual configuration. Databases will have their own proxy. <br><br>${
 				cannotDisable
 					? '<span class="font-bold text-white">You cannot disable this proxy as FQDN is configured for Coolify.</span>'
diff --git a/src/routes/destinations/[id]/__layout.svelte b/src/routes/destinations/[id]/__layout.svelte
index 892e8e99b..6d49fbb63 100644
--- a/src/routes/destinations/[id]/__layout.svelte
+++ b/src/routes/destinations/[id]/__layout.svelte
@@ -37,10 +37,11 @@
 	import DeleteIcon from '$lib/components/DeleteIcon.svelte';
 	import { del } from '$lib/api';
 	import { goto } from '$app/navigation';
+	import { t } from '$lib/translations';
 
 	export let destination;
 	async function deleteDestination(destination) {
-		const sure = confirm(`Are you sure you would like to delete '${destination.name}'?`);
+		const sure = confirm($t('application.confirm_to_delete', { name: destination.name }));
 		if (sure) {
 			try {
 				await del(`/destinations/${destination.id}.json`, { id: destination.id });
@@ -55,14 +56,14 @@
 <nav class="nav-side">
 	<button
 		on:click={() => deleteDestination(destination)}
-		title="Delete Destination"
+		title={$t('destination.delete_destination')}
 		type="submit"
 		disabled={!$session.isAdmin}
 		class:hover:text-red-500={$session.isAdmin}
 		class="icons tooltip-bottom bg-transparent text-sm"
 		data-tooltip={$session.isAdmin
-			? 'Delete Destination'
-			: 'You do not have permission to delete this destination'}><DeleteIcon /></button
+			? $t('destination.delete_destination')
+			: $t('destination.permission_denied_delete_destination')}><DeleteIcon /></button
 	>
 </nav>
 <slot />
diff --git a/src/routes/destinations/[id]/index.json.ts b/src/routes/destinations/[id]/index.json.ts
index d64df8c08..aa9be6aea 100644
--- a/src/routes/destinations/[id]/index.json.ts
+++ b/src/routes/destinations/[id]/index.json.ts
@@ -8,7 +8,6 @@ import type { RequestHandler } from '@sveltejs/kit';
 export const get: RequestHandler = async (event) => {
 	const { teamId, status, body } = await getUserDetails(event);
 	if (status === 401) return { status, body };
-	console.log(teamId);
 	const { id } = event.params;
 	try {
 		const destination = await db.getDestination({ id, teamId });
diff --git a/src/routes/destinations/[id]/index.svelte b/src/routes/destinations/[id]/index.svelte
index 68f529b54..1effefdd7 100644
--- a/src/routes/destinations/[id]/index.svelte
+++ b/src/routes/destinations/[id]/index.svelte
@@ -36,10 +36,11 @@
 	import type Prisma from '@prisma/client';
 	import LocalDocker from './_LocalDocker.svelte';
 	import RemoteDocker from './_RemoteDocker.svelte';
+	import { t } from '$lib/translations';
 </script>
 
 <div class="flex space-x-1 p-6 text-2xl font-bold">
-	<div class="tracking-tight">Destination</div>
+	<div class="tracking-tight">{$t('application.destination')}</div>
 	<span class="arrow-right-applications px-1">></span>
 	<span class="pr-2">{destination.name}</span>
 </div>
diff --git a/src/routes/destinations/index.svelte b/src/routes/destinations/index.svelte
index 6921e4db4..2254cfe5e 100644
--- a/src/routes/destinations/index.svelte
+++ b/src/routes/destinations/index.svelte
@@ -23,6 +23,8 @@
 	import type Prisma from '@prisma/client';
 
 	import { session } from '$app/stores';
+	import { t } from '$lib/translations';
+
 	export let destinations: Prisma.DestinationDocker[];
 	const ownDestinations = destinations.filter((destination) => {
 		if (destination.teams[0].id === $session.teamId) {
@@ -37,7 +39,7 @@
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">Destinations</div>
+	<div class="mr-4 text-2xl tracking-tight">{$t('index.destinations')}</div>
 	{#if $session.isAdmin}
 		<a href="/new/destination" class="add-icon bg-sky-600 hover:bg-sky-500">
 			<svg
@@ -59,7 +61,7 @@
 <div class="flex justify-center">
 	{#if !destinations || ownDestinations.length === 0}
 		<div class="flex-col">
-			<div class="text-center text-xl font-bold">No destination found</div>
+			<div class="text-center text-xl font-bold">{$t('destination.no_destination_found')}</div>
 		</div>
 	{/if}
 	{#if ownDestinations.length > 0 || otherDestinations.length > 0}
diff --git a/src/routes/iam/index.json.ts b/src/routes/iam/index.json.ts
index fa44e55ba..6ff142eb3 100644
--- a/src/routes/iam/index.json.ts
+++ b/src/routes/iam/index.json.ts
@@ -13,20 +13,25 @@ export const get: RequestHandler = async (event) => {
 			select: { id: true, email: true, teams: true }
 		});
 		let accounts = [];
+		let allTeams = [];
 		if (teamId === '0') {
 			accounts = await db.prisma.user.findMany({ select: { id: true, email: true, teams: true } });
+			allTeams = await db.prisma.team.findMany({
+				where: { users: { none: { id: userId } } },
+				include: { permissions: true }
+			});
 		}
-
-		const teams = await db.prisma.permission.findMany({
-			where: { userId: teamId === '0' ? undefined : userId },
-			include: { team: { include: { _count: { select: { users: true } } } } }
+		const ownTeams = await db.prisma.team.findMany({
+			where: { users: { some: { id: userId } } },
+			include: { permissions: true }
 		});
 
 		const invitations = await db.prisma.teamInvitation.findMany({ where: { uid: userId } });
 		return {
 			status: 200,
 			body: {
-				teams,
+				ownTeams,
+				allTeams,
 				invitations,
 				account,
 				accounts
diff --git a/src/routes/iam/index.svelte b/src/routes/iam/index.svelte
index 8c33d5a38..67b104baa 100644
--- a/src/routes/iam/index.svelte
+++ b/src/routes/iam/index.svelte
@@ -32,21 +32,12 @@
 
 	export let account;
 	export let accounts;
+	export let invitations;
 	if (accounts.length === 0) {
 		accounts.push(account);
 	}
-	export let teams;
-
-	const ownTeams = teams.filter((team) => {
-		if (team.team.id === $session.teamId) {
-			return team;
-		}
-	});
-	const otherTeams = teams.filter((team) => {
-		if (team.team.id !== $session.teamId) {
-			return team;
-		}
-	});
+	export let ownTeams;
+	export let allTeams;
 
 	async function resetPassword(id) {
 		const sure = window.confirm('Are you sure you want to reset the password?');
@@ -74,12 +65,66 @@
 			return errorNotification(error);
 		}
 	}
+	async function acceptInvitation(id, teamId) {
+		try {
+			await post(`/iam/team/${teamId}/invitation/accept.json`, { id });
+			return window.location.reload();
+		} catch ({ error }) {
+			return errorNotification(error);
+		}
+	}
+	async function revokeInvitation(id, teamId) {
+		try {
+			await post(`/iam/team/${teamId}/invitation/revoke.json`, { id });
+			return window.location.reload();
+		} catch ({ error }) {
+			return errorNotification(error);
+		}
+	}
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
 	<div class="mr-4 text-2xl tracking-tight">Identity and Access Management</div>
+	<a href="/new/team" class="add-icon cursor-pointer bg-fuchsia-600 hover:bg-fuchsia-500">
+		<svg
+			class="w-6"
+			xmlns="http://www.w3.org/2000/svg"
+			fill="none"
+			viewBox="0 0 24 24"
+			stroke="currentColor"
+			><path
+				stroke-linecap="round"
+				stroke-linejoin="round"
+				stroke-width="2"
+				d="M12 6v6m0 0v6m0-6h6m-6 0H6"
+			/></svg
+		>
+	</a>
 </div>
 
+{#if invitations.length > 0}
+	<div class="mx-auto max-w-4xl px-6 py-4">
+		<div class="title font-bold">Pending invitations</div>
+		<div class="pt-10 text-center">
+			{#each invitations as invitation}
+				<div class="flex justify-center space-x-2">
+					<div>
+						Invited to <span class="font-bold text-pink-600">{invitation.teamName}</span> with
+						<span class="font-bold text-rose-600">{invitation.permission}</span> permission.
+					</div>
+					<button
+						class="hover:bg-green-500"
+						on:click={() => acceptInvitation(invitation.id, invitation.teamId)}>Accept</button
+					>
+					<button
+						class="hover:bg-red-600"
+						on:click={() => revokeInvitation(invitation.id, invitation.teamId)}>Delete</button
+					>
+				</div>
+			{/each}
+		</div>
+	</div>
+{/if}
 <div class="mx-auto max-w-4xl px-6 py-4">
 	{#if $session.teamId === '0' && accounts.length > 0}
 		<div class="title font-bold">Accounts</div>
@@ -104,14 +149,14 @@
 						<td class="flex space-x-2">
 							<form on:submit|preventDefault={() => resetPassword(account.id)}>
 								<button
-									class="mx-auto my-4 w-32 bg-coollabs hover:bg-coollabs-100 disabled:bg-coolgray-200"
+									class="mx-auto my-4 w-32 bg-fuchsia-600 hover:bg-fuchsia-500 disabled:bg-coolgray-200"
 									>Reset Password</button
 								>
 							</form>
 							<form on:submit|preventDefault={() => deleteUser(account.id)}>
 								<button
 									disabled={account.id === $session.userId}
-									class="mx-auto my-4 w-32 bg-coollabs hover:bg-coollabs-100 disabled:bg-coolgray-200"
+									class="mx-auto my-4 w-32 bg-red-600 hover:bg-red-500 disabled:bg-coolgray-200"
 									type="submit">Delete User</button
 								>
 							</form>
@@ -127,49 +172,51 @@
 	<div class="title font-bold">Teams</div>
 	<div class="flex items-center justify-center pt-10">
 		<div class="flex flex-col">
-			<div class="flex flex-col flex-wrap justify-center px-2 pb-10 md:flex-row">
+			<div class="flex flex-row flex-wrap justify-center px-2 pb-10 md:flex-row">
 				{#each ownTeams as team}
-					<a href="/iam/team/{team.teamId}" class="w-96 p-2 no-underline">
+					<a href="/iam/team/{team.id}" class="w-96 p-2 no-underline">
 						<div
 							class="box-selection relative"
-							class:hover:bg-cyan-600={team.team?.id !== '0'}
-							class:hover:bg-red-500={team.team?.id === '0'}
+							class:hover:bg-fuchsia-600={team.id !== '0'}
+							class:hover:bg-red-500={team.id === '0'}
 						>
 							<div class="truncate text-center text-xl font-bold">
-								{team.team.name}
+								{team.name}
 							</div>
 							<div class="truncate text-center font-bold">
-								{team.team?.id === '0' ? 'root team' : ''}
+								{team.id === '0' ? 'root team' : ''}
 							</div>
 
-							<div class="mt-1 text-center">{team.team._count.users} member(s)</div>
+							<div class:mt-6={team.id !== '0'} class="mt-1 text-center">
+								{team.permissions?.length} member(s)
+							</div>
 						</div>
 					</a>
 				{/each}
 			</div>
-			{#if $session.teamId === '0' && otherTeams.length > 0}
+			{#if $session.teamId === '0' && allTeams.length > 0}
 				<div class="pb-5 pt-10 text-xl font-bold">Other Teams</div>
-			{/if}
-			<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
-				{#each otherTeams as team}
-					<a href="/iam/team/{team.teamId}" class="w-96 p-2 no-underline">
-						<div
-							class="box-selection relative"
-							class:hover:bg-cyan-600={team.team?.id !== '0'}
-							class:hover:bg-red-500={team.team?.id === '0'}
-						>
-							<div class="truncate text-center text-xl font-bold">
-								{team.team.name}
-							</div>
-							<div class="truncate text-center font-bold">
-								{team.team?.id === '0' ? 'root team' : ''}
-							</div>
+				<div class="flex flex-row flex-wrap justify-center px-2 md:flex-row">
+					{#each allTeams as team}
+						<a href="/iam/team/{team.id}" class="w-96 p-2 no-underline">
+							<div
+								class="box-selection relative"
+								class:hover:bg-fuchsia-600={team.id !== '0'}
+								class:hover:bg-red-500={team.id === '0'}
+							>
+								<div class="truncate text-center text-xl font-bold">
+									{team.name}
+								</div>
+								<div class="truncate text-center font-bold">
+									{team.id === '0' ? 'root team' : ''}
+								</div>
 
-							<div class="mt-1 text-center">{team.team._count.users} member(s)</div>
-						</div>
-					</a>
-				{/each}
-			</div>
+								<div class="mt-1 text-center">{team.permissions?.length} member(s)</div>
+							</div>
+						</a>
+					{/each}
+				</div>
+			{/if}
 		</div>
 	</div>
 </div>
diff --git a/src/routes/iam/team/[id]/index.svelte b/src/routes/iam/team/[id]/index.svelte
index 541b21379..0eff7af34 100644
--- a/src/routes/iam/team/[id]/index.svelte
+++ b/src/routes/iam/team/[id]/index.svelte
@@ -27,6 +27,7 @@
 	import Explainer from '$lib/components/Explainer.svelte';
 	import { errorNotification } from '$lib/form';
 	import { post } from '$lib/api';
+	import { t } from '$lib/translations';
 	const { id } = $page.params;
 	let invitation = {
 		teamName: team.name,
@@ -94,25 +95,22 @@
 </script>
 
 <div class="flex space-x-1 p-6 px-6 text-2xl font-bold">
-	<div class="tracking-tight">Team</div>
-	<span class="arrow-right-applications px-1 text-cyan-500">></span>
+	<div class="tracking-tight">{$t('index.team')}</div>
+	<span class="arrow-right-applications px-1 text-fuchsia-500">></span>
 	<span class="pr-2">{team.name}</span>
 </div>
 <div class="mx-auto max-w-4xl px-6">
 	<form on:submit|preventDefault={handleSubmit} class=" py-4">
 		<div class="flex space-x-1 pb-5">
-			<div class="title font-bold">Settings</div>
-			<button class="bg-cyan-600 hover:bg-cyan-500" type="submit">Save</button>
+			<div class="title font-bold">{$t('index.settings')}</div>
+			<button class="bg-fuchsia-600 hover:bg-fuchsia-500" type="submit">{$t('forms.save')}</button>
 		</div>
 		<div class="grid grid-flow-row gap-2 px-10">
 			<div class="mt-2 grid grid-cols-2">
 				<div class="flex-col">
-					<label for="name" class="text-base font-bold text-stone-100">Name</label>
+					<label for="name" class="text-base font-bold text-stone-100">{$t('forms.name')}</label>
 					{#if team.id === '0'}
-						<Explainer
-							customClass="w-full"
-							text="This is the <span class='text-red-500 font-bold'>root</span> team. That means members of this group can manage instance wide settings and have all the priviliges in Coolify (imagine like root user on Linux)."
-						/>
+						<Explainer customClass="w-full" text={$t('team.root_team_explainer')} />
 					{/if}
 				</div>
 				<input id="name" name="name" placeholder="name" bind:value={team.name} />
@@ -121,22 +119,23 @@
 	</form>
 
 	<div class="flex space-x-1 py-5 pt-10 font-bold">
-		<div class="title">Members</div>
+		<div class="title">{$t('team.members')}</div>
 	</div>
 	<div class="px-4 sm:px-6">
 		<table class="w-full border-separate text-left">
 			<thead>
 				<tr class="h-8 border-b border-coolgray-400">
-					<th scope="col">Email</th>
-					<th scope="col">Permission</th>
-					<th scope="col" class="text-center">Actions</th>
+					<th scope="col">{$t('forms.email')}</th>
+					<th scope="col">{$t('team.permission')}</th>
+					<th scope="col" class="text-center">{$t('forms.action')}</th>
 				</tr>
 			</thead>
 			{#each permissions as permission}
 				<tr class="text-xs">
 					<td class="py-4"
 						>{permission.user.email}
-						<span class="font-bold">{permission.user.id === $session.userId ? '(You)' : ''}</span
+						<span class="font-bold"
+							>{permission.user.id === $session.userId ? $t('team.you') : ''}</span
 						></td
 					>
 					<td class="py-4">{permission.permission}</td>
@@ -144,17 +143,21 @@
 						<td class="flex flex-col items-center justify-center space-y-2 py-4 text-center">
 							<button
 								class="w-52 bg-red-600 hover:bg-red-500"
-								on:click={() => removeFromTeam(permission.user.id)}>Remove</button
+								on:click={() => removeFromTeam(permission.user.id)}>{$t('forms.remove')}</button
 							>
 							<button
 								class="w-52"
 								on:click={() =>
 									changePermission(permission.user.id, permission.id, permission.permission)}
-								>Promote to {permission.permission === 'admin' ? 'read' : 'admin'}</button
+								>{$t('team.promote_to', {
+									grade: permission.permission === 'admin' ? 'read' : 'admin'
+								})}</button
 							>
 						</td>
 					{:else}
-						<td class="text-center py-4 flex-col space-y-2"> No actions available </td>
+						<td class="text-center py-4 flex-col space-y-2">
+							{$t('forms.no_actions_available')}
+						</td>
 					{/if}
 				</tr>
 			{/each}
@@ -167,11 +170,12 @@
 						<td class="flex-col space-y-2 py-4 text-center">
 							<button
 								class="w-52 bg-red-600 hover:bg-red-500"
-								on:click={() => revokeInvitation(invitation.id)}>Revoke invitation</button
+								on:click={() => revokeInvitation(invitation.id)}
+								>{$t('team.revoke_invitation')}</button
 							>
 						</td>
 					{:else}
-						<td class="text-center py-4 flex-col space-y-2">Pending invitation</td>
+						<td class="text-center py-4 flex-col space-y-2">{$t('team.pending_invitation')}</td>
 					{/if}
 				</tr>
 			{/each}
@@ -181,18 +185,18 @@
 		<form on:submit|preventDefault={sendInvitation} class="py-5 pt-10">
 			<div class="flex space-x-1">
 				<div class="flex space-x-1">
-					<div class="title font-bold">Invite new member</div>
-					<button class="bg-cyan-600 hover:bg-cyan-500" type="submit">Send invitation</button>
+					<div class="title font-bold">{$t('team.invite_new_member')}</div>
+					<button class="bg-fuchsia-600 hover:bg-fuchsia-500" type="submit"
+						>{$t('team.send_invitation')}</button
+					>
 				</div>
 			</div>
-			<Explainer
-				text="You can only invite registered users at the moment - will be extended soon."
-			/>
+			<Explainer text={$t('team.invite_only_register_explainer')} />
 			<div class="flex-col space-y-2 px-4 pt-5 sm:px-6">
 				<div class="flex space-x-0">
 					<input
 						bind:value={invitation.email}
-						placeholder="Email address"
+						placeholder={$t('forms.email')}
 						class="mr-2 w-full"
 						required
 					/>
@@ -202,14 +206,14 @@
 						class="rounded-none rounded-l border border-dashed border-transparent"
 						type="button"
 						class:border-coolgray-300={invitation.permission !== 'read'}
-						class:bg-pink-500={invitation.permission === 'read'}>Read</button
+						class:bg-fuchsia-500={invitation.permission === 'read'}>{$t('team.read')}</button
 					>
 					<button
 						on:click={() => (invitation.permission = 'admin')}
 						class="rounded-none rounded-r border border-dashed border-transparent"
 						type="button"
 						class:border-coolgray-300={invitation.permission !== 'admin'}
-						class:bg-red-500={invitation.permission === 'admin'}>Admin</button
+						class:bg-red-500={invitation.permission === 'admin'}>{$t('team.admin')}</button
 					>
 				</div>
 			</div>
diff --git a/src/routes/index.svelte b/src/routes/index.svelte
index 84cf7188f..1eaabbd5c 100644
--- a/src/routes/index.svelte
+++ b/src/routes/index.svelte
@@ -20,6 +20,8 @@
 </script>
 
 <script lang="ts">
+	import { t } from '$lib/translations';
+
 	export let applicationsCount: number;
 	export let sourcesCount: number;
 	export let destinationsCount: number;
@@ -29,7 +31,7 @@
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">Dashboard</div>
+	<div class="mr-4 text-2xl tracking-tight">{$t('index.dashboard')}</div>
 </div>
 
 <div class="mt-10 pb-12 tracking-tight sm:pb-16">
@@ -44,7 +46,7 @@
 						class="flex cursor-pointer flex-col rounded p-6 text-center text-green-500 no-underline transition duration-150 hover:bg-green-500 hover:text-white"
 					>
 						<dt class="order-2 mt-2 text-sm font-bold uppercase leading-6 text-white">
-							Applications
+							{$t('index.applications')}
 						</dt>
 						<dd class="order-1 text-5xl font-extrabold ">
 							{applicationsCount}
@@ -56,7 +58,7 @@
 						class="flex cursor-pointer flex-col rounded p-6 text-center text-sky-500 no-underline transition duration-150 hover:bg-sky-500 hover:text-white"
 					>
 						<dt class="order-2 mt-2 text-sm font-bold uppercase leading-6 text-white">
-							Destinations
+							{$t('index.destinations')}
 						</dt>
 						<dd class="order-1 text-5xl font-extrabold ">
 							{destinationsCount}
@@ -68,7 +70,7 @@
 						class="flex cursor-pointer flex-col rounded p-6 text-center text-orange-500 no-underline transition duration-150 hover:bg-orange-500 hover:text-white"
 					>
 						<dt class="order-2 mt-2 text-sm font-bold uppercase leading-6 text-white">
-							Git Sources
+							{$t('index.git_sources')}
 						</dt>
 						<dd class="order-1 text-5xl font-extrabold ">
 							{sourcesCount}
@@ -79,7 +81,9 @@
 						sveltekit:prefetch
 						class="flex cursor-pointer flex-col rounded p-6 text-center text-purple-500 no-underline transition duration-150 hover:bg-purple-500 hover:text-white"
 					>
-						<dt class="order-2 mt-2 text-sm font-bold uppercase leading-6 text-white">Databases</dt>
+						<dt class="order-2 mt-2 text-sm font-bold uppercase leading-6 text-white">
+							{$t('index.databases')}
+						</dt>
 						<dd class="order-1 text-5xl font-extrabold ">{databasesCount}</dd>
 					</a>
 					<a
@@ -87,7 +91,9 @@
 						sveltekit:prefetch
 						class="flex cursor-pointer flex-col rounded p-6 text-center text-pink-500 no-underline transition duration-150 hover:bg-pink-500 hover:text-white"
 					>
-						<dt class="order-2 mt-2 text-sm font-bold uppercase leading-6 text-white">Services</dt>
+						<dt class="order-2 mt-2 text-sm font-bold uppercase leading-6 text-white">
+							{$t('index.services')}
+						</dt>
 						<dd class="order-1 text-5xl font-extrabold ">{servicesCount}</dd>
 					</a>
 
@@ -96,7 +102,9 @@
 						sveltekit:prefetch
 						class="flex cursor-pointer flex-col rounded p-6 text-center text-cyan-500 no-underline transition duration-150 hover:bg-cyan-500 hover:text-white"
 					>
-						<dt class="order-2 mt-2 text-sm font-bold uppercase leading-6 text-white">Teams</dt>
+						<dt class="order-2 mt-2 text-sm font-bold uppercase leading-6 text-white">
+							{$t('index.teams')}
+						</dt>
 						<dd class="order-1 text-5xl font-extrabold ">
 							{teamsCount}
 						</dd>
diff --git a/src/routes/login/index.svelte b/src/routes/login/index.svelte
index b321bc086..7ebefd55e 100644
--- a/src/routes/login/index.svelte
+++ b/src/routes/login/index.svelte
@@ -4,6 +4,7 @@
 	import { session } from '$app/stores';
 	import { post } from '$lib/api';
 	import { errorNotification } from '$lib/form';
+	import { t } from '$lib/translations';
 	import { onMount } from 'svelte';
 	let loading = false;
 	let emailEl;
@@ -37,18 +38,29 @@
 	}
 </script>
 
+<svelt:head>
+	<title>{$t('login.login')}</title>
+</svelt:head>
+
 <div class="flex h-screen flex-col items-center justify-center">
 	{#if $session.userId}
-		<div class="flex justify-center px-4 text-xl font-bold">Already logged in...</div>
+		<div class="flex justify-center px-4 text-xl font-bold">{$t('login.already_logged_in')}</div>
 	{:else}
 		<div class="flex justify-center px-4">
 			<form on:submit|preventDefault={handleSubmit} class="flex flex-col py-4 space-y-2">
-				<div class="text-6xl font-bold border-gradient w-48 mx-auto border-b-4">Coolify</div>
-				<div class="text-xs text-center font-bold pb-10">v{$session.version}</div>
+				{#if $session.whiteLabelDetails.icon}
+					<img
+						class="w-32 mx-auto pb-8"
+						src={$session.whiteLabelDetails.icon}
+						alt="Icon for white labeled version of Coolify"
+					/>
+				{:else}
+					<div class="text-6xl font-bold border-gradient w-48 mx-auto border-b-4 mb-8">Coolify</div>
+				{/if}
 				<input
 					type="email"
 					name="email"
-					placeholder="Email"
+					placeholder={$t('forms.email')}
 					autocomplete="off"
 					required
 					bind:this={emailEl}
@@ -57,7 +69,7 @@
 				<input
 					type="password"
 					name="password"
-					placeholder="Password"
+					placeholder={$t('forms.password')}
 					bind:value={password}
 					required
 				/>
@@ -69,16 +81,14 @@
 						class="hover:opacity-90 text-white"
 						class:bg-transparent={loading}
 						class:text-stone-600={loading}
-						class:bg-coollabs={!loading}>{loading ? 'Authenticating...' : 'Login'}</button
+						class:bg-coollabs={!loading}
+						>{loading ? $t('login.authenticating') : $t('login.login')}</button
 					>
 
 					<button
 						on:click|preventDefault={() => goto('/register')}
-						class="bg-transparent hover:bg-coolgray-300	text-white ">Register</button
-					>
-					<button
-						class="bg-transparent hover:bg-coolgray-300"
-						on:click|preventDefault={() => goto('/reset')}>Reset password</button
+						class="bg-transparent hover:bg-coolgray-300	text-white "
+						>{$t('register.register')}</button
 					>
 				</div>
 			</form>
diff --git a/src/routes/logs.json.ts b/src/routes/logs.json.ts
new file mode 100644
index 000000000..452d455e1
--- /dev/null
+++ b/src/routes/logs.json.ts
@@ -0,0 +1,18 @@
+import type { RequestHandler } from '@sveltejs/kit';
+import * as db from '$lib/database';
+
+export const post: RequestHandler = async (event) => {
+	const data = await event.request.json();
+	for (const d of data) {
+		if (d.container_name) {
+			const { log, container_name: containerId, source } = d;
+			console.log(log);
+			// await db.prisma.applicationLogs.create({ data: { log, containerId: containerId.substr(1), source } });
+		}
+	}
+
+	return {
+		status: 200,
+		body: {}
+	};
+};
diff --git a/src/routes/new/destination/_LocalDocker.svelte b/src/routes/new/destination/_LocalDocker.svelte
index ca1c0733e..dc08ea053 100644
--- a/src/routes/new/destination/_LocalDocker.svelte
+++ b/src/routes/new/destination/_LocalDocker.svelte
@@ -7,11 +7,14 @@
 	import { post } from '$lib/api';
 	import Setting from '$lib/components/Setting.svelte';
 	import { errorNotification } from '$lib/form';
+	import { t } from '$lib/translations';
 
 	let loading = false;
 
 	async function handleSubmit() {
+		if (loading) return;
 		try {
+			loading = true;
 			await post('/new/destination/check.json', { network: payload.network });
 			const { id } = await post('/new/destination/docker.json', {
 				...payload
@@ -26,7 +29,7 @@
 <div class="flex justify-center px-6 pb-8">
 	<form on:submit|preventDefault={handleSubmit} class="grid grid-flow-row gap-2 py-4">
 		<div class="flex items-center space-x-2 pb-5">
-			<div class="title font-bold">Configuration</div>
+			<div class="title font-bold">{$t('forms.configuration')}</div>
 			<button
 				type="submit"
 				class:bg-sky-600={!loading}
@@ -34,36 +37,41 @@
 				disabled={loading}
 				>{loading
 					? payload.isCoolifyProxyUsed
-						? 'Saving and configuring proxy...'
-						: 'Saving...'
-					: 'Save'}</button
+						? $t('destination.new.saving_and_configuring_proxy')
+						: $t('forms.saving')
+					: $t('forms.save')}</button
 			>
 		</div>
 		<div class="mt-2 grid grid-cols-2 items-center px-10">
-			<label for="name" class="text-base font-bold text-stone-100">Name</label>
-			<input required name="name" placeholder="name" bind:value={payload.name} />
+			<label for="name" class="text-base font-bold text-stone-100">{$t('forms.name')}</label>
+			<input required name="name" placeholder={$t('forms.name')} bind:value={payload.name} />
 		</div>
 
 		<div class="grid grid-cols-2 items-center px-10">
-			<label for="engine" class="text-base font-bold text-stone-100">Engine</label>
+			<label for="engine" class="text-base font-bold text-stone-100">{$t('forms.engine')}</label>
 			<input
 				required
 				name="engine"
-				placeholder="eg: /var/run/docker.sock"
+				placeholder="{$t('forms.eg')}: /var/run/docker.sock"
 				bind:value={payload.engine}
 			/>
 		</div>
 		<div class="grid grid-cols-2 items-center px-10">
-			<label for="network" class="text-base font-bold text-stone-100">Network</label>
-			<input required name="network" placeholder="default: coolify" bind:value={payload.network} />
+			<label for="network" class="text-base font-bold text-stone-100">{$t('forms.network')}</label>
+			<input
+				required
+				name="network"
+				placeholder="{$t('forms.default')}: coolify"
+				bind:value={payload.network}
+			/>
 		</div>
 		{#if $session.teamId === '0'}
 			<div class="grid grid-cols-2 items-center">
 				<Setting
 					bind:setting={payload.isCoolifyProxyUsed}
 					on:click={() => (payload.isCoolifyProxyUsed = !payload.isCoolifyProxyUsed)}
-					title="Use Coolify Proxy?"
-					description="This will install a proxy on the destination to allow you to access your applications and services without any manual configuration (recommended for Docker).<br><br>Databases will have their own proxy."
+					title={$t('destination.use_coolify_proxy')}
+					description={$t('destination.new.install_proxy')}
 				/>
 			</div>
 		{/if}
diff --git a/src/routes/new/destination/_RemoteDocker.svelte b/src/routes/new/destination/_RemoteDocker.svelte
index 780c66019..d032d77b4 100644
--- a/src/routes/new/destination/_RemoteDocker.svelte
+++ b/src/routes/new/destination/_RemoteDocker.svelte
@@ -7,6 +7,7 @@
 	import Explainer from '$lib/components/Explainer.svelte';
 	import Setting from '$lib/components/Setting.svelte';
 	import { errorNotification } from '$lib/form';
+	import { t } from '$lib/translations';
 
 	let loading = false;
 
@@ -25,7 +26,7 @@
 <div class="flex justify-center px-6 pb-8">
 	<form on:submit|preventDefault={handleSubmit} class="grid grid-flow-row gap-2 py-4">
 		<div class="flex items-center space-x-2 pb-5">
-			<div class="title font-bold">Configuration</div>
+			<div class="title font-bold">{$t('forms.configuration')}</div>
 			<button
 				type="submit"
 				class:bg-sky-600={!loading}
@@ -33,57 +34,66 @@
 				disabled={loading}
 				>{loading
 					? payload.isCoolifyProxyUsed
-						? 'Saving and configuring proxy...'
-						: 'Saving...'
-					: 'Save'}</button
+						? $t('destination.new.saving_and_configuring_proxy')
+						: $t('forms.saving')
+					: $t('forms.save')}</button
 			>
 		</div>
 		<div class="mt-2 grid grid-cols-2 items-center px-10">
-			<label for="name" class="text-base font-bold text-stone-100">Name</label>
-			<input required name="name" placeholder="name" bind:value={payload.name} />
+			<label for="name" class="text-base font-bold text-stone-100">{$t('forms.name')}</label>
+			<input required name="name" placeholder={$t('forms.name')} bind:value={payload.name} />
 		</div>
 
 		<div class="grid grid-cols-2 items-center px-10">
-			<label for="ipAddress" class="text-base font-bold text-stone-100">IP Address</label>
+			<label for="ipAddress" class="text-base font-bold text-stone-100"
+				>{$t('forms.ip_address')}</label
+			>
 			<input
 				required
 				name="ipAddress"
-				placeholder="eg: 192.168..."
+				placeholder="{$t('forms.eg')}: 192.168..."
 				bind:value={payload.ipAddress}
 			/>
 		</div>
 
 		<div class="grid grid-cols-2 items-center px-10">
-			<label for="user" class="text-base font-bold text-stone-100">User</label>
-			<input required name="user" placeholder="eg: root" bind:value={payload.user} />
+			<label for="user" class="text-base font-bold text-stone-100">{$t('forms.user')}</label>
+			<input required name="user" placeholder="{$t('forms.eg')}: root" bind:value={payload.user} />
 		</div>
 
 		<div class="grid grid-cols-2 items-center px-10">
-			<label for="port" class="text-base font-bold text-stone-100">Port</label>
-			<input required name="port" placeholder="eg: 22" bind:value={payload.port} />
+			<label for="port" class="text-base font-bold text-stone-100">{$t('forms.port')}</label>
+			<input required name="port" placeholder="{$t('forms.eg')}: 22" bind:value={payload.port} />
 		</div>
 		<div class="grid grid-cols-2 items-center px-10">
-			<label for="sshPrivateKey" class="text-base font-bold text-stone-100">SSH Private Key</label>
+			<label for="sshPrivateKey" class="text-base font-bold text-stone-100"
+				>{$t('forms.ssh_private_key')}</label
+			>
 			<textarea
 				rows="10"
 				class="resize-none"
 				required
 				name="sshPrivateKey"
-				placeholder="eg: -----BEGIN...."
+				placeholder="{$t('forms.eg')}: -----BEGIN...."
 				bind:value={payload.sshPrivateKey}
 			/>
 		</div>
 
 		<div class="grid grid-cols-2 items-center px-10">
-			<label for="network" class="text-base font-bold text-stone-100">Network</label>
-			<input required name="network" placeholder="default: coolify" bind:value={payload.network} />
+			<label for="network" class="text-base font-bold text-stone-100">{$t('forms.network')}</label>
+			<input
+				required
+				name="network"
+				placeholder="{$t('forms.default')}: coolify"
+				bind:value={payload.network}
+			/>
 		</div>
 		<div class="grid grid-cols-2 items-center">
 			<Setting
 				bind:setting={payload.isCoolifyProxyUsed}
 				on:click={() => (payload.isCoolifyProxyUsed = !payload.isCoolifyProxyUsed)}
-				title="Use Coolify Proxy?"
-				description="This will install a proxy on the destination to allow you to access your applications and services without any manual configuration (recommended for Docker).<br><br>Databases will have their own proxy."
+				title={$t('destination.use_coolify_proxy')}
+				description={$t('destination.new.install_proxy')}
 			/>
 		</div>
 	</form>
diff --git a/src/routes/new/destination/check.json.ts b/src/routes/new/destination/check.json.ts
index 22af08e91..54f099e4a 100644
--- a/src/routes/new/destination/check.json.ts
+++ b/src/routes/new/destination/check.json.ts
@@ -1,5 +1,6 @@
 import { getUserDetails } from '$lib/common';
 import { isDockerNetworkExists, ErrorHandler } from '$lib/database';
+import { t } from '$lib/translations';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const post: RequestHandler = async (event) => {
@@ -9,9 +10,10 @@ export const post: RequestHandler = async (event) => {
 	const { network } = await event.request.json();
 	try {
 		const found = await isDockerNetworkExists({ network });
+
 		if (found) {
 			throw {
-				error: `Network ${network} already configured for another team!`
+				error: t.get('destination.new_error_network_already_exists', { network: network })
 			};
 		}
 		return {
diff --git a/src/routes/new/destination/docker.json.ts b/src/routes/new/destination/docker.json.ts
index 871efe949..f3941e025 100644
--- a/src/routes/new/destination/docker.json.ts
+++ b/src/routes/new/destination/docker.json.ts
@@ -1,43 +1,22 @@
-import { asyncExecShell, getUserDetails } from '$lib/common';
+import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
 import { ErrorHandler } from '$lib/database';
-import { dockerInstance } from '$lib/docker';
 import type { RequestHandler } from '@sveltejs/kit';
+import type { CreateDockerDestination } from '$lib/types/destinations';
 
 export const post: RequestHandler = async (event) => {
 	const { teamId, status, body } = await getUserDetails(event);
 	if (status === 401) return { status, body };
 
-	const {
-		name,
-		engine,
-		network,
-		isCoolifyProxyUsed,
-		remoteEngine,
-		ipAddress,
-		user,
-		port,
-		sshPrivateKey
-	} = await event.request.json();
+	const dockerDestinationProps = {
+		...((await event.request.json()) as Omit<CreateDockerDestination, 'teamId'>),
+		teamId
+	};
 
 	try {
-		let id = null;
-		if (remoteEngine) {
-			id = await db.newRemoteDestination({
-				name,
-				teamId,
-				engine,
-				network,
-				isCoolifyProxyUsed,
-				remoteEngine,
-				ipAddress,
-				user,
-				port,
-				sshPrivateKey
-			});
-		} else {
-			id = await db.newLocalDestination({ name, teamId, engine, network, isCoolifyProxyUsed });
-		}
+		const id = dockerDestinationProps.remoteEngine
+			? await db.newRemoteDestination(dockerDestinationProps)
+			: await db.newLocalDestination(dockerDestinationProps);
 		return { status: 200, body: { id } };
 	} catch (error) {
 		return ErrorHandler(error);
diff --git a/src/routes/new/destination/index.svelte b/src/routes/new/destination/index.svelte
index 5ad82cbb7..9641ed72f 100644
--- a/src/routes/new/destination/index.svelte
+++ b/src/routes/new/destination/index.svelte
@@ -2,6 +2,7 @@
 	import LocalDocker from './_LocalDocker.svelte';
 	import cuid from 'cuid';
 	import RemoteDocker from './_RemoteDocker.svelte';
+	import { t } from '$lib/translations';
 	let payload = {};
 	let selected = 'localDocker';
 
@@ -10,7 +11,7 @@
 		switch (type) {
 			case 'localDocker':
 				payload = {
-					name: 'Local Docker',
+					name: t.get('sources.local_docker'),
 					engine: '/var/run/docker.sock',
 					remoteEngine: false,
 					network: cuid(),
@@ -19,7 +20,7 @@
 				break;
 			case 'remoteDocker':
 				payload = {
-					name: 'Remote Docker',
+					name: $t('sources.remote_docker'),
 					remoteEngine: true,
 					ipAddress: null,
 					user: 'root',
@@ -36,12 +37,14 @@
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">Add New Destination</div>
+	<div class="mr-4 text-2xl tracking-tight">{$t('destination.new.add_new_destination')}</div>
 </div>
 <div class="flex-col space-y-2 pb-10 text-center">
-	<div class="text-xl font-bold text-white">Predefined destinations</div>
+	<div class="text-xl font-bold text-white">{$t('destination.new.predefined_destinations')}</div>
 	<div class="flex justify-center space-x-2">
-		<button class="w-32" on:click={() => setPredefined('localDocker')}>Local Docker</button>
+		<button class="w-32" on:click={() => setPredefined('localDocker')}
+			>{$t('sources.local_docker')}</button
+		>
 		<!-- <button class="w-32" on:click={() => setPredefined('remoteDocker')}>Remote Docker</button> -->
 		<button class="w-32" on:click={() => setPredefined('kubernetes')}>Kubernetes</button>
 	</div>
@@ -51,5 +54,5 @@
 {:else if selected === 'remoteDocker'}
 	<RemoteDocker {payload} />
 {:else}
-	<div class="text-center font-bold text-4xl py-10">Not implemented yet</div>
+	<div class="text-center font-bold text-4xl py-10">{$t('index.not_implemented_yet')}</div>
 {/if}
diff --git a/src/routes/new/team/index.svelte b/src/routes/new/team/index.svelte
index 75c75ced2..aadf35d65 100644
--- a/src/routes/new/team/index.svelte
+++ b/src/routes/new/team/index.svelte
@@ -34,7 +34,7 @@
 		if (name) {
 			try {
 				const { id } = await post('/new/team.json', { name });
-				return await goto(`/teams/${id}`);
+				return await goto(`/iam/team/${id}`);
 			} catch ({ error }) {
 				return errorNotification(error);
 			}
@@ -50,7 +50,7 @@
 	<form on:submit|preventDefault={handleSubmit}>
 		<div class="flex flex-col items-center space-y-4">
 			<input name="name" placeholder="Team name" required bind:this={autofocus} bind:value={name} />
-			<button type="submit" class="bg-green-600 hover:bg-green-500">Save</button>
+			<button type="submit" class="bg-fuchsia-600 hover:bg-fuchsia-500">Save</button>
 		</div>
 	</form>
 </div>
diff --git a/src/routes/register/index.svelte b/src/routes/register/index.svelte
index 0b2183444..52ff77180 100644
--- a/src/routes/register/index.svelte
+++ b/src/routes/register/index.svelte
@@ -6,6 +6,7 @@
 	import { session } from '$app/stores';
 	import { post } from '$lib/api';
 	import { errorNotification } from '$lib/form';
+	import { t } from '$lib/translations';
 	import { onMount } from 'svelte';
 
 	let loading = false;
@@ -23,7 +24,7 @@
 		if (loading) return;
 
 		if (password !== passwordCheck) {
-			return errorNotification('Passwords do not match.');
+			return errorNotification($t('forms.passwords_not_match'));
 		}
 		loading = true;
 		try {
@@ -60,16 +61,23 @@
 </div>
 <div class="flex h-screen flex-col items-center justify-center">
 	{#if $session.userId}
-		<div class="flex justify-center px-4 text-xl font-bold">Already logged in...</div>
+		<div class="flex justify-center px-4 text-xl font-bold">{$t('login.already_logged_in')}</div>
 	{:else}
 		<div class="flex justify-center px-4">
 			<form on:submit|preventDefault={handleSubmit} class="flex flex-col py-4 space-y-2">
-				<div class="text-6xl font-bold border-gradient w-48 mx-auto border-b-4">Coolify</div>
-				<div class="text-xs text-center font-bold pb-10">v{$session.version}</div>
+				{#if $session.whiteLabelDetails.icon}
+					<img
+						class="w-32 mx-auto pb-8"
+						src={$session.whiteLabelDetails.icon}
+						alt="Icon for white labeled version of Coolify"
+					/>
+				{:else}
+					<div class="text-6xl font-bold border-gradient w-48 mx-auto border-b-4 mb-8">Coolify</div>
+				{/if}
 				<input
 					type="email"
 					name="email"
-					placeholder="Email"
+					placeholder={$t('forms.email')}
 					autocomplete="off"
 					required
 					bind:this={emailEl}
@@ -78,14 +86,14 @@
 				<input
 					type="password"
 					name="password"
-					placeholder="Password"
+					placeholder={$t('forms.password')}
 					bind:value={password}
 					required
 				/>
 				<input
 					type="password"
 					name="passwordCheck"
-					placeholder="Password again"
+					placeholder={$t('forms.password_again')}
 					bind:value={passwordCheck}
 					required
 				/>
@@ -97,14 +105,15 @@
 						disabled={loading}
 						class:bg-transparent={loading}
 						class:text-stone-600={loading}
-						class:bg-coollabs={!loading}>{loading ? 'Registering...' : 'Register'}</button
+						class:bg-coollabs={!loading}
+						>{loading ? $t('register.registering') : $t('register.register')}</button
 					>
 				</div>
 			</form>
 		</div>
 		{#if userCount === 0}
 			<div class="pt-5">
-				You are registering the first user. It will be the administrator of your Coolify instance.
+				{$t('register.first_user')}
 			</div>
 		{/if}
 	{/if}
diff --git a/src/routes/reset/index.json.ts b/src/routes/reset/index.json.ts
deleted file mode 100644
index a75ea4766..000000000
--- a/src/routes/reset/index.json.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import type { RequestHandler } from '@sveltejs/kit';
-import * as db from '$lib/database';
-
-export const get: RequestHandler = async () => {
-	const users = await db.prisma.user.findMany({});
-	return {
-		status: 200,
-		body: {
-			users
-		}
-	};
-};
-export const post: RequestHandler = async (event) => {
-	const { secretKey } = await event.request.json();
-	if (secretKey !== process.env.COOLIFY_SECRET_KEY) {
-		return {
-			status: 500,
-			body: {
-				error: 'Invalid secret key.'
-			}
-		};
-	}
-	return {
-		status: 200
-	};
-};
diff --git a/src/routes/reset/index.svelte b/src/routes/reset/index.svelte
deleted file mode 100644
index 498c63e64..000000000
--- a/src/routes/reset/index.svelte
+++ /dev/null
@@ -1,96 +0,0 @@
-<script lang="ts">
-	import { goto } from '$app/navigation';
-	import { get, post } from '$lib/api';
-	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
-	import { errorNotification } from '$lib/form';
-	import { toast } from '@zerodevx/svelte-toast';
-
-	let secretKey;
-	let password = false;
-	let users = [];
-
-	async function handleSubmit() {
-		try {
-			await post(`/reset.json`, { secretKey });
-			password = true;
-			const data = await get('/reset.json');
-			users = data.users;
-			return;
-		} catch ({ error }) {
-			return errorNotification(error);
-		}
-	}
-	async function resetPassword(user) {
-		try {
-			await post(`/reset/password.json`, { secretKey, user });
-			toast.push('Password reset done.');
-			return;
-		} catch ({ error }) {
-			return errorNotification(error);
-		}
-	}
-</script>
-
-<div class="icons fixed top-0 left-0 m-3 cursor-pointer" on:click={() => goto('/')}>
-	<svg
-		xmlns="http://www.w3.org/2000/svg"
-		class="h-6 w-6"
-		viewBox="0 0 24 24"
-		stroke-width="1.5"
-		stroke="currentColor"
-		fill="none"
-		stroke-linecap="round"
-		stroke-linejoin="round"
-	>
-		<path stroke="none" d="M0 0h24v24H0z" fill="none" />
-		<line x1="5" y1="12" x2="19" y2="12" />
-		<line x1="5" y1="12" x2="11" y2="18" />
-		<line x1="5" y1="12" x2="11" y2="6" />
-	</svg>
-</div>
-<div class="pb-10 pt-24 text-center text-4xl font-bold">Reset Password</div>
-<div class="flex items-center justify-center">
-	{#if password}
-		<table class="mx-2 text-left">
-			<thead class="mb-2">
-				<tr>
-					<th class="px-2">Email</th>
-					<th>New password</th>
-				</tr>
-			</thead>
-			<tbody>
-				{#each users as user}
-					<tr>
-						<td class="px-2">{user.email}</td>
-						<td class="flex space-x-2">
-							<input
-								id="newPassword"
-								name="newPassword"
-								bind:value={user.newPassword}
-								placeholder="Super secure new password"
-							/>
-							<button
-								class="mx-auto my-4 w-32 bg-coollabs hover:bg-coollabs-100"
-								on:click={() => resetPassword(user)}>Reset</button
-							></td
-						>
-					</tr>
-				{/each}
-			</tbody>
-		</table>
-	{:else}
-		<form class="flex flex-col" on:submit|preventDefault={handleSubmit}>
-			<div class="text-center text-2xl py-2 font-bold">Secret Key</div>
-			<CopyPasswordField
-				isPasswordField={true}
-				id="secretKey"
-				name="secretKey"
-				bind:value={secretKey}
-				placeholder="You can find it in ~/coolify/.env (COOLIFY_SECRET_KEY)"
-			/>
-			<button type="submit" class="bg-coollabs hover:bg-coollabs-100 mx-auto w-32 my-4"
-				>Submit</button
-			>
-		</form>
-	{/if}
-</div>
diff --git a/src/routes/reset/password.json.ts b/src/routes/reset/password.json.ts
deleted file mode 100644
index 28e9d56e3..000000000
--- a/src/routes/reset/password.json.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { RequestHandler } from '@sveltejs/kit';
-import * as db from '$lib/database';
-import { ErrorHandler, hashPassword } from '$lib/database';
-
-export const post: RequestHandler = async (event) => {
-	const { secretKey, user } = await event.request.json();
-	if (secretKey !== process.env.COOLIFY_SECRET_KEY) {
-		return {
-			status: 500,
-			body: {
-				error: 'Invalid secret key.'
-			}
-		};
-	}
-	try {
-		const hashedPassword = await hashPassword(user.newPassword);
-		await db.prisma.user.update({
-			where: { email: user.email },
-			data: { password: hashedPassword }
-		});
-		return {
-			status: 200
-		};
-	} catch (error) {
-		return ErrorHandler(error);
-	}
-};
diff --git a/src/routes/services/[id]/_Services/_Ghost.svelte b/src/routes/services/[id]/_Services/_Ghost.svelte
index 8a6154ac9..48f947971 100644
--- a/src/routes/services/[id]/_Services/_Ghost.svelte
+++ b/src/routes/services/[id]/_Services/_Ghost.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
+	import { t } from '$lib/translations';
 	export let readOnly;
 	export let service;
 </script>
@@ -8,19 +9,19 @@
 	<div class="title">Ghost</div>
 </div>
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="email">Default Email Address</label>
+	<label for="email">{$t('forms.default_email_address')}</label>
 	<input
 		name="email"
 		id="email"
 		disabled
 		readonly
-		placeholder="Email address"
+		placeholder={$t('forms.email')}
 		value={service.ghost.defaultEmail}
 		required
 	/>
 </div>
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="defaultPassword">Default Password</label>
+	<label for="defaultPassword">{$t('forms.default_password')}</label>
 	<CopyPasswordField
 		id="defaultPassword"
 		isPasswordField
@@ -34,7 +35,7 @@
 	<div class="title">MariaDB</div>
 </div>
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="mariadbUser">Username</label>
+	<label for="mariadbUser">{$t('forms.username')}</label>
 	<CopyPasswordField
 		name="mariadbUser"
 		id="mariadbUser"
@@ -44,7 +45,7 @@
 	/>
 </div>
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="mariadbPassword">Password</label>
+	<label for="mariadbPassword">{$t('forms.password')}</label>
 	<CopyPasswordField
 		id="mariadbPassword"
 		isPasswordField
@@ -55,7 +56,7 @@
 	/>
 </div>
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="mariadbDatabase">Database</label>
+	<label for="mariadbDatabase">{$t('index.database')}</label>
 	<input
 		name="mariadbDatabase"
 		id="mariadbDatabase"
@@ -63,11 +64,11 @@
 		readonly={readOnly}
 		disabled={readOnly}
 		bind:value={service.ghost.mariadbDatabase}
-		placeholder="eg: ghost_db"
+		placeholder="{$t('forms.eg')}: ghost_db"
 	/>
 </div>
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="mariadbRootUser">Root DB User</label>
+	<label for="mariadbRootUser">{$t('forms.root_db_user')}</label>
 	<CopyPasswordField
 		id="mariadbRootUser"
 		isPasswordField
@@ -78,7 +79,7 @@
 	/>
 </div>
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="mariadbRootUserPassword">Root DB Password</label>
+	<label for="mariadbRootUserPassword">{$t('forms.root_db_password')}</label>
 	<CopyPasswordField
 		id="mariadbRootUserPassword"
 		isPasswordField
diff --git a/src/routes/services/[id]/_Services/_MeiliSearch.svelte b/src/routes/services/[id]/_Services/_MeiliSearch.svelte
index ba0b360dd..383889bf2 100644
--- a/src/routes/services/[id]/_Services/_MeiliSearch.svelte
+++ b/src/routes/services/[id]/_Services/_MeiliSearch.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
+	import { t } from '$lib/translations';
 	export let service;
 </script>
 
@@ -7,7 +8,7 @@
 	<div class="title">MeiliSearch</div>
 </div>
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="masterKey">Admin API key</label>
+	<label for="masterKey">{$t('forms.admin_api_key')}</label>
 	<CopyPasswordField
 		id="masterKey"
 		isPasswordField
diff --git a/src/routes/services/[id]/_Services/_MinIO.svelte b/src/routes/services/[id]/_Services/_MinIO.svelte
index ffc67346d..8610b0025 100644
--- a/src/routes/services/[id]/_Services/_MinIO.svelte
+++ b/src/routes/services/[id]/_Services/_MinIO.svelte
@@ -1,25 +1,26 @@
 <script lang="ts">
 	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
+	import { t } from '$lib/translations';
 
 	export let service;
 </script>
 
 <div class="flex space-x-1 py-5 font-bold">
-	<div class="title">MinIO Server</div>
+	<div class="title">MinIO</div>
 </div>
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="rootUser">Root User</label>
+	<label for="rootUser">{$t('forms.root_user')}</label>
 	<input
 		name="rootUser"
 		id="rootUser"
-		placeholder="User to login"
+		placeholder={$t('forms.username')}
 		value={service.minio.rootUser}
 		disabled
 		readonly
 	/>
 </div>
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="rootUserPassword">Root's Password</label>
+	<label for="rootUserPassword">{$t('forms.roots_password')}</label>
 	<CopyPasswordField
 		id="rootUserPassword"
 		isPasswordField
@@ -30,13 +31,13 @@
 	/>
 </div>
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="publicPort">API Port</label>
+	<label for="publicPort">{$t('forms.api_port')}</label>
 	<input
 		name="publicPort"
 		id="publicPort"
 		value={service.minio.publicPort}
 		disabled
 		readonly
-		placeholder="Generated automatically after start"
+		placeholder={$t('forms.generated_automatically_after_start')}
 	/>
 </div>
diff --git a/src/routes/services/[id]/_Services/_PlausibleAnalytics.svelte b/src/routes/services/[id]/_Services/_PlausibleAnalytics.svelte
index a6d739353..26b11c6f7 100644
--- a/src/routes/services/[id]/_Services/_PlausibleAnalytics.svelte
+++ b/src/routes/services/[id]/_Services/_PlausibleAnalytics.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
+	import { t } from '$lib/translations';
 	export let service;
 	export let readOnly;
 </script>
@@ -8,31 +9,31 @@
 	<div class="title">Plausible Analytics</div>
 </div>
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="email">Email Address</label>
+	<label for="email">{$t('forms.email')}</label>
 	<input
 		name="email"
 		id="email"
 		disabled={readOnly}
 		readonly={readOnly}
-		placeholder="Email address"
+		placeholder={$t('forms.email')}
 		bind:value={service.plausibleAnalytics.email}
 		required
 	/>
 </div>
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="username">Username</label>
+	<label for="username">{$t('forms.username')}</label>
 	<CopyPasswordField
 		name="username"
 		id="username"
 		disabled={readOnly}
 		readonly={readOnly}
-		placeholder="User to login"
+		placeholder={$t('forms.username')}
 		bind:value={service.plausibleAnalytics.username}
 		required
 	/>
 </div>
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="password">Password</label>
+	<label for="password">{$t('forms.password')}</label>
 	<CopyPasswordField
 		id="password"
 		isPasswordField
@@ -46,7 +47,7 @@
 	<div class="title">PostgreSQL</div>
 </div>
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="postgresqlUser">Username</label>
+	<label for="postgresqlUser">{$t('forms.username')}</label>
 	<CopyPasswordField
 		name="postgresqlUser"
 		id="postgresqlUser"
@@ -56,7 +57,7 @@
 	/>
 </div>
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="postgresqlPassword">Password</label>
+	<label for="postgresqlPassword">{$t('forms.password')}</label>
 	<CopyPasswordField
 		id="postgresqlPassword"
 		isPasswordField
@@ -67,7 +68,7 @@
 	/>
 </div>
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="postgresqlDatabase">Database</label>
+	<label for="postgresqlDatabase">{$t('index.database')}</label>
 	<CopyPasswordField
 		name="postgresqlDatabase"
 		id="postgresqlDatabase"
@@ -80,7 +81,7 @@
 	<label for="postgresqlPublicPort">Public Port</label>
 	<div class="col-span-2 ">
 		<CopyPasswordField
-			placeholder="Generated automatically after start"
+			placeholder="{ $t('forms.generated_automatically_after_start') }"
 			readonly
 			disabled
 			id="postgresqlPublicPort"
diff --git a/src/routes/services/[id]/_Services/_Services.svelte b/src/routes/services/[id]/_Services/_Services.svelte
index 41dd86ff6..85c1c5abf 100644
--- a/src/routes/services/[id]/_Services/_Services.svelte
+++ b/src/routes/services/[id]/_Services/_Services.svelte
@@ -10,11 +10,13 @@
 	import Explainer from '$lib/components/Explainer.svelte';
 	import Setting from '$lib/components/Setting.svelte';
 	import { errorNotification } from '$lib/form';
+	import { t } from '$lib/translations';
 	import { toast } from '@zerodevx/svelte-toast';
 	import Ghost from './_Ghost.svelte';
 	import MeiliSearch from './_MeiliSearch.svelte';
 	import MinIo from './_MinIO.svelte';
 	import PlausibleAnalytics from './_PlausibleAnalytics.svelte';
+	import Umami from './_Umami.svelte';
 	import VsCodeServer from './_VSCodeServer.svelte';
 	import Wordpress from './_Wordpress.svelte';
 
@@ -40,7 +42,7 @@
 		loadingVerification = true;
 		try {
 			await post(`/services/${id}/${service.type}/activate.json`, { id: service.id });
-			toast.push('All email verified. You can login now.');
+			toast.push(t.get('services.all_email_verified'));
 		} catch ({ error }) {
 			return errorNotification(error);
 		} finally {
@@ -53,7 +55,7 @@
 				dualCerts = !dualCerts;
 			}
 			await post(`/services/${id}/settings.json`, { dualCerts });
-			return toast.push('Settings saved.');
+			return toast.push(t.get('application.settings_saved'));
 		} catch ({ error }) {
 			return errorNotification(error);
 		}
@@ -63,25 +65,27 @@
 <div class="mx-auto max-w-4xl px-6 pb-12">
 	<form on:submit|preventDefault={handleSubmit} class="py-4">
 		<div class="flex space-x-1 pb-5 font-bold">
-			<div class="title">General</div>
+			<div class="title">{$t('general')}</div>
 			{#if $session.isAdmin}
 				<button
 					type="submit"
 					class:bg-pink-600={!loading}
 					class:hover:bg-pink-500={!loading}
-					disabled={loading}>{loading ? 'Saving...' : 'Save'}</button
+					disabled={loading}>{loading ? $t('forms.saving') : $t('forms.save')}</button
 				>
 			{/if}
 			{#if service.type === 'plausibleanalytics' && isRunning}
 				<button on:click|preventDefault={setEmailsToVerified} disabled={loadingVerification}
-					>{loadingVerification ? 'Verifying' : 'Verify emails without SMTP'}</button
+					>{loadingVerification
+						? $t('forms.verifying')
+						: $t('forms.verify_emails_without_smtp')}</button
 				>
 			{/if}
 		</div>
 
 		<div class="grid grid-flow-row gap-2">
 			<div class="mt-2 grid grid-cols-2 items-center px-10">
-				<label for="name" class="text-base font-bold text-stone-100">Name</label>
+				<label for="name" class="text-base font-bold text-stone-100">{$t('forms.name')}</label>
 				<div>
 					<input
 						readonly={!$session.isAdmin}
@@ -109,7 +113,9 @@
 				>
 			</div>
 			<div class="grid grid-cols-2 items-center px-10">
-				<label for="destination" class="text-base font-bold text-stone-100">Destination</label>
+				<label for="destination" class="text-base font-bold text-stone-100"
+					>{$t('application.destination')}</label
+				>
 				<div>
 					{#if service.destinationDockerId}
 						<div class="no-underline">
@@ -125,10 +131,10 @@
 			</div>
 			<div class="grid grid-cols-2 px-10">
 				<div class="flex-col ">
-					<label for="fqdn" class="pt-2 text-base font-bold text-stone-100">URL (FQDN)</label>
-					<Explainer
-						text="If you specify <span class='text-pink-600 font-bold'>https</span>, the application will be accessible only over https. SSL certificate will be generated for you.<br>If you specify <span class='text-pink-600 font-bold'>www</span>, the application will be redirected (302) from non-www and vice versa.<br><br>To modify the url, you must first stop the application."
-					/>
+					<label for="fqdn" class="pt-2 text-base font-bold text-stone-100"
+						>{$t('application.url_fqdn')}</label
+					>
+					<Explainer text={$t('application.https_explainer')} />
 				</div>
 
 				<CopyPasswordField
@@ -145,10 +151,10 @@
 			<div class="grid grid-cols-2 items-center px-10">
 				<Setting
 					disabled={isRunning}
-					dataTooltip="Must be stopped to modify."
+					dataTooltip={$t('forms.must_be_stopped_to_modify')}
 					bind:setting={dualCerts}
-					title="Generate SSL for www and non-www?"
-					description="It will generate certificates for both www and non-www. <br>You need to have <span class='font-bold text-pink-600'>both DNS entries</span> set in advance.<br><br>Service needs to be restarted."
+					title={$t('application.ssl_www_and_non_www')}
+					description={$t('services.generate_www_non_www_ssl')}
 					on:click={() => !isRunning && changeSettings('dualCerts')}
 				/>
 			</div>
@@ -164,6 +170,8 @@
 				<Ghost bind:service {readOnly} />
 			{:else if service.type === 'meilisearch'}
 				<MeiliSearch bind:service />
+			{:else if service.type === 'umami'}
+				<Umami bind:service />
 			{/if}
 		</div>
 	</form>
diff --git a/src/routes/services/[id]/_Services/_Umami.svelte b/src/routes/services/[id]/_Services/_Umami.svelte
new file mode 100644
index 000000000..17dbeb179
--- /dev/null
+++ b/src/routes/services/[id]/_Services/_Umami.svelte
@@ -0,0 +1,29 @@
+<script lang="ts">
+	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
+	import Explainer from '$lib/components/Explainer.svelte';
+
+	export let service;
+</script>
+
+<div class="flex space-x-1 py-5 font-bold">
+	<div class="title">Umami</div>
+</div>
+<div class="grid grid-cols-2 items-center px-10">
+	<label for="adminUser">Admin User</label>
+	<input name="adminUser" id="adminUser" placeholder="admin" value="admin" disabled readonly />
+</div>
+<div class="grid grid-cols-2 items-center px-10">
+	<label for="umamiAdminPassword">Initial Admin Password</label>
+	<CopyPasswordField
+		isPasswordField
+		name="umamiAdminPassword"
+		id="umamiAdminPassword"
+		placeholder="admin"
+		value={service.umami.umamiAdminPassword}
+		disabled
+		readonly
+	/>
+	<Explainer
+		text="It could be changed in Umami. <br>This is just the password set initially after the first start."
+	/>
+</div>
diff --git a/src/routes/services/[id]/_Services/_VSCodeServer.svelte b/src/routes/services/[id]/_Services/_VSCodeServer.svelte
index f8be43aa5..43873bf4d 100644
--- a/src/routes/services/[id]/_Services/_VSCodeServer.svelte
+++ b/src/routes/services/[id]/_Services/_VSCodeServer.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
+	import { t } from '$lib/translations';
 
 	export let service;
 </script>
@@ -8,7 +9,7 @@
 	<div class="title">VSCode Server</div>
 </div>
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="password">Password</label>
+	<label for="password">{$t('forms.password')}</label>
 	<CopyPasswordField
 		id="password"
 		isPasswordField
diff --git a/src/routes/services/[id]/_Services/_Wordpress.svelte b/src/routes/services/[id]/_Services/_Wordpress.svelte
index 3ea53edd3..601843534 100644
--- a/src/routes/services/[id]/_Services/_Wordpress.svelte
+++ b/src/routes/services/[id]/_Services/_Wordpress.svelte
@@ -6,6 +6,7 @@
 	import { errorNotification } from '$lib/form';
 	import { browser } from '$app/env';
 	import { getDomain } from '$lib/components/common';
+	import { t } from '$lib/translations';
 
 	export let service;
 	export let isRunning;
@@ -60,22 +61,23 @@
 </div>
 
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="extraConfig">Extra Config</label>
+	<label for="extraConfig">{$t('forms.extra_config')}</label>
 	<textarea
+		bind:value={service.wordpress.extraConfig}
 		disabled={isRunning}
 		readonly={isRunning}
 		class:resize-none={isRunning}
-		rows={isRunning ? 1 : 5}
+		rows="5"
 		name="extraConfig"
 		id="extraConfig"
 		placeholder={!isRunning
-			? `eg:
+			? `${$t('forms.eg')}:
 
 define('WP_ALLOW_MULTISITE', true);
 define('MULTISITE', true);
 define('SUBDOMAIN_INSTALL', false);`
-			: 'N/A'}>{service.wordpress.extraConfig}</textarea
-	>
+			: 'N/A'}
+	/>
 </div>
 <div class="grid grid-cols-2 items-center px-10">
 	<Setting
@@ -105,7 +107,7 @@ define('SUBDOMAIN_INSTALL', false);`
 	<div class="title">MySQL</div>
 </div>
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="mysqlDatabase">Database</label>
+	<label for="mysqlDatabase">{$t('index.database')}</label>
 	<input
 		name="mysqlDatabase"
 		id="mysqlDatabase"
@@ -113,22 +115,22 @@ define('SUBDOMAIN_INSTALL', false);`
 		readonly={readOnly}
 		disabled={readOnly}
 		bind:value={service.wordpress.mysqlDatabase}
-		placeholder="eg: wordpress_db"
+		placeholder="{$t('forms.eg')}: wordpress_db"
 	/>
 </div>
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="mysqlRootUser">Root User</label>
+	<label for="mysqlRootUser">{$t('forms.root_user')}</label>
 	<input
 		name="mysqlRootUser"
 		id="mysqlRootUser"
-		placeholder="MySQL Root User"
+		placeholder="MySQL {$t('forms.root_user')}"
 		value={service.wordpress.mysqlRootUser}
 		disabled
 		readonly
 	/>
 </div>
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="mysqlRootUserPassword">Root's Password</label>
+	<label for="mysqlRootUserPassword">{$t('forms.roots_password')}</label>
 	<CopyPasswordField
 		id="mysqlRootUserPassword"
 		isPasswordField
@@ -139,11 +141,11 @@ define('SUBDOMAIN_INSTALL', false);`
 	/>
 </div>
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="mysqlUser">User</label>
+	<label for="mysqlUser">{$t('forms.user')}</label>
 	<input name="mysqlUser" id="mysqlUser" value={service.wordpress.mysqlUser} disabled readonly />
 </div>
 <div class="grid grid-cols-2 items-center px-10">
-	<label for="mysqlPassword">Password</label>
+	<label for="mysqlPassword">{$t('forms.password')}</label>
 	<CopyPasswordField
 		id="mysqlPassword"
 		isPasswordField
diff --git a/src/routes/services/[id]/__layout.svelte b/src/routes/services/[id]/__layout.svelte
index 37158d711..82fbd19c7 100644
--- a/src/routes/services/[id]/__layout.svelte
+++ b/src/routes/services/[id]/__layout.svelte
@@ -65,6 +65,7 @@
 	import Loading from '$lib/components/Loading.svelte';
 	import { del, post } from '$lib/api';
 	import { goto } from '$app/navigation';
+	import { t } from '$lib/translations';
 	const { id } = $page.params;
 
 	export let service;
@@ -73,7 +74,7 @@
 	let loading = false;
 
 	async function deleteService() {
-		const sure = confirm(`Are you sure you would like to delete '${service.name}'?`);
+		const sure = confirm($t('application.confirm_to_delete', { name: service.name }));
 		if (sure) {
 			loading = true;
 			try {
@@ -88,7 +89,7 @@
 		}
 	}
 	async function stopService() {
-		const sure = confirm(`Are you sure you would like to stop '${service.name}'?`);
+		const sure = confirm($t('database.confirm_stop', { name: service.name }));
 		if (sure) {
 			loading = true;
 			try {
@@ -122,13 +123,13 @@
 			{#if isRunning}
 				<button
 					on:click={stopService}
-					title="Stop Service"
+					title={$t('service.stop_service')}
 					type="submit"
 					disabled={!$session.isAdmin}
 					class="icons bg-transparent tooltip-bottom text-sm flex items-center space-x-2 text-red-500"
 					data-tooltip={$session.isAdmin
-						? 'Stop Service'
-						: 'You do not have permission to stop the service.'}
+						? $t('service.stop_service')
+						: $t('service.permission_denied_stop_service')}
 				>
 					<svg
 						xmlns="http://www.w3.org/2000/svg"
@@ -148,13 +149,13 @@
 			{:else}
 				<button
 					on:click={startService}
-					title="Start Service"
+					title={$t('service.start_service')}
 					type="submit"
 					disabled={!$session.isAdmin}
 					class="icons bg-transparent tooltip-bottom text-sm flex items-center space-x-2 text-green-500"
 					data-tooltip={$session.isAdmin
-						? 'Start Service'
-						: 'You do not have permission to start the service.'}
+						? $t('service.start_service')
+						: $t('service.permission_denied_start_service')}
 					><svg
 						xmlns="http://www.w3.org/2000/svg"
 						class="w-6 h-6"
@@ -181,9 +182,9 @@
 				class:bg-coolgray-500={$page.url.pathname === `/services/${id}`}
 			>
 				<button
-					title="Configurations"
+					title={$t('application.configurations')}
 					class="icons bg-transparent tooltip-bottom text-sm disabled:text-red-500"
-					data-tooltip="Configurations"
+					data-tooltip={$t('application.configurations')}
 				>
 					<svg
 						xmlns="http://www.w3.org/2000/svg"
@@ -216,9 +217,9 @@
 				class:bg-coolgray-500={$page.url.pathname === `/services/${id}/secrets`}
 			>
 				<button
-					title="Secrets"
+					title={$t('application.secret')}
 					class="icons bg-transparent tooltip-bottom text-sm disabled:text-red-500"
-					data-tooltip="Secrets"
+					data-tooltip={$t('application.secret')}
 				>
 					<svg
 						xmlns="http://www.w3.org/2000/svg"
@@ -239,18 +240,47 @@
 					</svg></button
 				></a
 			>
+			<a
+				href="/services/{id}/storage"
+				sveltekit:prefetch
+				class="hover:text-pink-500 rounded"
+				class:text-pink-500={$page.url.pathname === `/services/${id}/storage`}
+				class:bg-coolgray-500={$page.url.pathname === `/services/${id}/storage`}
+			>
+				<button
+					title="Persistent Storage"
+					class="icons bg-transparent tooltip-bottom text-sm disabled:text-red-500"
+					data-tooltip="Persistent Storage"
+				>
+					<svg
+						xmlns="http://www.w3.org/2000/svg"
+						class="w-6 h-6"
+						viewBox="0 0 24 24"
+						stroke-width="1.5"
+						stroke="currentColor"
+						fill="none"
+						stroke-linecap="round"
+						stroke-linejoin="round"
+					>
+						<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+						<ellipse cx="12" cy="6" rx="8" ry="3" />
+						<path d="M4 6v6a8 3 0 0 0 16 0v-6" />
+						<path d="M4 12v6a8 3 0 0 0 16 0v-6" />
+					</svg>
+				</button></a
+			>
 			<div class="border border-stone-700 h-8" />
 		{/if}
 		<button
 			on:click={deleteService}
-			title="Delete Service"
+			title={$t('service.delete_service')}
 			type="submit"
 			disabled={!$session.isAdmin}
 			class:hover:text-red-500={$session.isAdmin}
 			class="icons bg-transparent tooltip-bottom text-sm"
 			data-tooltip={$session.isAdmin
-				? 'Delete Service'
-				: 'You do not have permission to delete a service.'}><DeleteIcon /></button
+				? $t('service.delete_service')
+				: $t('service.permission_denied_delete_service')}><DeleteIcon /></button
 		>
 	{/if}
 </nav>
diff --git a/src/routes/services/[id]/configuration/destination.svelte b/src/routes/services/[id]/configuration/destination.svelte
index d7220df87..6dee1df95 100644
--- a/src/routes/services/[id]/configuration/destination.svelte
+++ b/src/routes/services/[id]/configuration/destination.svelte
@@ -34,6 +34,7 @@
 	import { enhance, errorNotification } from '$lib/form';
 	import { goto } from '$app/navigation';
 	import { post } from '$lib/api';
+	import { t } from '$lib/translations';
 
 	const { id } = $page.params;
 	const from = $page.url.searchParams.get('from');
@@ -50,12 +51,14 @@
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">Configure Destination</div>
+	<div class="mr-4 text-2xl tracking-tight">
+		{$t('application.configuration.configure_destination')}
+	</div>
 </div>
 <div class="flex justify-center">
 	{#if !destinations || destinations.length === 0}
 		<div class="flex-col">
-			<div class="pb-2">No configurable Destination found</div>
+			<div class="pb-2">{$t('application.configuration.no_configurable_destination')}</div>
 			<div class="flex justify-center">
 				<a href="/new/destination" sveltekit:prefetch class="add-icon bg-sky-600 hover:bg-sky-500">
 					<svg
diff --git a/src/routes/services/[id]/configuration/type.svelte b/src/routes/services/[id]/configuration/type.svelte
index 4ff9189b5..6e4b3628f 100644
--- a/src/routes/services/[id]/configuration/type.svelte
+++ b/src/routes/services/[id]/configuration/type.svelte
@@ -41,7 +41,9 @@
 	import N8n from '$lib/components/svg/services/N8n.svelte';
 	import UptimeKuma from '$lib/components/svg/services/UptimeKuma.svelte';
 	import Ghost from '$lib/components/svg/services/Ghost.svelte';
+	import { t } from '$lib/translations';
 	import MeiliSearch from '$lib/components/svg/services/MeiliSearch.svelte';
+	import Umami from '$lib/components/svg/services/Umami.svelte';
 
 	const { id } = $page.params;
 	const from = $page.url.searchParams.get('from');
@@ -59,7 +61,7 @@
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">Select a Service</div>
+	<div class="mr-4 text-2xl tracking-tight">{$t('forms.select_a_service')}</div>
 </div>
 
 <div class="flex flex-wrap justify-center">
@@ -89,6 +91,8 @@
 						<Ghost isAbsolute />
 					{:else if type.name === 'meilisearch'}
 						<MeiliSearch isAbsolute />
+					{:else if type.name === 'umami'}
+						<Umami isAbsolute />
 					{/if}{type.fancyName}
 				</button>
 			</form>
diff --git a/src/routes/services/[id]/configuration/version.svelte b/src/routes/services/[id]/configuration/version.svelte
index bda5bb46c..fd5ddbc0b 100644
--- a/src/routes/services/[id]/configuration/version.svelte
+++ b/src/routes/services/[id]/configuration/version.svelte
@@ -32,6 +32,7 @@
 	import { goto } from '$app/navigation';
 	import { post } from '$lib/api';
 	import { supportedServiceTypesAndVersions } from '$lib/components/common';
+	import { t } from '$lib/translations';
 
 	const { id } = $page.params;
 	const from = $page.url.searchParams.get('from');
@@ -52,7 +53,7 @@
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">Select a Service version</div>
+	<div class="mr-4 text-2xl tracking-tight">{$t('forms.select_a_service_version')}</div>
 </div>
 {#if from}
 	<div class="pb-10 text-center">
diff --git a/src/routes/services/[id]/ghost/start.json.ts b/src/routes/services/[id]/ghost/start.json.ts
index 41c5e95d4..45c6936fe 100644
--- a/src/routes/services/[id]/ghost/start.json.ts
+++ b/src/routes/services/[id]/ghost/start.json.ts
@@ -90,7 +90,15 @@ export const post: RequestHandler = async (event) => {
 					environment: config.ghost.environmentVariables,
 					restart: 'always',
 					labels: makeLabelForServices('ghost'),
-					depends_on: [`${id}-mariadb`]
+					depends_on: [`${id}-mariadb`],
+					deploy: {
+						restart_policy: {
+							condition: 'on-failure',
+							delay: '5s',
+							max_attempts: 3,
+							window: '120s'
+						}
+					}
 				},
 				[`${id}-mariadb`]: {
 					container_name: `${id}-mariadb`,
@@ -98,7 +106,15 @@ export const post: RequestHandler = async (event) => {
 					networks: [network],
 					volumes: [config.mariadb.volume],
 					environment: config.mariadb.environmentVariables,
-					restart: 'always'
+					restart: 'always',
+					deploy: {
+						restart_policy: {
+							condition: 'on-failure',
+							delay: '5s',
+							max_attempts: 3,
+							window: '120s'
+						}
+					}
 				}
 			},
 			networks: {
@@ -119,11 +135,7 @@ export const post: RequestHandler = async (event) => {
 		await fs.writeFile(composeFileDestination, yaml.dump(composeFile));
 
 		try {
-			if (version === 'latest') {
-				await asyncExecShell(
-					`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} pull`
-				);
-			}
+			await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} pull`);
 			await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} up -d`);
 			return {
 				status: 200
diff --git a/src/routes/services/[id]/languagetool/start.json.ts b/src/routes/services/[id]/languagetool/start.json.ts
index ac0f6a5bb..e11263161 100644
--- a/src/routes/services/[id]/languagetool/start.json.ts
+++ b/src/routes/services/[id]/languagetool/start.json.ts
@@ -43,7 +43,15 @@ export const post: RequestHandler = async (event) => {
 					environment: config.environmentVariables,
 					restart: 'always',
 					volumes: [config.volume],
-					labels: makeLabelForServices('languagetool')
+					labels: makeLabelForServices('languagetool'),
+					deploy: {
+						restart_policy: {
+							condition: 'on-failure',
+							delay: '5s',
+							max_attempts: 3,
+							window: '120s'
+						}
+					}
 				}
 			},
 			networks: {
@@ -61,11 +69,7 @@ export const post: RequestHandler = async (event) => {
 		await fs.writeFile(composeFileDestination, yaml.dump(composeFile));
 
 		try {
-			if (version === 'latest') {
-				await asyncExecShell(
-					`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} pull`
-				);
-			}
+			await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} pull`);
 			await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} up -d`);
 			return {
 				status: 200
diff --git a/src/routes/services/[id]/meilisearch/start.json.ts b/src/routes/services/[id]/meilisearch/start.json.ts
index 5a5a9d5c0..1f11054a8 100644
--- a/src/routes/services/[id]/meilisearch/start.json.ts
+++ b/src/routes/services/[id]/meilisearch/start.json.ts
@@ -48,7 +48,15 @@ export const post: RequestHandler = async (event) => {
 					environment: config.environmentVariables,
 					restart: 'always',
 					volumes: [config.volume],
-					labels: makeLabelForServices('meilisearch')
+					labels: makeLabelForServices('meilisearch'),
+					deploy: {
+						restart_policy: {
+							condition: 'on-failure',
+							delay: '5s',
+							max_attempts: 3,
+							window: '120s'
+						}
+					}
 				}
 			},
 			networks: {
@@ -66,11 +74,7 @@ export const post: RequestHandler = async (event) => {
 		await fs.writeFile(composeFileDestination, yaml.dump(composeFile));
 
 		try {
-			if (version === 'latest') {
-				await asyncExecShell(
-					`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} pull`
-				);
-			}
+			await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} pull`);
 			await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} up -d`);
 			return {
 				status: 200
diff --git a/src/routes/services/[id]/minio/start.json.ts b/src/routes/services/[id]/minio/start.json.ts
index 6e14a42ca..c744eae80 100644
--- a/src/routes/services/[id]/minio/start.json.ts
+++ b/src/routes/services/[id]/minio/start.json.ts
@@ -4,9 +4,7 @@ import { promises as fs } from 'fs';
 import yaml from 'js-yaml';
 import type { RequestHandler } from '@sveltejs/kit';
 import { startHttpProxy } from '$lib/haproxy';
-import getPort, { portNumbers } from 'get-port';
-import { getDomain } from '$lib/components/common';
-import { ErrorHandler, getServiceImage } from '$lib/database';
+import { ErrorHandler, getFreePort, getServiceImage } from '$lib/database';
 import { makeLabelForServices } from '$lib/buildPacks/common';
 import type { ComposeFile } from '$lib/types/composeFile';
 
@@ -28,13 +26,10 @@ export const post: RequestHandler = async (event) => {
 			serviceSecret
 		} = service;
 
-		const data = await db.prisma.setting.findFirst();
-		const { minPort, maxPort } = data;
-
 		const network = destinationDockerId && destinationDocker.network;
 		const host = getEngine(destinationDocker.engine);
 
-		const publicPort = await getPort({ port: portNumbers(minPort, maxPort) });
+		const publicPort = await getFreePort();
 
 		const consolePort = 9001;
 		const apiPort = 9000;
@@ -67,7 +62,15 @@ export const post: RequestHandler = async (event) => {
 					networks: [network],
 					volumes: [config.volume],
 					restart: 'always',
-					labels: makeLabelForServices('minio')
+					labels: makeLabelForServices('minio'),
+					deploy: {
+						restart_policy: {
+							condition: 'on-failure',
+							delay: '5s',
+							max_attempts: 3,
+							window: '120s'
+						}
+					}
 				}
 			},
 			networks: {
@@ -85,6 +88,7 @@ export const post: RequestHandler = async (event) => {
 		await fs.writeFile(composeFileDestination, yaml.dump(composeFile));
 
 		try {
+			await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} pull`);
 			await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} up -d`);
 			await db.updateMinioService({ id, publicPort });
 			await startHttpProxy(destinationDocker, id, publicPort, apiPort);
diff --git a/src/routes/services/[id]/n8n/start.json.ts b/src/routes/services/[id]/n8n/start.json.ts
index 3df1855d0..7386a4fd9 100644
--- a/src/routes/services/[id]/n8n/start.json.ts
+++ b/src/routes/services/[id]/n8n/start.json.ts
@@ -44,7 +44,15 @@ export const post: RequestHandler = async (event) => {
 					volumes: [config.volume],
 					environment: config.environmentVariables,
 					restart: 'always',
-					labels: makeLabelForServices('n8n')
+					labels: makeLabelForServices('n8n'),
+					deploy: {
+						restart_policy: {
+							condition: 'on-failure',
+							delay: '5s',
+							max_attempts: 3,
+							window: '120s'
+						}
+					}
 				}
 			},
 			networks: {
@@ -62,11 +70,7 @@ export const post: RequestHandler = async (event) => {
 		await fs.writeFile(composeFileDestination, yaml.dump(composeFile));
 
 		try {
-			if (version === 'latest') {
-				await asyncExecShell(
-					`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} pull`
-				);
-			}
+			await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} pull`);
 			await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} up -d`);
 			return {
 				status: 200
diff --git a/src/routes/services/[id]/nocodb/start.json.ts b/src/routes/services/[id]/nocodb/start.json.ts
index 1642038b3..4933a5347 100644
--- a/src/routes/services/[id]/nocodb/start.json.ts
+++ b/src/routes/services/[id]/nocodb/start.json.ts
@@ -40,7 +40,15 @@ export const post: RequestHandler = async (event) => {
 					networks: [network],
 					environment: config.environmentVariables,
 					restart: 'always',
-					labels: makeLabelForServices('nocodb')
+					labels: makeLabelForServices('nocodb'),
+					deploy: {
+						restart_policy: {
+							condition: 'on-failure',
+							delay: '5s',
+							max_attempts: 3,
+							window: '120s'
+						}
+					}
 				}
 			},
 			networks: {
@@ -53,11 +61,7 @@ export const post: RequestHandler = async (event) => {
 		await fs.writeFile(composeFileDestination, yaml.dump(composeFile));
 
 		try {
-			if (version === 'latest') {
-				await asyncExecShell(
-					`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} pull`
-				);
-			}
+			await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} pull`);
 			await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} up -d`);
 			return {
 				status: 200
diff --git a/src/routes/services/[id]/plausibleanalytics/start.json.ts b/src/routes/services/[id]/plausibleanalytics/start.json.ts
index 6ca37c5e8..8b61e1ff8 100644
--- a/src/routes/services/[id]/plausibleanalytics/start.json.ts
+++ b/src/routes/services/[id]/plausibleanalytics/start.json.ts
@@ -133,7 +133,15 @@ COPY ./init-db.sh /docker-entrypoint-initdb.d/init-db.sh`;
 					environment: config.plausibleAnalytics.environmentVariables,
 					restart: 'always',
 					depends_on: [`${id}-postgresql`, `${id}-clickhouse`],
-					labels: makeLabelForServices('plausibleAnalytics')
+					labels: makeLabelForServices('plausibleAnalytics'),
+					deploy: {
+						restart_policy: {
+							condition: 'on-failure',
+							delay: '10s',
+							max_attempts: 5,
+							window: '120s'
+						}
+					}
 				},
 				[`${id}-postgresql`]: {
 					container_name: `${id}-postgresql`,
@@ -141,7 +149,15 @@ COPY ./init-db.sh /docker-entrypoint-initdb.d/init-db.sh`;
 					networks: [network],
 					environment: config.postgresql.environmentVariables,
 					volumes: [config.postgresql.volume],
-					restart: 'always'
+					restart: 'always',
+					deploy: {
+						restart_policy: {
+							condition: 'on-failure',
+							delay: '10s',
+							max_attempts: 5,
+							window: '120s'
+						}
+					}
 				},
 				[`${id}-clickhouse`]: {
 					build: workdir,
@@ -149,7 +165,15 @@ COPY ./init-db.sh /docker-entrypoint-initdb.d/init-db.sh`;
 					networks: [network],
 					environment: config.clickhouse.environmentVariables,
 					volumes: [config.clickhouse.volume],
-					restart: 'always'
+					restart: 'always',
+					deploy: {
+						restart_policy: {
+							condition: 'on-failure',
+							delay: '10s',
+							max_attempts: 5,
+							window: '120s'
+						}
+					}
 				}
 			},
 			networks: {
@@ -168,9 +192,7 @@ COPY ./init-db.sh /docker-entrypoint-initdb.d/init-db.sh`;
 		};
 		const composeFileDestination = `${workdir}/docker-compose.yaml`;
 		await fs.writeFile(composeFileDestination, yaml.dump(composeFile));
-		if (version === 'latest') {
-			await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} pull`);
-		}
+		await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} pull`);
 		await asyncExecShell(
 			`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} up --build -d`
 		);
diff --git a/src/routes/services/[id]/secrets/index.svelte b/src/routes/services/[id]/secrets/index.svelte
index c71e6d720..8bad53bbb 100644
--- a/src/routes/services/[id]/secrets/index.svelte
+++ b/src/routes/services/[id]/secrets/index.svelte
@@ -26,6 +26,7 @@
 	import { getDomain } from '$lib/components/common';
 	import { page } from '$app/stores';
 	import { get } from '$lib/api';
+	import { t } from '$lib/translations';
 	import ServiceLinks from '$lib/components/ServiceLinks.svelte';
 
 	const { id } = $page.params;
@@ -42,7 +43,9 @@
 	class:p-6={!service.fqdn}
 >
 	<div class="-mb-5 flex-col">
-		<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">Secrets</div>
+		<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">
+			{$t('application.secret')}
+		</div>
 		<span class="text-xs">{service.name}</span>
 	</div>
 	{#if service.fqdn}
@@ -74,9 +77,9 @@
 	<table class="mx-auto border-separate text-left">
 		<thead>
 			<tr class="h-12">
-				<th scope="col">Name</th>
-				<th scope="col">Value</th>
-				<th scope="col" class="w-96 text-center">Action</th>
+				<th scope="col">{$t('forms.name')}</th>
+				<th scope="col">{$t('forms.value')}</th>
+				<th scope="col" class="w-96 text-center">{$t('forms.action')}</th>
 			</tr>
 		</thead>
 		<tbody>
diff --git a/src/routes/services/[id]/storage/_Storage.svelte b/src/routes/services/[id]/storage/_Storage.svelte
new file mode 100644
index 000000000..5fb3eb01e
--- /dev/null
+++ b/src/routes/services/[id]/storage/_Storage.svelte
@@ -0,0 +1,73 @@
+<script lang="ts">
+	export let isNew = false;
+	export let storage = {
+		id: null,
+		path: null
+	};
+	import { del, post } from '$lib/api';
+	import { page } from '$app/stores';
+	import { createEventDispatcher } from 'svelte';
+
+	import { errorNotification } from '$lib/form';
+	import { toast } from '@zerodevx/svelte-toast';
+	const { id } = $page.params;
+
+	const dispatch = createEventDispatcher();
+	async function saveStorage(newStorage = false) {
+		try {
+			if (!storage.path) return errorNotification('Path is required.');
+			storage.path = storage.path.startsWith('/') ? storage.path : `/${storage.path}`;
+			storage.path = storage.path.endsWith('/') ? storage.path.slice(0, -1) : storage.path;
+			storage.path.replace(/\/\//g, '/');
+			await post(`/services/${id}/storage.json`, {
+				path: storage.path,
+				storageId: storage.id,
+				newStorage
+			});
+			dispatch('refresh');
+			if (isNew) {
+				storage.path = null;
+				storage.id = null;
+			}
+			if (newStorage) toast.push('Storage saved.');
+			else toast.push('Storage updated.');
+		} catch ({ error }) {
+			return errorNotification(error);
+		}
+	}
+	async function removeStorage() {
+		try {
+			await del(`/services/${id}/storage.json`, { path: storage.path });
+			dispatch('refresh');
+			toast.push('Storage deleted.');
+		} catch ({ error }) {
+			return errorNotification(error);
+		}
+	}
+</script>
+
+<td>
+	<input
+		bind:value={storage.path}
+		required
+		placeholder="eg: /data"
+		class=" border border-dashed border-coolgray-300"
+	/>
+</td>
+<td>
+	{#if isNew}
+		<div class="flex items-center justify-center">
+			<button class="bg-green-600 hover:bg-green-500" on:click={() => saveStorage(true)}>Add</button
+			>
+		</div>
+	{:else}
+		<div class="flex flex-row justify-center space-x-2">
+			<div class="flex items-center justify-center">
+				<button class="" on:click={() => saveStorage(false)}>Set</button>
+			</div>
+			<div class="flex justify-center items-end">
+				<button class="bg-red-600 hover:bg-red-500" on:click={removeStorage}>Remove</button>
+			</div>
+		</div>
+	{/if}
+</td>
diff --git a/src/routes/services/[id]/storage/index.json.ts b/src/routes/services/[id]/storage/index.json.ts
new file mode 100644
index 000000000..a2a240fe4
--- /dev/null
+++ b/src/routes/services/[id]/storage/index.json.ts
@@ -0,0 +1,65 @@
+import { getUserDetails } from '$lib/common';
+import * as db from '$lib/database';
+import { ErrorHandler } from '$lib/database';
+import type { RequestHandler } from '@sveltejs/kit';
+
+export const get: RequestHandler = async (event) => {
+	const { status, body, teamId } = await getUserDetails(event, false);
+	if (status === 401) return { status, body };
+
+	const { id } = event.params;
+	try {
+		const persistentStorages = await db.prisma.servicePersistentStorage.findMany({
+			where: { serviceId: id }
+		});
+		return {
+			body: {
+				persistentStorages
+			}
+		};
+	} catch (error) {
+		return ErrorHandler(error);
+	}
+};
+
+export const post: RequestHandler = async (event) => {
+	const { teamId, status, body } = await getUserDetails(event);
+	if (status === 401) return { status, body };
+
+	const { id } = event.params;
+	const { path, newStorage, storageId } = await event.request.json();
+	try {
+		if (newStorage) {
+			await db.prisma.servicePersistentStorage.create({
+				data: { path, service: { connect: { id } } }
+			});
+		} else {
+			await db.prisma.servicePersistentStorage.update({
+				where: { id: storageId },
+				data: { path }
+			});
+		}
+		return {
+			status: 201
+		};
+	} catch (error) {
+		return ErrorHandler(error);
+	}
+};
+
+export const del: RequestHandler = async (event) => {
+	const { teamId, status, body } = await getUserDetails(event);
+	if (status === 401) return { status, body };
+
+	const { id } = event.params;
+	const { path } = await event.request.json();
+
+	try {
+		await db.prisma.servicePersistentStorage.deleteMany({ where: { serviceId: id, path } });
+		return {
+			status: 200
+		};
+	} catch (error) {
+		return ErrorHandler(error);
+	}
+};
diff --git a/src/routes/services/[id]/storage/index.svelte b/src/routes/services/[id]/storage/index.svelte
new file mode 100644
index 000000000..3d5c43c1b
--- /dev/null
+++ b/src/routes/services/[id]/storage/index.svelte
@@ -0,0 +1,102 @@
+<script context="module" lang="ts">
+	import type { Load } from '@sveltejs/kit';
+	export const load: Load = async ({ fetch, params, stuff }) => {
+		let endpoint = `/services/${params.id}/storage.json`;
+		const res = await fetch(endpoint);
+		if (res.ok) {
+			return {
+				props: {
+					service: stuff.service,
+					...(await res.json())
+				}
+			};
+		}
+
+		return {
+			status: res.status,
+			error: new Error(`Could not load ${endpoint}`)
+		};
+	};
+</script>
+
+<script lang="ts">
+	export let service;
+
+	export let persistentStorages;
+	import { page } from '$app/stores';
+	import Storage from './_Storage.svelte';
+	import { get } from '$lib/api';
+	import Explainer from '$lib/components/Explainer.svelte';
+	import ServiceLinks from '$lib/components/ServiceLinks.svelte';
+
+	const { id } = $page.params;
+	async function refreshStorage() {
+		const data = await get(`/services/${id}/storage.json`);
+		persistentStorages = [...data.persistentStorages];
+	}
+</script>
+
+<div
+	class="flex items-center space-x-2 p-5 px-6 font-bold"
+	class:p-5={service.fqdn}
+	class:p-6={!service.fqdn}
+>
+	<div class="-mb-5 flex-col">
+		<div class="md:max-w-64 truncate text-base tracking-tight md:text-2xl lg:block">
+			Persistent Storage
+		</div>
+		<span class="text-xs">{service.name}</span>
+	</div>
+	{#if service.fqdn}
+		<a
+			href={service.fqdn}
+			target="_blank"
+			class="icons tooltip-bottom flex items-center bg-transparent text-sm"
+			><svg
+				xmlns="http://www.w3.org/2000/svg"
+				class="h-6 w-6"
+				viewBox="0 0 24 24"
+				stroke-width="1.5"
+				stroke="currentColor"
+				fill="none"
+				stroke-linecap="round"
+				stroke-linejoin="round"
+			>
+				<path stroke="none" d="M0 0h24v24H0z" fill="none" />
+				<path d="M11 7h-5a2 2 0 0 0 -2 2v9a2 2 0 0 0 2 2h9a2 2 0 0 0 2 -2v-5" />
+				<line x1="10" y1="14" x2="20" y2="4" />
+				<polyline points="15 4 20 4 20 9" />
+			</svg></a
+		>
+	{/if}
+
+	<ServiceLinks {service} />
+</div>
+
+<div class="mx-auto max-w-6xl rounded-xl px-6 pt-4">
+	<div class="flex justify-center py-4 text-center">
+		<Explainer
+			customClass="w-full"
+			text={'You can specify any folder that you want to be persistent across restarts. <br>This is useful for storing data for VSCode server or WordPress.'}
+		/>
+	</div>
+	<table class="mx-auto border-separate text-left">
+		<thead>
+			<tr class="h-12">
+				<th scope="col">Path</th>
+			</tr>
+		</thead>
+		<tbody>
+			{#each persistentStorages as storage}
+				{#key storage.id}
+					<tr>
+						<Storage on:refresh={refreshStorage} {storage} />
+					</tr>
+				{/key}
+			{/each}
+			<tr>
+				<Storage on:refresh={refreshStorage} isNew />
+			</tr>
+		</tbody>
+	</table>
+</div>
diff --git a/src/routes/services/[id]/umami/index.json.ts b/src/routes/services/[id]/umami/index.json.ts
new file mode 100644
index 000000000..d717502c5
--- /dev/null
+++ b/src/routes/services/[id]/umami/index.json.ts
@@ -0,0 +1,21 @@
+import { getUserDetails } from '$lib/common';
+import * as db from '$lib/database';
+import { ErrorHandler } from '$lib/database';
+import type { RequestHandler } from '@sveltejs/kit';
+
+export const post: RequestHandler = async (event) => {
+	const { status, body } = await getUserDetails(event);
+	if (status === 401) return { status, body };
+
+	const { id } = event.params;
+
+	let { name, fqdn } = await event.request.json();
+	if (fqdn) fqdn = fqdn.toLowerCase();
+
+	try {
+		await db.updateService({ id, fqdn, name });
+		return { status: 201 };
+	} catch (error) {
+		return ErrorHandler(error);
+	}
+};
diff --git a/src/routes/services/[id]/umami/start.json.ts b/src/routes/services/[id]/umami/start.json.ts
new file mode 100644
index 000000000..6a51e5cde
--- /dev/null
+++ b/src/routes/services/[id]/umami/start.json.ts
@@ -0,0 +1,214 @@
+import { asyncExecShell, createDirectories, getEngine, getUserDetails } from '$lib/common';
+import * as db from '$lib/database';
+import { promises as fs } from 'fs';
+import yaml from 'js-yaml';
+import type { RequestHandler } from '@sveltejs/kit';
+import { ErrorHandler, getServiceImage } from '$lib/database';
+import { makeLabelForServices } from '$lib/buildPacks/common';
+import type { ComposeFile } from '$lib/types/composeFile';
+import type { Service, DestinationDocker, Prisma } from '@prisma/client';
+import bcrypt from 'bcryptjs';
+
+export const post: RequestHandler = async (event) => {
+	const { teamId, status, body } = await getUserDetails(event);
+	if (status === 401) return { status, body };
+
+	const { id } = event.params;
+
+	try {
+		const service: Service & Prisma.ServiceInclude & { destinationDocker: DestinationDocker } =
+			await db.getService({ id, teamId });
+		const {
+			type,
+			version,
+			destinationDockerId,
+			destinationDocker,
+			serviceSecret,
+			umami: {
+				umamiAdminPassword,
+				postgresqlUser,
+				postgresqlPassword,
+				postgresqlDatabase,
+				hashSalt
+			}
+		} = service;
+		const network = destinationDockerId && destinationDocker.network;
+		const host = getEngine(destinationDocker.engine);
+
+		const { workdir } = await createDirectories({ repository: type, buildId: id });
+		const image = getServiceImage(type);
+
+		const config = {
+			umami: {
+				image: `${image}:${version}`,
+				environmentVariables: {
+					DATABASE_URL: `postgresql://${postgresqlUser}:${postgresqlPassword}@${id}-postgresql:5432/${postgresqlDatabase}`,
+					DATABASE_TYPE: 'postgresql',
+					HASH_SALT: hashSalt
+				}
+			},
+			postgresql: {
+				image: 'postgres:12-alpine',
+				volume: `${id}-postgresql-data:/var/lib/postgresql/data`,
+				environmentVariables: {
+					POSTGRES_USER: postgresqlUser,
+					POSTGRES_PASSWORD: postgresqlPassword,
+					POSTGRES_DB: postgresqlDatabase
+				}
+			}
+		};
+		if (serviceSecret.length > 0) {
+			serviceSecret.forEach((secret) => {
+				config.umami.environmentVariables[secret.name] = secret.value;
+			});
+		}
+
+		const initDbSQL = `
+		drop table if exists event;
+		drop table if exists pageview;
+		drop table if exists session;
+		drop table if exists website;
+		drop table if exists account;
+		
+		create table account (
+			user_id serial primary key,
+			username varchar(255) unique not null,
+			password varchar(60) not null,
+			is_admin bool not null default false,
+			created_at timestamp with time zone default current_timestamp,
+			updated_at timestamp with time zone default current_timestamp
+		);
+		
+		create table website (
+			website_id serial primary key,
+			website_uuid uuid unique not null,
+			user_id int not null references account(user_id) on delete cascade,
+			name varchar(100) not null,
+			domain varchar(500),
+			share_id varchar(64) unique,
+			created_at timestamp with time zone default current_timestamp
+		);
+		
+		create table session (
+			session_id serial primary key,
+			session_uuid uuid unique not null,
+			website_id int not null references website(website_id) on delete cascade,
+			created_at timestamp with time zone default current_timestamp,
+			hostname varchar(100),
+			browser varchar(20),
+			os varchar(20),
+			device varchar(20),
+			screen varchar(11),
+			language varchar(35),
+			country char(2)
+		);
+		
+		create table pageview (
+			view_id serial primary key,
+			website_id int not null references website(website_id) on delete cascade,
+			session_id int not null references session(session_id) on delete cascade,
+			created_at timestamp with time zone default current_timestamp,
+			url varchar(500) not null,
+			referrer varchar(500)
+		);
+		
+		create table event (
+			event_id serial primary key,
+			website_id int not null references website(website_id) on delete cascade,
+			session_id int not null references session(session_id) on delete cascade,
+			created_at timestamp with time zone default current_timestamp,
+			url varchar(500) not null,
+			event_type varchar(50) not null,
+			event_value varchar(50) not null
+		);
+		
+		create index website_user_id_idx on website(user_id);
+		
+		create index session_created_at_idx on session(created_at);
+		create index session_website_id_idx on session(website_id);
+		
+		create index pageview_created_at_idx on pageview(created_at);
+		create index pageview_website_id_idx on pageview(website_id);
+		create index pageview_session_id_idx on pageview(session_id);
+		create index pageview_website_id_created_at_idx on pageview(website_id, created_at);
+		create index pageview_website_id_session_id_created_at_idx on pageview(website_id, session_id, created_at);
+		
+		create index event_created_at_idx on event(created_at);
+		create index event_website_id_idx on event(website_id);
+		create index event_session_id_idx on event(session_id);
+		
+		insert into account (username, password, is_admin) values ('admin', '${bcrypt.hashSync(
+			umamiAdminPassword,
+			10
+		)}', true);`;
+		await fs.writeFile(`${workdir}/schema.postgresql.sql`, initDbSQL);
+		const Dockerfile = `
+	  FROM ${config.postgresql.image}
+	  COPY ./schema.postgresql.sql /docker-entrypoint-initdb.d/schema.postgresql.sql`;
+		await fs.writeFile(`${workdir}/Dockerfile`, Dockerfile);
+		const composeFile: ComposeFile = {
+			version: '3.8',
+			services: {
+				[id]: {
+					container_name: id,
+					image: config.umami.image,
+					environment: config.umami.environmentVariables,
+					networks: [network],
+					volumes: [],
+					restart: 'always',
+					labels: makeLabelForServices('umami'),
+					deploy: {
+						restart_policy: {
+							condition: 'on-failure',
+							delay: '5s',
+							max_attempts: 3,
+							window: '120s'
+						}
+					},
+					depends_on: [`${id}-postgresql`]
+				},
+				[`${id}-postgresql`]: {
+					build: workdir,
+					container_name: `${id}-postgresql`,
+					environment: config.postgresql.environmentVariables,
+					networks: [network],
+					volumes: [config.postgresql.volume],
+					restart: 'always',
+					deploy: {
+						restart_policy: {
+							condition: 'on-failure',
+							delay: '5s',
+							max_attempts: 3,
+							window: '120s'
+						}
+					}
+				}
+			},
+			networks: {
+				[network]: {
+					external: true
+				}
+			},
+			volumes: {
+				[config.postgresql.volume.split(':')[0]]: {
+					name: config.postgresql.volume.split(':')[0]
+				}
+			}
+		};
+		const composeFileDestination = `${workdir}/docker-compose.yaml`;
+		await fs.writeFile(composeFileDestination, yaml.dump(composeFile));
+
+		try {
+			await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} pull`);
+			await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} up -d`);
+			return {
+				status: 200
+			};
+		} catch (error) {
+			console.log(error);
+			return ErrorHandler(error);
+		}
+	} catch (error) {
+		return ErrorHandler(error);
+	}
+};
diff --git a/src/routes/services/[id]/umami/stop.json.ts b/src/routes/services/[id]/umami/stop.json.ts
new file mode 100644
index 000000000..67dd96d04
--- /dev/null
+++ b/src/routes/services/[id]/umami/stop.json.ts
@@ -0,0 +1,42 @@
+import { getUserDetails, removeDestinationDocker } from '$lib/common';
+import * as db from '$lib/database';
+import { ErrorHandler } from '$lib/database';
+import { checkContainer, stopTcpHttpProxy } from '$lib/haproxy';
+import type { RequestHandler } from '@sveltejs/kit';
+
+export const post: RequestHandler = async (event) => {
+	const { teamId, status, body } = await getUserDetails(event);
+	if (status === 401) return { status, body };
+
+	const { id } = event.params;
+
+	try {
+		const service = await db.getService({ id, teamId });
+		const { destinationDockerId, destinationDocker } = service;
+		if (destinationDockerId) {
+			const engine = destinationDocker.engine;
+
+			try {
+				const found = await checkContainer(engine, id);
+				if (found) {
+					await removeDestinationDocker({ id, engine });
+				}
+			} catch (error) {
+				console.error(error);
+			}
+			try {
+				const found = await checkContainer(engine, `${id}-postgresql`);
+				if (found) {
+					await removeDestinationDocker({ id: `${id}-postgresql`, engine });
+				}
+			} catch (error) {
+				console.error(error);
+			}
+		}
+		return {
+			status: 200
+		};
+	} catch (error) {
+		return ErrorHandler(error);
+	}
+};
diff --git a/src/routes/services/[id]/uptimekuma/start.json.ts b/src/routes/services/[id]/uptimekuma/start.json.ts
index 7a72326e1..6327db0ec 100644
--- a/src/routes/services/[id]/uptimekuma/start.json.ts
+++ b/src/routes/services/[id]/uptimekuma/start.json.ts
@@ -42,7 +42,15 @@ export const post: RequestHandler = async (event) => {
 					volumes: [config.volume],
 					environment: config.environmentVariables,
 					restart: 'always',
-					labels: makeLabelForServices('uptimekuma')
+					labels: makeLabelForServices('uptimekuma'),
+					deploy: {
+						restart_policy: {
+							condition: 'on-failure',
+							delay: '5s',
+							max_attempts: 3,
+							window: '120s'
+						}
+					}
 				}
 			},
 			networks: {
@@ -60,11 +68,7 @@ export const post: RequestHandler = async (event) => {
 		await fs.writeFile(composeFileDestination, yaml.dump(composeFile));
 
 		try {
-			if (version === 'latest') {
-				await asyncExecShell(
-					`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} pull`
-				);
-			}
+			await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} pull`);
 			await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} up -d`);
 			return {
 				status: 200
diff --git a/src/routes/services/[id]/vaultwarden/start.json.ts b/src/routes/services/[id]/vaultwarden/start.json.ts
index ae13d9015..511b040a3 100644
--- a/src/routes/services/[id]/vaultwarden/start.json.ts
+++ b/src/routes/services/[id]/vaultwarden/start.json.ts
@@ -43,7 +43,15 @@ export const post: RequestHandler = async (event) => {
 					networks: [network],
 					volumes: [config.volume],
 					restart: 'always',
-					labels: makeLabelForServices('vaultWarden')
+					labels: makeLabelForServices('vaultWarden'),
+					deploy: {
+						restart_policy: {
+							condition: 'on-failure',
+							delay: '5s',
+							max_attempts: 3,
+							window: '120s'
+						}
+					}
 				}
 			},
 			networks: {
@@ -60,11 +68,7 @@ export const post: RequestHandler = async (event) => {
 		const composeFileDestination = `${workdir}/docker-compose.yaml`;
 		await fs.writeFile(composeFileDestination, yaml.dump(composeFile));
 		try {
-			if (version === 'latest') {
-				await asyncExecShell(
-					`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} pull`
-				);
-			}
+			await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} pull`);
 			await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} up -d`);
 			return {
 				status: 200
diff --git a/src/routes/services/[id]/vscodeserver/start.json.ts b/src/routes/services/[id]/vscodeserver/start.json.ts
index dbe0c120c..4ca29c215 100644
--- a/src/routes/services/[id]/vscodeserver/start.json.ts
+++ b/src/routes/services/[id]/vscodeserver/start.json.ts
@@ -21,6 +21,7 @@ export const post: RequestHandler = async (event) => {
 			destinationDockerId,
 			destinationDocker,
 			serviceSecret,
+			persistentStorage,
 			vscodeserver: { password }
 		} = service;
 
@@ -42,6 +43,28 @@ export const post: RequestHandler = async (event) => {
 				config.environmentVariables[secret.name] = secret.value;
 			});
 		}
+
+		const volumes =
+			persistentStorage?.map((storage) => {
+				return `${id}${storage.path.replace(/\//gi, '-')}:${storage.path}`;
+			}) || [];
+
+		const composeVolumes = volumes.map((volume) => {
+			return {
+				[`${volume.split(':')[0]}`]: {
+					name: volume.split(':')[0]
+				}
+			};
+		});
+		const volumeMounts = Object.assign(
+			{},
+			{
+				[config.volume.split(':')[0]]: {
+					name: config.volume.split(':')[0]
+				}
+			},
+			...composeVolumes
+		);
 		const composeFile: ComposeFile = {
 			version: '3.8',
 			services: {
@@ -50,9 +73,17 @@ export const post: RequestHandler = async (event) => {
 					image: config.image,
 					environment: config.environmentVariables,
 					networks: [network],
-					volumes: [config.volume],
+					volumes: [config.volume, ...volumes],
 					restart: 'always',
-					labels: makeLabelForServices('vscodeServer')
+					labels: makeLabelForServices('vscodeServer'),
+					deploy: {
+						restart_policy: {
+							condition: 'on-failure',
+							delay: '5s',
+							max_attempts: 3,
+							window: '120s'
+						}
+					}
 				}
 			},
 			networks: {
@@ -60,19 +91,22 @@ export const post: RequestHandler = async (event) => {
 					external: true
 				}
 			},
-			volumes: {
-				[config.volume.split(':')[0]]: {
-					name: config.volume.split(':')[0]
-				}
-			}
+			volumes: volumeMounts
 		};
 		const composeFileDestination = `${workdir}/docker-compose.yaml`;
 		await fs.writeFile(composeFileDestination, yaml.dump(composeFile));
 
-		if (version === 'latest') {
-			await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} pull`);
-		}
+		await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} pull`);
 		await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} up -d`);
+
+		const changePermissionOn = persistentStorage.map((p) => p.path);
+		if (changePermissionOn.length > 0) {
+			await asyncExecShell(
+				`DOCKER_HOST=${host} docker exec -u root ${id} chown -R 1000:1000 ${changePermissionOn.join(
+					' '
+				)}`
+			);
+		}
 		return {
 			status: 200
 		};
diff --git a/src/routes/services/[id]/wordpress/settings.json.ts b/src/routes/services/[id]/wordpress/settings.json.ts
index e82b6baba..4f9c1f9b2 100644
--- a/src/routes/services/[id]/wordpress/settings.json.ts
+++ b/src/routes/services/[id]/wordpress/settings.json.ts
@@ -2,7 +2,7 @@ import { dev } from '$app/env';
 import { asyncExecShell, getEngine, getUserDetails } from '$lib/common';
 import { decrypt, encrypt } from '$lib/crypto';
 import * as db from '$lib/database';
-import { generateDatabaseConfiguration, ErrorHandler, generatePassword } from '$lib/database';
+import { ErrorHandler, generatePassword, getFreePort } from '$lib/database';
 import { checkContainer, startTcpProxy, stopTcpHttpProxy } from '$lib/haproxy';
 import type { ComposeFile } from '$lib/types/composeFile';
 import type { RequestHandler } from '@sveltejs/kit';
@@ -16,11 +16,10 @@ export const post: RequestHandler = async (event) => {
 	if (status === 401) return { status, body };
 
 	const { id } = event.params;
-	const data = await db.prisma.setting.findFirst();
-	const { minPort, maxPort } = data;
 
 	const { ftpEnabled } = await event.request.json();
-	const publicPort = await getPort({ port: portNumbers(minPort, maxPort) });
+	const publicPort = await getFreePort();
+
 	let ftpUser = cuid();
 	let ftpPassword = generatePassword();
 
@@ -114,7 +113,7 @@ export const post: RequestHandler = async (event) => {
 					services: {
 						[`${id}-ftp`]: {
 							image: `atmoz/sftp:alpine`,
-							command: `'${ftpUser}:${password.replace('\n', '').replace(/\$/g, '$$$')}:e:1001'`,
+							command: `'${ftpUser}:${password.replace('\n', '').replace(/\$/g, '$$$')}:e:33'`,
 							extra_hosts: ['host.docker.internal:host-gateway'],
 							container_name: `${id}-ftp`,
 							volumes,
diff --git a/src/routes/services/[id]/wordpress/start.json.ts b/src/routes/services/[id]/wordpress/start.json.ts
index c0a28e0bd..0572be971 100644
--- a/src/routes/services/[id]/wordpress/start.json.ts
+++ b/src/routes/services/[id]/wordpress/start.json.ts
@@ -77,7 +77,15 @@ export const post: RequestHandler = async (event) => {
 					networks: [network],
 					restart: 'always',
 					depends_on: [`${id}-mysql`],
-					labels: makeLabelForServices('wordpress')
+					labels: makeLabelForServices('wordpress'),
+					deploy: {
+						restart_policy: {
+							condition: 'on-failure',
+							delay: '5s',
+							max_attempts: 3,
+							window: '120s'
+						}
+					}
 				},
 				[`${id}-mysql`]: {
 					container_name: `${id}-mysql`,
@@ -85,7 +93,15 @@ export const post: RequestHandler = async (event) => {
 					volumes: [config.mysql.volume],
 					environment: config.mysql.environmentVariables,
 					networks: [network],
-					restart: 'always'
+					restart: 'always',
+					deploy: {
+						restart_policy: {
+							condition: 'on-failure',
+							delay: '5s',
+							max_attempts: 3,
+							window: '120s'
+						}
+					}
 				}
 			},
 			networks: {
@@ -105,11 +121,7 @@ export const post: RequestHandler = async (event) => {
 		const composeFileDestination = `${workdir}/docker-compose.yaml`;
 		await fs.writeFile(composeFileDestination, yaml.dump(composeFile));
 		try {
-			if (version === 'latest') {
-				await asyncExecShell(
-					`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} pull`
-				);
-			}
+			await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} pull`);
 			await asyncExecShell(`DOCKER_HOST=${host} docker compose -f ${composeFileDestination} up -d`);
 			return {
 				status: 200
diff --git a/src/routes/services/[id]/wordpress/stop.json.ts b/src/routes/services/[id]/wordpress/stop.json.ts
index 2fc32b5a1..c99ed3420 100644
--- a/src/routes/services/[id]/wordpress/stop.json.ts
+++ b/src/routes/services/[id]/wordpress/stop.json.ts
@@ -12,21 +12,44 @@ export const post: RequestHandler = async (event) => {
 
 	try {
 		const service = await db.getService({ id, teamId });
-		const { destinationDockerId, destinationDocker, fqdn } = service;
+		const {
+			destinationDockerId,
+			destinationDocker,
+			fqdn,
+			wordpress: { ftpEnabled }
+		} = service;
 		if (destinationDockerId) {
 			const engine = destinationDocker.engine;
 			try {
-				let found = await checkContainer(engine, id);
+				const found = await checkContainer(engine, id);
 				if (found) {
 					await removeDestinationDocker({ id, engine });
 				}
-				found = await checkContainer(engine, `${id}-mysql`);
+			} catch (error) {
+				console.error(error);
+			}
+			try {
+				const found = await checkContainer(engine, `${id}-mysql`);
 				if (found) {
 					await removeDestinationDocker({ id: `${id}-mysql`, engine });
 				}
 			} catch (error) {
 				console.error(error);
 			}
+			try {
+				if (ftpEnabled) {
+					const found = await checkContainer(engine, `${id}-ftp`);
+					if (found) {
+						await removeDestinationDocker({ id: `${id}-ftp`, engine });
+					}
+					await db.prisma.wordpress.update({
+						where: { serviceId: id },
+						data: { ftpEnabled: false }
+					});
+				}
+			} catch (error) {
+				console.error(error);
+			}
 		}
 
 		return {
diff --git a/src/routes/services/index.svelte b/src/routes/services/index.svelte
index 998779a1f..fd784d049 100644
--- a/src/routes/services/index.svelte
+++ b/src/routes/services/index.svelte
@@ -11,9 +11,11 @@
 	import N8n from '$lib/components/svg/services/N8n.svelte';
 	import UptimeKuma from '$lib/components/svg/services/UptimeKuma.svelte';
 	import Ghost from '$lib/components/svg/services/Ghost.svelte';
+	import { t } from '$lib/translations';
 	import MeiliSearch from '$lib/components/svg/services/MeiliSearch.svelte';
 	import { session } from '$app/stores';
 	import { getDomain } from '$lib/components/common';
+	import Umami from '$lib/components/svg/services/Umami.svelte';
 
 	export let services;
 	async function newService() {
@@ -33,7 +35,7 @@
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">Services</div>
+	<div class="mr-4 text-2xl tracking-tight">{$t('index.services')}</div>
 	<div on:click={newService} class="add-icon cursor-pointer bg-pink-600 hover:bg-pink-500">
 		<svg
 			class="w-6"
@@ -54,7 +56,7 @@
 <div class="flex flex-col flex-wrap justify-center">
 	{#if !services || ownServices.length === 0}
 		<div class="flex-col">
-			<div class="text-center text-xl font-bold">No services found</div>
+			<div class="text-center text-xl font-bold">{$t('service.no_service')}</div>
 		</div>
 	{/if}
 	{#if ownServices.length > 0 || otherServices.length > 0}
@@ -85,6 +87,8 @@
 								<Ghost isAbsolute />
 							{:else if service.type === 'meilisearch'}
 								<MeiliSearch isAbsolute />
+							{:else if service.type === 'umami'}
+								<Umami isAbsolute />
 							{/if}
 							<div class="truncate text-center text-xl font-bold">
 								{service.name}
@@ -97,7 +101,7 @@
 							{/if}
 							{#if !service.type || !service.fqdn}
 								<div class="truncate text-center font-bold text-red-500 group-hover:text-white">
-									Configuration missing
+									{$t('application.configuration.configuration_missing')}
 								</div>
 							{/if}
 						</div>
@@ -132,6 +136,8 @@
 									<Ghost isAbsolute />
 								{:else if service.type === 'meilisearch'}
 									<MeiliSearch isAbsolute />
+								{:else if service.type === 'umami'}
+									<Umami isAbsolute />
 								{/if}
 								<div class="truncate text-center text-xl font-bold">
 									{service.name}
diff --git a/src/routes/settings/_Language.svelte b/src/routes/settings/_Language.svelte
new file mode 100644
index 000000000..566e9c1d1
--- /dev/null
+++ b/src/routes/settings/_Language.svelte
@@ -0,0 +1,22 @@
+<script>
+	import { t } from '$lib/translations';
+	import Cookies from 'js-cookie';
+	import langs from '$lib/lang.json';
+	function setLocale(locale) {
+		Cookies.set('lang', locale);
+		return window.location.reload();
+	}
+</script>
+
+<div class="grid grid-cols-2 items-start pb-4">
+	<div class="flex-col">
+		<div class="text-base font-bold text-stone-100">
+			{$t('setting.change_language')}
+		</div>
+	</div>
+	<div class="items-center justify-start space-x-2 text-left">
+		{#each Object.entries(langs) as [lang, name]}
+			<button on:click={() => setLocale(lang)}>Change to {name}</button>
+		{/each}
+	</div>
+</div>
diff --git a/src/routes/settings/check.json.ts b/src/routes/settings/check.json.ts
index d24dcc0e6..bec577001 100644
--- a/src/routes/settings/check.json.ts
+++ b/src/routes/settings/check.json.ts
@@ -1,6 +1,7 @@
 import { asyncExecShell, getEngine, getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
 import { ErrorHandler } from '$lib/database';
+import { t } from '$lib/translations';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const post: RequestHandler = async (event) => {
@@ -16,7 +17,8 @@ export const post: RequestHandler = async (event) => {
 		return {
 			status: found ? 500 : 200,
 			body: {
-				error: found && `Domain ${fqdn.replace('www.', '')} is already used.`
+				error:
+					found && t.get('application.domain_already_in_use', { domain: fqdn.replace('www.', '') })
 			}
 		};
 	} catch (error) {
diff --git a/src/routes/settings/index.json.ts b/src/routes/settings/index.json.ts
index d126b2313..210f12782 100644
--- a/src/routes/settings/index.json.ts
+++ b/src/routes/settings/index.json.ts
@@ -1,13 +1,14 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
 import { listSettings, ErrorHandler } from '$lib/database';
+import { t } from '$lib/translations';
 import type { RequestHandler } from '@sveltejs/kit';
 import { promises as dns } from 'dns';
 
 export const get: RequestHandler = async (event) => {
 	const { teamId, status, body } = await getUserDetails(event);
 	if (status === 401) return { status, body };
-	if (teamId !== '0') return { status: 401, body: { message: 'You are not an admin.' } };
+	if (teamId !== '0') return { status: 200, body: { settings: {} } };
 	try {
 		const settings = await listSettings();
 		return {
@@ -27,7 +28,7 @@ export const del: RequestHandler = async (event) => {
 		return {
 			status: 401,
 			body: {
-				message: 'You do not have permission to do this. \nAsk an admin to modify your permissions.'
+				message: t.get('setting.permission_denied')
 			}
 		};
 	if (status === 401) return { status, body };
@@ -44,7 +45,7 @@ export const del: RequestHandler = async (event) => {
 		return {
 			status: 200,
 			body: {
-				message: 'Domain removed',
+				message: t.get('setting.domain_removed'),
 				redirect: ip ? `http://${ip[0]}:3000/settings` : undefined
 			}
 		};
@@ -58,15 +59,19 @@ export const post: RequestHandler = async (event) => {
 		return {
 			status: 401,
 			body: {
-				message: 'You do not have permission to do this. \nAsk an admin to modify your permissions.'
+				message: t.get('setting.permission_denied')
 			}
 		};
 	if (status === 401) return { status, body };
 
-	const { fqdn, isRegistrationEnabled, dualCerts, minPort, maxPort } = await event.request.json();
+	const { fqdn, isRegistrationEnabled, dualCerts, minPort, maxPort, isAutoUpdateEnabled } =
+		await event.request.json();
 	try {
 		const { id } = await db.listSettings();
-		await db.prisma.setting.update({ where: { id }, data: { isRegistrationEnabled, dualCerts } });
+		await db.prisma.setting.update({
+			where: { id },
+			data: { isRegistrationEnabled, dualCerts, isAutoUpdateEnabled }
+		});
 		if (fqdn) {
 			await db.prisma.setting.update({ where: { id }, data: { fqdn } });
 		}
diff --git a/src/routes/settings/index.svelte b/src/routes/settings/index.svelte
index 0af8d534c..dce1362d7 100644
--- a/src/routes/settings/index.svelte
+++ b/src/routes/settings/index.svelte
@@ -28,6 +28,8 @@
 	import { session } from '$app/stores';
 
 	export let settings;
+	import Cookies from 'js-cookie';
+	import langs from '$lib/lang.json';
 	import Setting from '$lib/components/Setting.svelte';
 	import Explainer from '$lib/components/Explainer.svelte';
 	import { errorNotification } from '$lib/form';
@@ -36,9 +38,11 @@
 	import { browser } from '$app/env';
 	import { getDomain } from '$lib/components/common';
 	import { toast } from '@zerodevx/svelte-toast';
+	import { t } from '$lib/translations';
 
 	let isRegistrationEnabled = settings.isRegistrationEnabled;
 	let dualCerts = settings.dualCerts;
+	let isAutoUpdateEnabled = settings.isAutoUpdateEnabled;
 
 	let minPort = settings.minPort;
 	let maxPort = settings.maxPort;
@@ -71,8 +75,11 @@
 			if (name === 'dualCerts') {
 				dualCerts = !dualCerts;
 			}
-			await post(`/settings.json`, { isRegistrationEnabled, dualCerts });
-			return toast.push('Settings saved.');
+			if (name === 'isAutoUpdateEnabled') {
+				isAutoUpdateEnabled = !isAutoUpdateEnabled;
+			}
+			await post(`/settings.json`, { isRegistrationEnabled, dualCerts, isAutoUpdateEnabled });
+			return toast.push(t.get('application.settings_saved'));
 		} catch ({ error }) {
 			return errorNotification(error);
 		}
@@ -99,19 +106,19 @@
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">Settings</div>
+	<div class="mr-4 text-2xl tracking-tight">{$t('index.settings')}</div>
 </div>
 {#if $session.teamId === '0'}
 	<div class="mx-auto max-w-4xl px-6">
 		<form on:submit|preventDefault={handleSubmit} class="grid grid-flow-row gap-2 py-4">
 			<div class="flex space-x-1 pb-6">
-				<div class="title font-bold">Global Settings</div>
+				<div class="title font-bold">{$t('index.global_settings')}</div>
 				<button
 					type="submit"
 					disabled={loading.save}
 					class:bg-yellow-500={!loading.save}
 					class:hover:bg-yellow-400={!loading.save}
-					class="mx-2 ">{loading.save ? 'Saving...' : 'Save'}</button
+					class="mx-2 ">{loading.save ? $t('forms.saving') : $t('forms.save')}</button
 				>
 				{#if isFqdnSet}
 					<button
@@ -119,17 +126,18 @@
 						disabled={loading.remove}
 						class:bg-red-600={!loading.remove}
 						class:hover:bg-red-500={!loading.remove}
-						>{loading.remove ? 'Removing...' : 'Remove domain'}</button
+						>{loading.remove ? $t('forms.removing') : $t('forms.remove_domain')}</button
 					>
 				{/if}
 			</div>
 			<div class="grid grid-flow-row gap-2 px-10">
+				<!-- <Language /> -->
 				<div class="grid grid-cols-2 items-start">
 					<div class="flex-col">
-						<div class="pt-2 text-base font-bold text-stone-100">URL (FQDN)</div>
-						<Explainer
-							text="If you specify <span class='text-yellow-500 font-bold'>https</span>, Coolify will be accessible only over https. SSL certificate will be generated for you.<br>If you specify <span class='text-yellow-500 font-bold'>www</span>, Coolify will be redirected (302) from non-www and vice versa."
-						/>
+						<div class="pt-2 text-base font-bold text-stone-100">
+							{$t('application.url_fqdn')}
+						</div>
+						<Explainer text={$t('setting.ssl_explainer')} />
 					</div>
 					<div class="justify-start text-left">
 						<input
@@ -139,16 +147,16 @@
 							name="fqdn"
 							id="fqdn"
 							pattern="^https?://([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{'{'}2,{'}'}$"
-							placeholder="eg: https://coolify.io"
+							placeholder="{$t('forms.eg')}: https://coolify.io"
 						/>
 					</div>
 				</div>
 				<div class="grid grid-cols-2 items-start py-6">
 					<div class="flex-col">
-						<div class="pt-2 text-base font-bold text-stone-100">Public Port Range</div>
-						<Explainer
-							text="Ports used to expose databases/services/internal services.<br> Add them to your firewall (if applicable).<br><br>You can specify a range of ports, eg: <span class='text-yellow-500 font-bold'>9000-9100</span>"
-						/>
+						<div class="pt-2 text-base font-bold text-stone-100">
+							{$t('forms.public_port_range')}
+						</div>
+						<Explainer text={$t('forms.public_port_range_explainer')} />
 					</div>
 					<div class="mx-auto flex-row items-center justify-center space-y-2">
 						<input
@@ -170,40 +178,50 @@
 				</div>
 				<div class="grid grid-cols-2 items-center">
 					<Setting
-						dataTooltip="Must remove the domain before you can change this setting."
+						dataTooltip={$t('setting.must_remove_domain_before_changing')}
 						disabled={isFqdnSet}
 						bind:setting={dualCerts}
-						title="Generate SSL for www and non-www?"
-						description="It will generate certificates for both www and non-www. <br>You need to have <span class='font-bold text-yellow-500'>both DNS entries</span> set in advance.<br><br>Useful if you expect to have visitors on both."
+						title={$t('application.ssl_www_and_non_www')}
+						description={$t('services.generate_www_non_www_ssl')}
 						on:click={() => !isFqdnSet && changeSettings('dualCerts')}
 					/>
 				</div>
 				<div class="grid grid-cols-2 items-center">
 					<Setting
 						bind:setting={isRegistrationEnabled}
-						title="Registration allowed?"
-						description="Allow further registrations to the application. <br>It's turned off after the first registration. "
+						title={$t('setting.registration_allowed')}
+						description={$t('setting.registration_allowed_explainer')}
 						on:click={() => changeSettings('isRegistrationEnabled')}
 					/>
 				</div>
+				{#if browser && (window.location.hostname === 'staging.coolify.io' || window.location.hostname === 'localhost')}
+					<div class="grid grid-cols-2 items-center">
+						<Setting
+							bind:setting={isAutoUpdateEnabled}
+							title={$t('setting.auto_update_enabled')}
+							description={$t('setting.auto_update_enabled_explainer')}
+							on:click={() => changeSettings('isAutoUpdateEnabled')}
+						/>
+					</div>
+				{/if}
 			</div>
 		</form>
 		<div class="flex space-x-1 pt-6 font-bold">
-			<div class="title">Coolify Proxy Settings</div>
+			<div class="title">{$t('setting.coolify_proxy_settings')}</div>
 		</div>
 		<Explainer
-			text={`Credentials for <a class="text-white font-bold" href=${
-				fqdn
+			text={$t('setting.credential_stat_explainer', {
+				link: fqdn
 					? `http://${settings.proxyUser}:${settings.proxyPassword}@` + getDomain(fqdn) + ':8404'
 					: browser &&
 					  `http://${settings.proxyUser}:${settings.proxyPassword}@` +
 							window.location.hostname +
 							':8404'
-			} target="_blank">stats</a> page.`}
+			})}
 		/>
 		<div class="space-y-2 px-10 py-5">
 			<div class="grid grid-cols-2 items-center">
-				<label for="proxyUser">User</label>
+				<label for="proxyUser">{$t('forms.user')}</label>
 				<CopyPasswordField
 					readonly
 					disabled
@@ -213,7 +231,7 @@
 				/>
 			</div>
 			<div class="grid grid-cols-2 items-center">
-				<label for="proxyPassword">Password</label>
+				<label for="proxyPassword">{$t('forms.password')}</label>
 				<CopyPasswordField
 					readonly
 					disabled
@@ -225,4 +243,8 @@
 			</div>
 		</div>
 	</div>
+{:else}
+	<div class="mx-auto max-w-4xl px-6">
+		<!-- <Language /> -->
+	</div>
 {/if}
diff --git a/src/routes/sources/[id]/_Github.svelte b/src/routes/sources/[id]/_Github.svelte
index a01746267..b03fe8abd 100644
--- a/src/routes/sources/[id]/_Github.svelte
+++ b/src/routes/sources/[id]/_Github.svelte
@@ -2,8 +2,10 @@
 	export let source;
 	import { page, session } from '$app/stores';
 	import { post } from '$lib/api';
+	import Explainer from '$lib/components/Explainer.svelte';
 	import { errorNotification } from '$lib/form';
 	import { toast } from '@zerodevx/svelte-toast';
+	import { t } from '$lib/translations';
 	const { id } = $page.params;
 
 	let loading = false;
@@ -51,7 +53,8 @@
 				type: 'github',
 				name: source.name,
 				htmlUrl: source.htmlUrl.replace(/\/$/, ''),
-				apiUrl: source.apiUrl.replace(/\/$/, '')
+				apiUrl: source.apiUrl.replace(/\/$/, ''),
+				organization: source.organization
 			});
 		} catch ({ error }) {
 			return errorNotification(error);
@@ -97,6 +100,22 @@
 					<label for="apiUrl" class="text-base font-bold text-stone-100">API URL</label>
 					<input name="apiUrl" id="apiUrl" required bind:value={source.apiUrl} />
 				</div>
+				<div class="grid grid-cols-2">
+					<div class="flex flex-col">
+						<label for="organization" class="pt-2 text-base font-bold text-stone-100"
+							>Organization</label
+						>
+						<Explainer
+							text="Fill it if you would like to use an organization's as your Git Source. Otherwise your user will be used."
+						/>
+					</div>
+					<input
+						name="organization"
+						id="organization"
+						placeholder="eg: coollabsio"
+						bind:value={source.organization}
+					/>
+				</div>
 			</div>
 			{#if source.apiUrl && source.htmlUrl && source.name}
 				<div class="text-center">
@@ -107,7 +126,7 @@
 	{:else if source.githubApp?.installationId}
 		<form on:submit|preventDefault={handleSubmit} class="py-4">
 			<div class="flex space-x-1 pb-5 font-bold">
-				<div class="title">General</div>
+				<div class="title">{$t('general')}</div>
 				{#if $session.isAdmin}
 					<button
 						type="submit"
@@ -116,14 +135,14 @@
 						disabled={loading}>{loading ? 'Saving...' : 'Save'}</button
 					>
 					<button on:click|preventDefault={() => installRepositories(source)}
-						>Change GitHub App Settings</button
+						>{$t('source.change_app_settings', { name: 'GitHub' })}</button
 					>
 				{/if}
 			</div>
 			<div class="grid grid-flow-row gap-2 px-10">
 				<div class="grid grid-flow-row gap-2">
 					<div class="mt-2 grid grid-cols-2 items-center">
-						<label for="name" class="text-base font-bold text-stone-100">Name</label>
+						<label for="name" class="text-base font-bold text-stone-100">{$t('forms.name')}</label>
 						<input name="name" id="name" required bind:value={source.name} />
 					</div>
 				</div>
@@ -135,6 +154,21 @@
 					<label for="apiUrl" class="text-base font-bold text-stone-100">API URL</label>
 					<input name="apiUrl" id="apiUrl" required bind:value={source.apiUrl} />
 				</div>
+				<div class="grid grid-cols-2">
+					<div class="flex flex-col">
+						<label for="organization" class="pt-2 text-base font-bold text-stone-100"
+							>Organization</label
+						>
+					</div>
+					<input
+						readonly
+						disabled
+						name="organization"
+						id="organization"
+						placeholder="eg: coollabsio"
+						bind:value={source.organization}
+					/>
+				</div>
 			</div>
 		</form>
 	{:else}
diff --git a/src/routes/sources/[id]/_Gitlab.svelte b/src/routes/sources/[id]/_Gitlab.svelte
index b528b1850..be1df4909 100644
--- a/src/routes/sources/[id]/_Gitlab.svelte
+++ b/src/routes/sources/[id]/_Gitlab.svelte
@@ -10,6 +10,7 @@
 	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
 	import { toast } from '@zerodevx/svelte-toast';
 
+	import { t } from '$lib/translations';
 	const { id } = $page.params;
 	let url = browser ? (settings.fqdn ? settings.fqdn : window.location.origin) : '';
 
@@ -130,10 +131,12 @@
 					type="submit"
 					class:bg-orange-600={!loading}
 					class:hover:bg-orange-500={!loading}
-					disabled={loading}>{loading ? 'Saving...' : 'Save'}</button
+					disabled={loading}>{loading ? $t('forms.saving') : $t('forms.save')}</button
 				>
 				{#if source.gitlabAppId}
-					<button on:click|preventDefault={changeSettings}>Change GitLab App Settings</button>
+					<button on:click|preventDefault={changeSettings}
+						>{$t('source.change_app_settings', { name: 'GitLab' })}</button
+					>
 				{/if}
 			{/if}
 		</div>
@@ -144,10 +147,10 @@
 						>GitLab Application Type</label
 					>
 					<select name="type" id="type" class="w-96" bind:value={applicationType}>
-						<option value="user">User owned application</option>
-						<option value="group">Group owned application</option>
+						<option value="user">{$t('source.gitlab.user_owned')}</option>
+						<option value="group">{$t('source.gitlab.group_owned')}</option>
 						{#if source.htmlUrl !== 'https://gitlab.com'}
-							<option value="instance">Instance-wide application (self-hosted)</option>
+							<option value="instance">{$t('source.gitlab.self_hosted')}</option>
 						{/if}
 					</select>
 				</div>
@@ -167,13 +170,15 @@
 
 			<div class="grid grid-flow-row gap-2">
 				<div class="mt-2 grid grid-cols-2 items-center">
-					<label for="name" class="text-base font-bold text-stone-100">Name</label>
+					<label for="name" class="text-base font-bold text-stone-100">{$t('forms.name')}</label>
 					<input name="name" id="name" required bind:value={source.name} />
 				</div>
 			</div>
 			{#if source.gitlabApp.groupName}
 				<div class="grid grid-cols-2 items-center">
-					<label for="groupName" class="text-base font-bold text-stone-100">Group Name</label>
+					<label for="groupName" class="text-base font-bold text-stone-100"
+						>{$t('source.group_name')}</label
+					>
 					<input
 						name="groupName"
 						id="groupName"
@@ -194,11 +199,11 @@
 			</div>
 			<div class="grid grid-cols-2 items-start">
 				<div class="flex-col">
-					<label for="oauthId" class="pt-2 text-base font-bold text-stone-100">OAuth ID</label>
+					<label for="oauthId" class="pt-2 text-base font-bold text-stone-100"
+						>{$t('source.oauth_id')}</label
+					>
 					{#if !source.gitlabAppId}
-						<Explainer
-							text="The OAuth ID is the unique identifier of the GitLab application. <br>You can find it <span class='font-bold text-orange-600' >in the URL</span> of your GitLab OAuth Application."
-						/>
+						<Explainer text={$t('source.oauth_id_explainer')} />
 					{/if}
 				</div>
 				<input
@@ -215,7 +220,9 @@
 			</div>
 
 			<div class="grid grid-cols-2 items-center">
-				<label for="appId" class="text-base font-bold text-stone-100">Application ID</label>
+				<label for="appId" class="text-base font-bold text-stone-100"
+					>{$t('source.application_id')}</label
+				>
 				<input
 					name="appId"
 					id="appId"
@@ -226,7 +233,9 @@
 				/>
 			</div>
 			<div class="grid grid-cols-2 items-center">
-				<label for="appSecret" class="text-base font-bold text-stone-100">Secret</label>
+				<label for="appSecret" class="text-base font-bold text-stone-100"
+					>{$t('index.secret')}</label
+				>
 				<CopyPasswordField
 					disabled={source.gitlabAppId}
 					readonly={source.gitlabAppId}
diff --git a/src/routes/sources/[id]/__layout.svelte b/src/routes/sources/[id]/__layout.svelte
index 0f5139558..30df278a5 100644
--- a/src/routes/sources/[id]/__layout.svelte
+++ b/src/routes/sources/[id]/__layout.svelte
@@ -34,10 +34,11 @@
 	import { page, session } from '$app/stores';
 	import { errorNotification } from '$lib/form';
 	import DeleteIcon from '$lib/components/DeleteIcon.svelte';
+	import { t } from '$lib/translations';
 	const { id } = $page.params;
 
 	async function deleteSource(name) {
-		const sure = confirm(`Are you sure you would like to delete '${name}'?`);
+		const sure = confirm($t('application.confirm_to_delete', { name: name }));
 		if (sure) {
 			const response = await fetch(`/sources/${id}.json`, {
 				method: 'delete'
@@ -55,14 +56,14 @@
 <nav class="nav-side">
 	<button
 		on:click={() => deleteSource(source.name)}
-		title="Delete Git Source"
+		title={$t('source.delete_git_source')}
 		type="submit"
 		disabled={!$session.isAdmin}
 		class:hover:text-red-500={$session.isAdmin}
 		class="icons tooltip-bottom bg-transparent text-sm"
 		data-tooltip={$session.isAdmin
-			? 'Delete Git Source'
-			: 'You do not have permission to delete a Git Source'}><DeleteIcon /></button
+			? $t('source.delete_git_source')
+			: $t('source.permission_denied')}><DeleteIcon /></button
 	>
 </nav>
 <slot />
diff --git a/src/routes/sources/[id]/check.json.ts b/src/routes/sources/[id]/check.json.ts
index fe7d8e9c0..89084fdd7 100644
--- a/src/routes/sources/[id]/check.json.ts
+++ b/src/routes/sources/[id]/check.json.ts
@@ -1,6 +1,7 @@
 import { getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
 import { ErrorHandler } from '$lib/database';
+import { t } from '$lib/translations';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const post: RequestHandler = async (event) => {
@@ -11,7 +12,7 @@ export const post: RequestHandler = async (event) => {
 		const found = await db.prisma.gitlabApp.findFirst({ where: { oauthId: Number(oauthId) } });
 		if (found) {
 			throw {
-				message: `GitLab App is already configured.`
+				message: t.get('source.gitlab.already_configured')
 			};
 		}
 		return { status: 200 };
diff --git a/src/routes/sources/[id]/github.json.ts b/src/routes/sources/[id]/github.json.ts
index e0f1d3b61..14da66c0a 100644
--- a/src/routes/sources/[id]/github.json.ts
+++ b/src/routes/sources/[id]/github.json.ts
@@ -9,8 +9,8 @@ export const post: RequestHandler = async (event) => {
 	const { id } = event.params;
 
 	try {
-		let { type, name, htmlUrl, apiUrl } = await event.request.json();
-		await db.addGitHubSource({ id, teamId, type, name, htmlUrl, apiUrl });
+		let { type, name, htmlUrl, apiUrl, organization } = await event.request.json();
+		await db.addGitHubSource({ id, teamId, type, name, htmlUrl, apiUrl, organization });
 		return { status: 201 };
 	} catch (error) {
 		return ErrorHandler(error);
diff --git a/src/routes/sources/[id]/index.svelte b/src/routes/sources/[id]/index.svelte
index 015c98a1f..7538dbbbd 100644
--- a/src/routes/sources/[id]/index.svelte
+++ b/src/routes/sources/[id]/index.svelte
@@ -30,6 +30,8 @@
 <script lang="ts">
 	export let source: Prisma.GitSource;
 	export let settings;
+	import { t } from '$lib/translations';
+
 	import type Prisma from '@prisma/client';
 	import Github from './_Github.svelte';
 	import Gitlab from './_Gitlab.svelte';
@@ -67,7 +69,7 @@
 </script>
 
 <div class="flex space-x-1 p-6 px-6 text-2xl font-bold">
-	<div class="tracking-tight">Git Source</div>
+	<div class="tracking-tight">{$t('application.git_source')}</div>
 	<span class="arrow-right-applications px-1 text-orange-500">></span>
 	<span class="pr-2">{source.name}</span>
 </div>
diff --git a/src/routes/sources/[id]/newGithubApp.svelte b/src/routes/sources/[id]/newGithubApp.svelte
index b6a74c3ba..e3215b380 100644
--- a/src/routes/sources/[id]/newGithubApp.svelte
+++ b/src/routes/sources/[id]/newGithubApp.svelte
@@ -31,12 +31,12 @@
 <script>
 	import { dev } from '$app/env';
 	import { getDomain, dashify } from '$lib/components/common';
+	import { t } from '$lib/translations';
 
 	export let source;
 	export let settings;
 	onMount(() => {
 		const { organization, id, htmlUrl } = source;
-		console.log(source);
 		const { fqdn } = settings;
 		const host = dev
 			? 'http://localhost:3000'
@@ -85,5 +85,5 @@
 </script>
 
 <div class="flex h-screen items-center justify-center text-3xl font-bold">
-	Redirecting to Github...
+	{$t('source.github.redirecting')}
 </div>
diff --git a/src/routes/sources/index.svelte b/src/routes/sources/index.svelte
index 191eb8857..72489bdea 100644
--- a/src/routes/sources/index.svelte
+++ b/src/routes/sources/index.svelte
@@ -39,10 +39,11 @@
 		const { id } = await post('/sources/new', {});
 		return await goto(`/sources/${id}`, { replaceState: true });
 	}
+	import { t } from '$lib/translations';
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">Git Sources</div>
+	<div class="mr-4 text-2xl tracking-tight">{$t('index.git_sources')}</div>
 	{#if $session.isAdmin}
 		<button on:click={newSource} class="add-icon bg-orange-600 hover:bg-orange-500">
 			<svg
@@ -64,7 +65,7 @@
 <div class="flex flex-col flex-wrap justify-center">
 	{#if !sources || ownSources.length === 0}
 		<div class="flex-col">
-			<div class="text-center text-xl font-bold">No git sources found</div>
+			<div class="text-center text-xl font-bold">{$t('source.no_git_sources_found')}</div>
 		</div>
 	{/if}
 	{#if ownSources.length > 0 || otherSources.length > 0}
@@ -85,7 +86,7 @@
 
 							{#if (source.type === 'gitlab' && !source.gitlabAppId) || (source.type === 'github' && source.githubApp?.installationId === null)}
 								<div class="truncate text-center font-bold text-red-500 group-hover:text-white">
-									Configuration missing
+									{$t('application.configuration.configuration_missing')}
 								</div>
 							{:else}
 								<div class="truncate text-center">{getDomain(source.htmlUrl) || ''}</div>
@@ -112,7 +113,7 @@
 								{/if}
 								{#if (source.type === 'gitlab' && !source.gitlabAppId) || (source.type === 'github' && source.githubApp?.installationId === null)}
 									<div class="truncate text-center font-bold text-red-500 group-hover:text-white">
-										Configuration missing
+										{$t('application.configuration.configuration_missing')}
 									</div>
 								{:else}
 									<div class="truncate text-center">{source.htmlUrl}</div>
diff --git a/src/tailwind.css b/src/tailwind.css
index 20f67dd73..1e48bb81b 100644
--- a/src/tailwind.css
+++ b/src/tailwind.css
@@ -50,7 +50,10 @@ textarea {
 }
 
 #svelte .listContainer {
-	@apply bg-coolgray-400 text-white scrollbar-w-2 scrollbar-thumb-coollabs scrollbar-track-coolgray-200;
+	@apply bg-coolgray-400 text-white scrollbar-w-2 scrollbar-thumb-green-500 scrollbar-track-coolgray-200;
+}
+#svelte .selectedItem {
+	@apply pl-3;
 }
 
 #svelte .item.hover {
@@ -116,7 +119,7 @@ a {
 }
 
 .icons {
-	@apply rounded p-2 transition duration-200 hover:bg-coolgray-500 disabled:bg-coolblack !important;
+	@apply rounded p-2 transition duration-200 hover:bg-coolgray-500 disabled:bg-coolblack disabled:text-coolgray-500 !important;
 }
 
 .arrow-right-applications {
@@ -209,7 +212,55 @@ a {
 	padding: 8px;
 	color: #fff;
 	content: attr(data-tooltip);
-	@apply min-w-[100px] rounded bg-coollabs text-center font-normal;
+	@apply min-w-[100px] rounded text-center font-normal;
+}
+
+/* Base colours for tooltips */
+
+/* coollabs - default */
+.tooltip:after,
+[data-tooltip]:after {
+	@apply bg-coollabs;
+}
+
+/* Green 500 */
+.tooltip-green-500:after {
+	@apply bg-green-500;
+}
+
+/* Orange 500 */
+.tooltip-orange-500:after {
+	@apply bg-orange-500;
+}
+
+/* Sky 500 */
+.tooltip-sky-500:after {
+	@apply bg-sky-500;
+}
+
+/* Purple 500 */
+.tooltip-purple-500:after {
+	@apply bg-purple-500;
+}
+
+/* Pink 500 */
+.tooltip-pink-500:after {
+	@apply bg-pink-500;
+}
+
+/* Fuchsia 500 */
+.tooltip-fuchsia-500:after {
+	@apply bg-fuchsia-500;
+}
+
+/* Yellow 500 */
+.tooltip-yellow-500:after {
+	@apply bg-yellow-500;
+}
+
+/* Red-500 */
+.tooltip-red-500:after {
+	@apply bg-red-500;
 }
 
 /* Directions */
diff --git a/svelte.config.js b/svelte.config.js
index 4e8bc8966..352c3e330 100644
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -12,6 +12,11 @@ const config = {
 		vite: {
 			optimizeDeps: {
 				exclude: ['svelte-kit-cookie-session']
+			},
+			server: {
+				fs: {
+					allow: ['./src/lib/locales/']
+				}
 			}
 		}
 	}