fix: increase query time for new services etc

backup db file
update GH actions
2026-01-08 20:52:20 +00:00 · 2023-07-18 09:50:05 +02:00 · 2023-07-17 15:17:18 +02:00 · 2023-07-17 14:36:33 +02:00 · 2023-07-17 14:02:51 +02:00 · 2023-07-17 13:50:26 +02:00
36 changed files with 2406 additions and 2104 deletions
--- a/.github/ISSUE_TEMPLATE/--bug-report.yaml
+++ b/.github/ISSUE_TEMPLATE/--bug-report.yaml
@@ -2,9 +2,6 @@ name: 🐞 Bug report
 description: Create a bug report to help us improve coolify
 title: "[Bug]: "
 labels: [Bug]
-assignees:
- andrasbacsai
- vasani-arpit
 body:
 - type: markdown
  attributes:
--- a/.github/ISSUE_TEMPLATE/--feature-request.yaml
+++ b/.github/ISSUE_TEMPLATE/--feature-request.yaml
@@ -2,9 +2,6 @@ name: 🛠️ Feature request
 description: Suggest an idea to improve coolify
 title: '[Feature]: '
 labels: [Enhancement]
-assignees:
-  - andrasbacsai
-  - vasani-arpit
 body:
  - type: markdown
    attributes:
--- a/.github/workflows/production-release-dockerhub.yml
+++ b/.github/workflows/production-release-dockerhub.yml
@@ -1,112 +0,0 @@
-name: Production Release to DockerHub
-
-on:
-  push:
-    branches:
-      - "this-branch-does-not-exists"
-
-jobs:
-  arm64:
-    runs-on: [self-hosted, arm64]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Get current package version
-        uses: martinbeentjes/npm-get-version-action@v1.2.3
-        id: package-version
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          platforms: linux/arm64
-          push: true
-          tags: coollabsio/coolify:${{steps.package-version.outputs.current-version}}-arm64
-          cache-from: type=registry,ref=coollabsio/coolify:buildcache-arm64
-          cache-to: type=registry,ref=coollabsio/coolify:buildcache-arm64,mode=max
-  amd64:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Get current package version
-        uses: martinbeentjes/npm-get-version-action@v1.2.3
-        id: package-version
-      - name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          platforms: linux/amd64
-          push: true
-          tags: coollabsio/coolify:${{steps.package-version.outputs.current-version}}
-          cache-from: type=registry,ref=coollabsio/coolify:buildcache-amd64
-          cache-to: type=registry,ref=coollabsio/coolify:buildcache-amd64,mode=max
-  aarch64:
-    runs-on: [self-hosted, arm64]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Get current package version
-        uses: martinbeentjes/npm-get-version-action@v1.2.3
-        id: package-version
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          platforms: linux/aarch64
-          push: true
-          tags: coollabsio/coolify:${{steps.package-version.outputs.current-version}}-aarch64
-          cache-from: type=registry,ref=coollabsio/coolify:buildcache-aarch64
-          cache-to: type=registry,ref=coollabsio/coolify:buildcache-aarch64,mode=max
-  merge-manifest:
-    runs-on: ubuntu-latest
-    needs: [amd64, arm64, aarch64]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Get current package version
-        uses: martinbeentjes/npm-get-version-action@v1.2.3
-        id: package-version
-      - name: Create & publish manifest
-        run: |
-          docker buildx imagetools create --append coollabsio/coolify:${{steps.package-version.outputs.current-version}}-arm64 --append coollabsio/coolify:${{steps.package-version.outputs.current-version}}-aarch64 --tag coollabsio/coolify:${{steps.package-version.outputs.current-version}}
-          docker buildx imagetools create coollabsio/coolify:${{steps.package-version.outputs.current-version}} --tag coollabsio/coolify:latest
-      - uses: sarisia/actions-status-discord@v1
-        if: always()
-        with:
-          webhook: ${{ secrets.DISCORD_WEBHOOK_PROD_RELEASE_CHANNEL }}
--- a/.github/workflows/production-release.yml
+++ b/.github/workflows/production-release.yml
@@ -14,6 +14,8 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v3
+        with:
+          ref: "v3"
      - name: Set up QEMU
        uses: docker/setup-qemu-action@v2
      - name: Set up Docker Buildx
@@ -44,6 +46,8 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v3
+        with:
+          ref: "v3"
      - name: Set up QEMU
        uses: docker/setup-qemu-action@v1
      - name: Set up Docker Buildx
@@ -95,7 +99,6 @@ jobs:
      - name: Create & publish manifest
        run: |
          docker buildx imagetools create --append ${{ fromJSON(steps.meta.outputs.json).tags[0] }}-aarch64 --tag ${{ fromJSON(steps.meta.outputs.json).tags[0] }}
-          docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
      - uses: sarisia/actions-status-discord@v1
        if: always()
        with:
--- a/.github/workflows/release-candidate.yml
+++ b/.github/workflows/release-candidate.yml
@@ -1,110 +0,0 @@
-name: Release Candidate to ghcr.io
-
-on:
-  release:
-    types: [prereleased]
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: "coollabsio/coolify"
-
-jobs:
-  amd64:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Login to ghcr.io
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN  }}
-      - name: Extract metadata
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-      - name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          platforms: linux/amd64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-  aarch64:
-    runs-on: [self-hosted, arm64]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Login to ghcr.io
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Extract metadata
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-      - name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          platforms: linux/aarch64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}-aarch64
-          labels: ${{ steps.meta.outputs.labels }}
-  merge-manifest:
-    runs-on: ubuntu-latest
-    needs: [amd64, aarch64]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Login to ghcr.io
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN  }}
-      - name: Extract metadata
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-      - name: Create & publish manifest
-        run: |
-          docker buildx imagetools create --append ${{ steps.meta.outputs.tags }}-aarch64 --tag ${{ steps.meta.outputs.tags }}
-      - uses: sarisia/actions-status-discord@v1
-        if: always()
-        with:
-          webhook: ${{ secrets.DISCORD_WEBHOOK_DEV_RELEASE_CHANNEL }}
--- a/.github/workflows/staging-release-dockerhub.yml
+++ b/.github/workflows/staging-release-dockerhub.yml
@@ -1,86 +0,0 @@
-name: Staging Release to DockerHub
-
-on:
-  push:
-    branches:
-      - "this-branch-does-not-exists"
-
-jobs:
-  arm64:
-    runs-on: [self-hosted, arm64]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          ref: "next"
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Get current package version
-        uses: martinbeentjes/npm-get-version-action@v1.2.3
-        id: package-version
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          platforms: linux/arm64
-          push: true
-          tags: coollabsio/coolify:next-arm64
-          cache-from: type=registry,ref=coollabsio/coolify:buildcache-next-arm64
-          cache-to: type=registry,ref=coollabsio/coolify:buildcache-next-arm64,mode=max
-  amd64:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          ref: "next"
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Get current package version
-        uses: martinbeentjes/npm-get-version-action@v1.2.3
-        id: package-version
-      - name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          platforms: linux/amd64
-          push: true
-          tags: coollabsio/coolify:next
-          cache-from: type=registry,ref=coollabsio/coolify:buildcache-next-amd64
-          cache-to: type=registry,ref=coollabsio/coolify:buildcache-next-amd64,mode=max
-  merge-manifest:
-    runs-on: ubuntu-latest
-    needs: [arm64, amd64]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Create & publish manifest
-        run: |
-          docker buildx imagetools create --append coollabsio/coolify:next-arm64 --tag coollabsio/coolify:next
-      - uses: sarisia/actions-status-discord@v1
-        if: always()
-        with:
-          webhook: ${{ secrets.DISCORD_WEBHOOK_DEV_RELEASE_CHANNEL }}
--- a/.github/workflows/staging-release.yml
+++ b/.github/workflows/staging-release.yml
@@ -18,7 +18,7 @@ jobs:
      - name: Checkout
        uses: actions/checkout@v3
        with:
-          ref: "next"
+          ref: "v3"
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v2
      - name: Login to ghcr.io
@@ -47,7 +47,7 @@ jobs:
      - name: Checkout
        uses: actions/checkout@v3
        with:
-          ref: "next"
+          ref: "v3"
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v2
      - name: Login to ghcr.io
--- a/2
+++ b/2
@@ -24,7 +24,7 @@ ARG DOCKER_COMPOSE_VERSION=2.6.1
 # https://github.com/buildpacks/pack/releases
 ARG PACK_VERSION=0.27.0

-RUN apt update && apt -y install --no-install-recommends ca-certificates git git-lfs openssh-client curl jq cmake sqlite3 openssl psmisc python3
+RUN apt update && apt -y install --no-install-recommends ca-certificates git git-lfs openssh-client curl jq cmake sqlite3 openssl psmisc python3 vim
 RUN apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/{apt,dpkg,cache,log}/
 RUN npm --no-update-notifier --no-fund --global install pnpm@${PNPM_VERSION}
 RUN npm install -g npm@${PNPM_VERSION}
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ If you have a new service / build pack you would like to add, raise an idea [her

 ## How to install

-For more details goto the [docs](https://docs.coollabs.io/coolify/installation).
+For more details goto the [docs](https://docs.coollabs.io/coolify-v3/installation).

 Installation is automated with the following command:

@@ -79,9 +79,9 @@ Deploy your resource to:
 ### Services

 - [Appwrite](https://appwrite.io)
- [WordPress](https://docs.coollabs.io/coolify/services/wordpress)
+- [WordPress](https://docs.coollabs.io/coolify-v3/services/wordpress)
 - [Ghost](https://ghost.org)
- [Plausible Analytics](https://docs.coollabs.io/coolify/services/plausible-analytics)
+- [Plausible Analytics](https://docs.coollabs.io/coolify-v3/services/plausible-analytics)
 - [NocoDB](https://nocodb.com)
 - [VSCode Server](https://github.com/cdr/code-server)
 - [MinIO](https://min.io)
--- a/apps/api/devTemplates.yaml
+++ b/apps/api/devTemplates.yaml
@@ -268,6 +268,13 @@
        - DISABLE_REGISTRATION=$$config_disable_registration
        - DATABASE_URL=$$secret_database_url
        - CLICKHOUSE_DATABASE_URL=$$secret_clickhouse_database_url
+        - MAILER_EMAIL=$$config_mailer_email
+        - SMTP_HOST_ADDR=$$config_smtp_host_addr
+        - SMTP_HOST_PORT=$$config_smtp_host_port
+        - SMTP_USER_NAME=$$config_smtp_user_name
+        - SMTP_USER_PWD=$$config_smtp_user_pwd
+        - SMTP_HOST_SSL_ENABLED=$$config_smtp_host_ssl_enabled
+        - SMTP_HOST_RETRIES=$$config_smtp_host_retries
      ports:
        - "8000"
    $$id-postgresql:
@@ -375,6 +382,49 @@
      label: PostgreSQL Database
      defaultValue: plausible
      description: ""
+    - id: $$config_mailer_email
+      name: MAILER_EMAIL
+      label: Mailer Email
+      defaultValue: hello@plausible.local
+      description: >-
+        The email id to use for as from address of all communications from Plausible.
+    - id: $$config_smtp_host_addr
+      name: SMTP_HOST_ADDR
+      label: SMTP Host Address
+      defaultValue: localhost
+      description: >-
+        The host address of your smtp server.
+    - id: $$config_smtp_host_port
+      name: SMTP_HOST_PORT
+      label: SMTP Port
+      defaultValue: "25"
+      description: >-
+        The port of your smtp server.
+    - id: $$config_smtp_user_name
+      name: SMTP_USER_NAME
+      label: SMTP Username
+      defaultValue: ""
+      description: >-
+        The username/email in case SMTP auth is enabled.
+    - id: $$config_smtp_user_pwd
+      name: SMTP_USER_PWD
+      label: SMTP Password
+      defaultValue: ""
+      description: >-
+        The password in case SMTP auth is enabled.
+      showOnConfiguration: true
+    - id: $$config_smtp_host_ssl_enabled
+      name: SMTP_HOST_SSL_ENABLED
+      label: SMTP SSL
+      defaultValue: "false"
+      description: >-
+        If SSL is enabled for SMTP connection.
+    - id: $$config_smtp_host_retries
+      name: SMTP_HOST_RETRIES
+      label: SMTP Retries
+      defaultValue: "2"
+      description: >-
+        Number of retries to make until mailer gives up.
    - id: $$config_scriptName
      name: SCRIPT_NAME
      label: Custom Script Name
@@ -3389,6 +3439,13 @@
        - DISABLE_REGISTRATION=$$config_disable_registration
        - DATABASE_URL=$$secret_database_url
        - CLICKHOUSE_DATABASE_URL=$$secret_clickhouse_database_url
+        - MAILER_EMAIL=$$config_mailer_email
+        - SMTP_HOST_ADDR=$$config_smtp_host_addr
+        - SMTP_HOST_PORT=$$config_smtp_host_port
+        - SMTP_USER_NAME=$$config_smtp_user_name
+        - SMTP_USER_PWD=$$config_smtp_user_pwd
+        - SMTP_HOST_SSL_ENABLED=$$config_smtp_host_ssl_enabled
+        - SMTP_HOST_RETRIES=$$config_smtp_host_retries
      ports:
        - "8000"
    $$id-postgresql:
@@ -3496,6 +3553,49 @@
      label: PostgreSQL Database
      defaultValue: plausible
      description: ""
+    - id: $$config_mailer_email
+      name: MAILER_EMAIL
+      label: Mailer Email
+      defaultValue: hello@plausible.local
+      description: >-
+        The email id to use for as from address of all communications from Plausible.
+    - id: $$config_smtp_host_addr
+      name: SMTP_HOST_ADDR
+      label: SMTP Host Address
+      defaultValue: localhost
+      description: >-
+        The host address of your smtp server.
+    - id: $$config_smtp_host_port
+      name: SMTP_HOST_PORT
+      label: SMTP Port
+      defaultValue: "25"
+      description: >-
+        The port of your smtp server.
+    - id: $$config_smtp_user_name
+      name: SMTP_USER_NAME
+      label: SMTP Username
+      defaultValue: ""
+      description: >-
+        The username/email in case SMTP auth is enabled.
+    - id: $$config_smtp_user_pwd
+      name: SMTP_USER_PWD
+      label: SMTP Password
+      defaultValue: ""
+      description: >-
+        The password in case SMTP auth is enabled.
+      showOnConfiguration: true
+    - id: $$config_smtp_host_ssl_enabled
+      name: SMTP_HOST_SSL_ENABLED
+      label: SMTP SSL
+      defaultValue: "false"
+      description: >-
+        If SSL is enabled for SMTP connection.
+    - id: $$config_smtp_host_retries
+      name: SMTP_HOST_RETRIES
+      label: SMTP Retries
+      defaultValue: "2"
+      description: >-
+        Number of retries to make until mailer gives up.
    - id: $$config_scriptName
      name: SCRIPT_NAME
      label: Custom Script Name
--- a/apps/api/package.json
+++ b/apps/api/package.json
@@ -26,8 +26,6 @@
 		"@iarna/toml": "2.2.5",
 		"@ladjs/graceful": "3.2.1",
 		"@prisma/client": "4.8.1",
-		"@sentry/node": "7.30.0",
-		"@sentry/tracing": "7.30.0",
 		"axe": "11.2.1",
 		"bcryptjs": "2.4.3",
 		"bree": "9.1.3",
--- a/apps/api/prisma/seed.js
+++ b/apps/api/prisma/seed.js
@@ -12,7 +12,7 @@ async function main() {
 		await prisma.setting.create({
 			data: {
 				id: '0',
-				arch: process.arch,
+				arch: process.arch
 			}
 		});
 	} else {
@@ -81,16 +81,246 @@ async function main() {
 		});
 	}
 	// Set new preview secrets
-	const secrets = await prisma.secret.findMany({ where: { isPRMRSecret: false } })
+	const secrets = await prisma.secret.findMany({ where: { isPRMRSecret: false } });
 	if (secrets.length > 0) {
 		for (const secret of secrets) {
-			const previewSecrets = await prisma.secret.findMany({ where: { applicationId: secret.applicationId, name: secret.name, isPRMRSecret: true } })
+			const previewSecrets = await prisma.secret.findMany({
+				where: { applicationId: secret.applicationId, name: secret.name, isPRMRSecret: true }
+			});
 			if (previewSecrets.length === 0) {
-				await prisma.secret.create({ data: { ...secret, id: undefined, isPRMRSecret: true } })
+				await prisma.secret.create({ data: { ...secret, id: undefined, isPRMRSecret: true } });
 			}
 		}
 	}
 }
+async function reEncryptSecrets() {
+	const { execaCommand } = await import('execa');
+	const date = new Date().getTime();
+	await execaCommand('env | grep COOLIFY > .env', { shell: true });
+	const secretOld = process.env['COOLIFY_SECRET_KEY'];
+	let secretNew = process.env['COOLIFY_SECRET_KEY_BETTER'];
+	if (!secretNew) {
+		console.log('No COOLIFY_SECRET_KEY_BETTER found... Generating new one...');
+		const { stdout: newKey } = await execaCommand(
+			'openssl rand -base64 1024 | sha256sum | base64 | head -c 32',
+			{ shell: true }
+		);
+		secretNew = newKey;
+	}
+	if (secretOld !== secretNew) {
+		console.log(
+			'Secrets (COOLIFY_SECRET_KEY & COOLIFY_SECRET_KEY_BETTER) are different, so re-encrypting everything...'
+		);
+		await execaCommand(`sed -i '/COOLIFY_SECRET_KEY=/d' .env`, { shell: true });
+		await execaCommand(`sed -i '/COOLIFY_SECRET_KEY_BETTER=/d' .env`, { shell: true });
+		await execaCommand(`echo "COOLIFY_SECRET_KEY=${secretNew}" >> .env`, { shell: true });
+		await execaCommand('echo "COOLIFY_SECRET_KEY_BETTER=' + secretNew + '" >> .env ', {
+			shell: true
+		});
+		await execaCommand(`echo "COOLIFY_SECRET_KEY_OLD_${date}=${secretOld}" >> .env`, {
+			shell: true
+		});
+		console.log(`Backup database to /app/db/prod.db_${date}.`);
+		await execaCommand(`cp /app/db/prod.db /app/db/prod.db_${date}`, { shell: true });
+		const transactions = [];
+		const secrets = await prisma.secret.findMany();
+		if (secrets.length > 0) {
+			for (const secret of secrets) {
+				const value = decrypt(secret.value, secretOld);
+				const newValue = encrypt(value, secretNew);
+				transactions.push(
+					prisma.secret.update({
+						where: { id: secret.id },
+						data: { value: newValue }
+					})
+				);
+			}
+		}
+		const serviceSecrets = await prisma.serviceSecret.findMany();
+		if (serviceSecrets.length > 0) {
+			for (const secret of serviceSecrets) {
+				const value = decrypt(secret.value, secretOld);
+				const newValue = encrypt(value, secretNew);
+				transactions.push(
+					prisma.serviceSecret.update({
+						where: { id: secret.id },
+						data: { value: newValue }
+					})
+				);
+			}
+		}
+		const gitlabApps = await prisma.gitlabApp.findMany();
+		if (gitlabApps.length > 0) {
+			for (const gitlabApp of gitlabApps) {
+				const value = decrypt(gitlabApp.privateSshKey, secretOld);
+				const newValue = encrypt(value, secretNew);
+				const appSecret = decrypt(gitlabApp.appSecret, secretOld);
+				const newAppSecret = encrypt(appSecret, secretNew);
+				transactions.push(
+					prisma.gitlabApp.update({
+						where: { id: gitlabApp.id },
+						data: { privateSshKey: newValue, appSecret: newAppSecret }
+					})
+				);
+			}
+		}
+		const githubApps = await prisma.githubApp.findMany();
+		if (githubApps.length > 0) {
+			for (const githubApp of githubApps) {
+				const clientSecret = decrypt(githubApp.clientSecret, secretOld);
+				const newClientSecret = encrypt(clientSecret, secretNew);
+				const webhookSecret = decrypt(githubApp.webhookSecret, secretOld);
+				const newWebhookSecret = encrypt(webhookSecret, secretNew);
+				const privateKey = decrypt(githubApp.privateKey, secretOld);
+				const newPrivateKey = encrypt(privateKey, secretNew);
+
+				transactions.push(
+					prisma.githubApp.update({
+						where: { id: githubApp.id },
+						data: {
+							clientSecret: newClientSecret,
+							webhookSecret: newWebhookSecret,
+							privateKey: newPrivateKey
+						}
+					})
+				);
+			}
+		}
+		const databases = await prisma.database.findMany();
+		if (databases.length > 0) {
+			for (const database of databases) {
+				const dbUserPassword = decrypt(database.dbUserPassword, secretOld);
+				const newDbUserPassword = encrypt(dbUserPassword, secretNew);
+				const rootUserPassword = decrypt(database.rootUserPassword, secretOld);
+				const newRootUserPassword = encrypt(rootUserPassword, secretNew);
+				transactions.push(
+					prisma.database.update({
+						where: { id: database.id },
+						data: {
+							dbUserPassword: newDbUserPassword,
+							rootUserPassword: newRootUserPassword
+						}
+					})
+				);
+			}
+		}
+		const databaseSecrets = await prisma.databaseSecret.findMany();
+		if (databaseSecrets.length > 0) {
+			for (const databaseSecret of databaseSecrets) {
+				const value = decrypt(databaseSecret.value, secretOld);
+				const newValue = encrypt(value, secretNew);
+				transactions.push(
+					prisma.databaseSecret.update({
+						where: { id: databaseSecret.id },
+						data: { value: newValue }
+					})
+				);
+			}
+		}
+		const wordpresses = await prisma.wordpress.findMany();
+		if (wordpresses.length > 0) {
+			for (const wordpress of wordpresses) {
+				const value = decrypt(wordpress.ftpHostKey, secretOld);
+				const newValue = encrypt(value, secretNew);
+				const ftpHostKeyPrivate = decrypt(wordpress.ftpHostKeyPrivate, secretOld);
+				const newFtpHostKeyPrivate = encrypt(ftpHostKeyPrivate, secretNew);
+				let newFtpPassword = undefined;
+				if (wordpress.ftpPassword != null) {
+					const ftpPassword = decrypt(wordpress.ftpPassword, secretOld);
+					newFtpPassword = encrypt(ftpPassword, secretNew);
+				}
+
+				transactions.push(
+					prisma.wordpress.update({
+						where: { id: wordpress.id },
+						data: {
+							ftpHostKey: newValue,
+							ftpHostKeyPrivate: newFtpHostKeyPrivate,
+							ftpPassword: newFtpPassword
+						}
+					})
+				);
+			}
+		}
+		const sshKeys = await prisma.sshKey.findMany();
+		if (sshKeys.length > 0) {
+			for (const key of sshKeys) {
+				const value = decrypt(key.privateKey, secretOld);
+				const newValue = encrypt(value, secretNew);
+				transactions.push(
+					prisma.sshKey.update({
+						where: { id: key.id },
+						data: {
+							privateKey: newValue
+						}
+					})
+				);
+			}
+		}
+		const dockerRegistries = await prisma.dockerRegistry.findMany();
+		if (dockerRegistries.length > 0) {
+			for (const registry of dockerRegistries) {
+				const value = decrypt(registry.password, secretOld);
+				const newValue = encrypt(value, secretNew);
+				transactions.push(
+					prisma.dockerRegistry.update({
+						where: { id: registry.id },
+						data: {
+							password: newValue
+						}
+					})
+				);
+			}
+		}
+		const certificates = await prisma.certificate.findMany();
+		if (certificates.length > 0) {
+			for (const certificate of certificates) {
+				const value = decrypt(certificate.key, secretOld);
+				const newValue = encrypt(value, secretNew);
+				transactions.push(
+					prisma.certificate.update({
+						where: { id: certificate.id },
+						data: {
+							key: newValue
+						}
+					})
+				);
+			}
+		}
+		await prisma.$transaction(transactions);
+	} else {
+		console.log('secrets are the same, so no need to re-encrypt');
+	}
+}
+
+const encrypt = (text, secret) => {
+	if (text && secret) {
+		const iv = crypto.randomBytes(16);
+		const cipher = crypto.createCipheriv(algorithm, secret, iv);
+		const encrypted = Buffer.concat([cipher.update(text.trim()), cipher.final()]);
+		return JSON.stringify({
+			iv: iv.toString('hex'),
+			content: encrypted.toString('hex')
+		});
+	}
+};
+const decrypt = (hashString, secret) => {
+	if (hashString && secret) {
+		try {
+			const hash = JSON.parse(hashString);
+			const decipher = crypto.createDecipheriv(algorithm, secret, Buffer.from(hash.iv, 'hex'));
+			const decrpyted = Buffer.concat([
+				decipher.update(Buffer.from(hash.content, 'hex')),
+				decipher.final()
+			]);
+			return decrpyted.toString();
+		} catch (error) {
+			console.log({ decryptionError: error.message });
+			return hashString;
+		}
+	}
+};
+
 main()
 	.catch((e) => {
 		console.error(e);
@@ -99,15 +329,11 @@ main()
 	.finally(async () => {
 		await prisma.$disconnect();
 	});
-
-const encrypt = (text) => {
-	if (text) {
-		const iv = crypto.randomBytes(16);
-		const cipher = crypto.createCipheriv(algorithm, process.env['COOLIFY_SECRET_KEY'], iv);
-		const encrypted = Buffer.concat([cipher.update(text), cipher.final()]);
-		return JSON.stringify({
-			iv: iv.toString('hex'),
-			content: encrypted.toString('hex')
-		});
-	}
-};
+reEncryptSecrets()
+	.catch((e) => {
+		console.error(e);
+		process.exit(1);
+	})
+	.finally(async () => {
+		await prisma.$disconnect();
+	});
--- a/apps/api/src/index.ts
+++ b/apps/api/src/index.ts
@@ -18,7 +18,6 @@ import {
 	isDev,
 	listSettings,
 	prisma,
-	sentryDSN,
 	startTraefikProxy,
 	startTraefikTCPProxy,
 	version
@@ -32,12 +31,12 @@ import { verifyRemoteDockerEngineFn } from './routes/api/v1/destinations/handler
 import { checkContainer } from './lib/docker';
 import { migrateApplicationPersistentStorage, migrateServicesToNewTemplate } from './lib';
 import { refreshTags, refreshTemplates } from './routes/api/v1/handlers';
-import * as Sentry from '@sentry/node';
 declare module 'fastify' {
 	interface FastifyInstance {
 		config: {
 			COOLIFY_APP_ID: string;
 			COOLIFY_SECRET_KEY: string;
+			COOLIFY_SECRET_KEY_BETTER: string | null;
 			COOLIFY_DATABASE_URL: string;
 			COOLIFY_IS_ON: string;
 			COOLIFY_WHITE_LABELED: string;
@@ -67,6 +66,10 @@ const host = '0.0.0.0';
 			COOLIFY_SECRET_KEY: {
 				type: 'string'
 			},
+			COOLIFY_SECRET_KEY_BETTER: {
+				type: 'string',
+				default: null
+			},
 			COOLIFY_DATABASE_URL: {
 				type: 'string',
 				default: 'file:../db/dev.db'
@@ -185,17 +188,17 @@ const host = '0.0.0.0';
 		// Refresh and check templates
 		setInterval(async () => {
 			await refreshTemplates();
-		}, 60000);
+		}, 60000 * 10);

 		setInterval(async () => {
 			await refreshTags();
-		}, 60000);
+		}, 60000 * 10);

 		setInterval(
 			async () => {
 				await migrateServicesToNewTemplate();
 			},
-			isDev ? 10000 : 60000
+			isDev ? 10000 : 60000 * 10
 		);

 		setInterval(async () => {
@@ -230,7 +233,7 @@ async function getIPAddress() {
 			console.log(`Getting public IPv6 address...`);
 			await prisma.setting.update({ where: { id: settings.id }, data: { ipv6 } });
 		}
-	} catch (error) {}
+	} catch (error) { }
 }
 async function getTagsTemplates() {
 	const { default: got } = await import('got');
@@ -242,7 +245,7 @@ async function getTagsTemplates() {
 				if (await fs.stat('./testTemplate.yaml')) {
 					templates = templates + (await fs.readFile('./testTemplate.yaml', 'utf8'));
 				}
-			} catch (error) {}
+			} catch (error) { }
 			try {
 				if (await fs.stat('./testTags.json')) {
 					const testTags = await fs.readFile('./testTags.json', 'utf8');
@@ -250,7 +253,7 @@ async function getTagsTemplates() {
 						tags = JSON.stringify(JSON.parse(tags).concat(JSON.parse(testTags)));
 					}
 				}
-			} catch (error) {}
+			} catch (error) { }

 			await fs.writeFile('./templates.json', JSON.stringify(yaml.load(templates)));
 			await fs.writeFile('./tags.json', tags);
@@ -276,9 +279,6 @@ async function initServer() {
 		if (settings.doNotTrack === true) {
 			console.log('[000] Telemetry disabled...');
 		} else {
-			if (settings.sentryDSN !== sentryDSN) {
-				await prisma.setting.update({ where: { id: '0' }, data: { sentryDSN } });
-			}
 			// Initialize Sentry
 			// Sentry.init({
 			// 	dsn: sentryDSN,
@@ -293,7 +293,7 @@ async function initServer() {
 	try {
 		console.log(`[001] Initializing server...`);
 		await executeCommand({ command: `docker network create --attachable coolify` });
-	} catch (error) {}
+	} catch (error) { }
 	try {
 		console.log(`[002] Cleanup stucked builds...`);
 		const isOlder = compareVersions('3.8.1', version);
@@ -303,7 +303,7 @@ async function initServer() {
 				data: { status: 'failed' }
 			});
 		}
-	} catch (error) {}
+	} catch (error) { }
 	try {
 		console.log('[003] Cleaning up old build sources under /tmp/build-sources/...');
 		if (!isDev) await fs.rm('/tmp/build-sources', { recursive: true, force: true });
@@ -319,7 +319,7 @@ async function getArch() {
 			console.log(`Getting architecture...`);
 			await prisma.setting.update({ where: { id: settings.id }, data: { arch: process.arch } });
 		}
-	} catch (error) {}
+	} catch (error) { }
 }

 async function cleanupStuckedContainers() {
@@ -402,7 +402,9 @@ async function autoUpdater() {
 				if (!isDev) {
 					const { isAutoUpdateEnabled } = await prisma.setting.findFirst();
 					if (isAutoUpdateEnabled) {
-						await executeCommand({ command: `docker pull ghcr.io/coollabsio/coolify:${latestVersion}` });
+						await executeCommand({
+							command: `docker pull ghcr.io/coollabsio/coolify:${latestVersion}`
+						});
 						await executeCommand({ shell: true, command: `env | grep '^COOLIFY' > .env` });
 						await executeCommand({
 							command: `sed -i '/COOLIFY_AUTO_UPDATE=/cCOOLIFY_AUTO_UPDATE=${isAutoUpdateEnabled}' .env`
@@ -475,7 +477,7 @@ async function checkProxies() {
 				}
 				try {
 					await createRemoteEngineConfiguration(docker.id);
-				} catch (error) {}
+				} catch (error) { }
 			}
 		}
 		// TCP Proxies
@@ -514,7 +516,7 @@ async function checkProxies() {
 		// 		await startTraefikTCPProxy(destinationDocker, id, publicPort, 9000);
 		// 	}
 		// }
-	} catch (error) {}
+	} catch (error) { }
 }

 async function copySSLCertificates() {
@@ -604,53 +606,54 @@ async function cleanupStorage() {
 			if (!destination.remoteVerified) continue;
 			enginesDone.add(destination.remoteIpAddress);
 		}
-		let lowDiskSpace = false;
-		try {
-			let stdout = null;
-			if (!isDev) {
-				const output = await executeCommand({
-					dockerId: destination.id,
-					command: `CONTAINER=$(docker ps -lq | head -1) && docker exec $CONTAINER sh -c 'df -kPT /'`,
-					shell: true
-				});
-				stdout = output.stdout;
-			} else {
-				const output = await executeCommand({
-					command: `df -kPT /`
-				});
-				stdout = output.stdout;
-			}
-			let lines = stdout.trim().split('\n');
-			let header = lines[0];
-			let regex =
-				/^Filesystem\s+|Type\s+|1024-blocks|\s+Used|\s+Available|\s+Capacity|\s+Mounted on\s*$/g;
-			const boundaries = [];
-			let match;
+		await cleanupDockerStorage(destination.id);
+		// let lowDiskSpace = false;
+		// try {
+		// 	let stdout = null;
+		// 	if (!isDev) {
+		// 		const output = await executeCommand({
+		// 			dockerId: destination.id,
+		// 			command: `CONTAINER=$(docker ps -lq | head -1) && docker exec $CONTAINER sh -c 'df -kPT /'`,
+		// 			shell: true
+		// 		});
+		// 		stdout = output.stdout;
+		// 	} else {
+		// 		const output = await executeCommand({
+		// 			command: `df -kPT /`
+		// 		});
+		// 		stdout = output.stdout;
+		// 	}
+		// 	let lines = stdout.trim().split('\n');
+		// 	let header = lines[0];
+		// 	let regex =
+		// 		/^Filesystem\s+|Type\s+|1024-blocks|\s+Used|\s+Available|\s+Capacity|\s+Mounted on\s*$/g;
+		// 	const boundaries = [];
+		// 	let match;

-			while ((match = regex.exec(header))) {
-				boundaries.push(match[0].length);
-			}
+		// 	while ((match = regex.exec(header))) {
+		// 		boundaries.push(match[0].length);
+		// 	}

-			boundaries[boundaries.length - 1] = -1;
-			const data = lines.slice(1).map((line) => {
-				const cl = boundaries.map((boundary) => {
-					const column = boundary > 0 ? line.slice(0, boundary) : line;
-					line = line.slice(boundary);
-					return column.trim();
-				});
-				return {
-					capacity: Number.parseInt(cl[5], 10) / 100
-				};
-			});
-			if (data.length > 0) {
-				const { capacity } = data[0];
-				if (capacity > 0.8) {
-					lowDiskSpace = true;
-				}
-			}
-		} catch (error) {}
-		if (lowDiskSpace) {
-			await cleanupDockerStorage(destination.id);
-		}
+		// 	boundaries[boundaries.length - 1] = -1;
+		// 	const data = lines.slice(1).map((line) => {
+		// 		const cl = boundaries.map((boundary) => {
+		// 			const column = boundary > 0 ? line.slice(0, boundary) : line;
+		// 			line = line.slice(boundary);
+		// 			return column.trim();
+		// 		});
+		// 		return {
+		// 			capacity: Number.parseInt(cl[5], 10) / 100
+		// 		};
+		// 	});
+		// 	if (data.length > 0) {
+		// 		const { capacity } = data[0];
+		// 		if (capacity > 0.8) {
+		// 			lowDiskSpace = true;
+		// 		}
+		// 	}
+		// } catch (error) {}
+		// if (lowDiskSpace) {
+		// await cleanupDockerStorage(destination.id);
+		// }
 	}
 }
--- a/apps/api/src/jobs/deployApplication.ts
+++ b/apps/api/src/jobs/deployApplication.ts
@@ -69,7 +69,15 @@ import * as buildpacks from '../lib/buildPacks';
 									teams: true
 								}
 							});
-
+							if (!application) {
+								await prisma.build.update({
+									where: { id: queueBuild.id },
+									data: {
+										status: 'failed'
+									}
+								});
+								throw new Error('Application not found');
+							}
 							let {
 								id: buildId,
 								type,
@@ -111,7 +119,7 @@ import * as buildpacks from '../lib/buildPacks';
 													.replace('-app', '')}:${storage.path}`;
 											}
 											if (storage.hostPath) {
-												return `${storage.hostPath}:${storage.path}`
+												return `${storage.hostPath}:${storage.path}`;
 											}
 											return `${applicationId}${storage.path.replace(/\//gi, '-')}:${storage.path}`;
 										}) || [];
@@ -163,17 +171,24 @@ import * as buildpacks from '../lib/buildPacks';
 											port: exposePort ? `${exposePort}:${port}` : port
 										});
 										try {
-											const composeVolumes = volumes.filter(v => {
-												if (!v.startsWith('.') && !v.startsWith('..') && !v.startsWith('/') && !v.startsWith('~')) {
-													return v;
-												}
-											}).map((volume) => {
-												return {
-													[`${volume.split(':')[0]}`]: {
-														name: volume.split(':')[0]
+											const composeVolumes = volumes
+												.filter((v) => {
+													if (
+														!v.startsWith('.') &&
+														!v.startsWith('..') &&
+														!v.startsWith('/') &&
+														!v.startsWith('~')
+													) {
+														return v;
 													}
-												};
-											});
+												})
+												.map((volume) => {
+													return {
+														[`${volume.split(':')[0]}`]: {
+															name: volume.split(':')[0]
+														}
+													};
+												});
 											const composeFile = {
 												version: '3.8',
 												services: {
@@ -389,14 +404,14 @@ import * as buildpacks from '../lib/buildPacks';
 												.replace('-app', '')}:${storage.path}`;
 										}
 										if (storage.hostPath) {
-											return `${storage.hostPath}:${storage.path}`
+											return `${storage.hostPath}:${storage.path}`;
 										}
 										return `${applicationId}${storage.path.replace(/\//gi, '-')}:${storage.path}`;
 									}) || [];

 								try {
 									dockerComposeConfiguration = JSON.parse(dockerComposeConfiguration);
-								} catch (error) { }
+								} catch (error) {}
 								let deployNeeded = true;
 								let destinationType;

@@ -463,7 +478,7 @@ import * as buildpacks from '../lib/buildPacks';

 									try {
 										await prisma.build.update({ where: { id: buildId }, data: { commit } });
-									} catch (err) { }
+									} catch (err) {}

 									if (!pullmergeRequestId) {
 										if (configHash !== currentHash) {
@@ -504,8 +519,9 @@ import * as buildpacks from '../lib/buildPacks';
 									try {
 										await executeCommand({
 											dockerId: destinationDocker.id,
-											command: `docker ${location ? `--config ${location}` : ''
-												} pull ${imageName}:${customTag}`
+											command: `docker ${
+												location ? `--config ${location}` : ''
+											} pull ${imageName}:${customTag}`
 										});
 										imageFoundRemotely = true;
 									} catch (error) {
@@ -668,8 +684,9 @@ import * as buildpacks from '../lib/buildPacks';
 										try {
 											const { stdout: containers } = await executeCommand({
 												dockerId: destinationDockerId,
-												command: `docker ps -a --filter 'label=com.docker.compose.service=${pullmergeRequestId ? imageId : applicationId
-													}' --format {{.ID}}`
+												command: `docker ps -a --filter 'label=com.docker.compose.service=${
+													pullmergeRequestId ? imageId : applicationId
+												}' --format {{.ID}}`
 											});
 											if (containers) {
 												const containerArray = containers.split('\n');
@@ -701,17 +718,24 @@ import * as buildpacks from '../lib/buildPacks';
 											await saveDockerRegistryCredentials({ url, username, password, workdir });
 										}
 										try {
-											const composeVolumes = volumes.filter(v => {
-												if (!v.startsWith('.') && !v.startsWith('..') && !v.startsWith('/') && !v.startsWith('~')) {
-													return v;
-												}
-											}).map((volume) => {
-												return {
-													[`${volume.split(':')[0]}`]: {
-														name: volume.split(':')[0]
+											const composeVolumes = volumes
+												.filter((v) => {
+													if (
+														!v.startsWith('.') &&
+														!v.startsWith('..') &&
+														!v.startsWith('/') &&
+														!v.startsWith('~')
+													) {
+														return v;
 													}
-												};
-											});
+												})
+												.map((volume) => {
+													return {
+														[`${volume.split(':')[0]}`]: {
+															name: volume.split(':')[0]
+														}
+													};
+												});
 											const composeFile = {
 												version: '3.8',
 												services: {
--- a/apps/api/src/lib.ts
+++ b/apps/api/src/lib.ts
@@ -86,19 +86,20 @@ export async function migrateServicesToNewTemplate() {
                    if (template.variables) {
                        if (template.variables.length > 0) {
                            for (const variable of template.variables) {
-                                const { defaultValue } = variable;
+                                let { defaultValue } = variable;
+                                defaultValue = defaultValue.toString();
                                const regex = /^\$\$.*\((\d+)\)$/g;
                                const length = Number(regex.exec(defaultValue)?.[1]) || undefined
-                                if (variable.defaultValue.startsWith('$$generate_password')) {
+                                if (defaultValue.startsWith('$$generate_password')) {
                                    variable.value = generatePassword({ length });
-                                } else if (variable.defaultValue.startsWith('$$generate_hex')) {
+                                } else if (defaultValue.startsWith('$$generate_hex')) {
                                    variable.value = generatePassword({ length, isHex: true });
-                                } else if (variable.defaultValue.startsWith('$$generate_username')) {
+                                } else if (defaultValue.startsWith('$$generate_username')) {
                                    variable.value = cuid();
-                                } else if (variable.defaultValue.startsWith('$$generate_token')) {
+                                } else if (defaultValue.startsWith('$$generate_token')) {
                                    variable.value = generateToken()
                                } else {
-                                    variable.value = variable.defaultValue || '';
+                                    variable.value = defaultValue || '';
                                }
                            }
                        }
--- a/apps/api/src/lib/buildPacks/docker.ts
+++ b/apps/api/src/lib/buildPacks/docker.ts
@@ -22,7 +22,6 @@ export default async function (data) {
 			});
 		});
 	}
-	Dockerfile.push(`RUN rm -fr .git`);
 	await fs.writeFile(`${data.workdir}${dockerFileLocation}`, Dockerfile.join('\n'));
 	await buildImage(data);
 }
--- a/apps/api/src/lib/common.ts
+++ b/apps/api/src/lib/common.ts
@@ -8,7 +8,6 @@ import type { Config } from 'unique-names-generator';
 import generator from 'generate-password';
 import crypto from 'crypto';
 import { promises as dns } from 'dns';
-import * as Sentry from '@sentry/node';
 import { PrismaClient } from '@prisma/client';
 import os from 'os';
 import * as SSHConfig from 'ssh-config/src/ssh-config';
@@ -19,12 +18,11 @@ import { saveBuildLog } from './buildPacks/common';
 import { scheduler } from './scheduler';
 import type { ExecaChildProcess } from 'execa';

-export const version = '3.12.30';
+export const version = '3.12.33';
 export const isDev = process.env.NODE_ENV === 'development';
 export const proxyPort = process.env.COOLIFY_PROXY_PORT;
 export const proxySecurePort = process.env.COOLIFY_PROXY_SECURE_PORT;
-export const sentryDSN =
-	'https://409f09bcb7af47928d3e0f46b78987f3@o1082494.ingest.sentry.io/4504236622217216';
+
 const algorithm = 'aes-256-ctr';
 const customConfig: Config = {
 	dictionaries: [adjectives, colors, animals],
@@ -172,13 +170,19 @@ export const base64Encode = (text: string): string => {
 export const base64Decode = (text: string): string => {
 	return Buffer.from(text, 'base64').toString('ascii');
 };
+export const getSecretKey = () => {
+	if (process.env['COOLIFY_SECRET_KEY_BETTER']) {
+		return process.env['COOLIFY_SECRET_KEY_BETTER'];
+	}
+	return process.env['COOLIFY_SECRET_KEY'];
+};
 export const decrypt = (hashString: string) => {
 	if (hashString) {
 		try {
 			const hash = JSON.parse(hashString);
 			const decipher = crypto.createDecipheriv(
 				algorithm,
-				process.env['COOLIFY_SECRET_KEY'],
+				getSecretKey(),
 				Buffer.from(hash.iv, 'hex')
 			);
 			const decrpyted = Buffer.concat([
@@ -195,7 +199,7 @@ export const decrypt = (hashString: string) => {
 export const encrypt = (text: string) => {
 	if (text) {
 		const iv = crypto.randomBytes(16);
-		const cipher = crypto.createCipheriv(algorithm, process.env['COOLIFY_SECRET_KEY'], iv);
+		const cipher = crypto.createCipheriv(algorithm, getSecretKey(), iv);
 		const encrypted = Buffer.concat([cipher.update(text.trim()), cipher.final()]);
 		return JSON.stringify({
 			iv: iv.toString('hex'),
@@ -579,7 +583,8 @@ export async function executeCommand({
 	stream = false,
 	buildId,
 	applicationId,
-	debug
+	debug,
+	timeout = 0
 }: {
 	command: string;
 	sshCommand?: boolean;
@@ -589,6 +594,7 @@ export async function executeCommand({
 	buildId?: string;
 	applicationId?: string;
 	debug?: boolean;
+	timeout?: number;
 }): Promise<ExecaChildProcess<string>> {
 	const { execa, execaCommand } = await import('execa');
 	const { parse } = await import('shell-quote');
@@ -613,20 +619,26 @@ export async function executeCommand({
 		}
 		if (sshCommand) {
 			if (shell) {
-				return execaCommand(`ssh ${remoteIpAddress}-remote ${command}`);
+				return execaCommand(`ssh ${remoteIpAddress}-remote ${command}`, {
+					timeout
+				});
 			}
-			return await execa('ssh', [`${remoteIpAddress}-remote`, dockerCommand, ...dockerArgs]);
+			return await execa('ssh', [`${remoteIpAddress}-remote`, dockerCommand, ...dockerArgs], {
+				timeout
+			});
 		}
 		if (stream) {
 			return await new Promise(async (resolve, reject) => {
 				let subprocess = null;
 				if (shell) {
 					subprocess = execaCommand(command, {
-						env: { DOCKER_BUILDKIT: '1', DOCKER_HOST: engine }
+						env: { DOCKER_BUILDKIT: '1', DOCKER_HOST: engine },
+						timeout
 					});
 				} else {
 					subprocess = execa(dockerCommand, dockerArgs, {
-						env: { DOCKER_BUILDKIT: '1', DOCKER_HOST: engine }
+						env: { DOCKER_BUILDKIT: '1', DOCKER_HOST: engine },
+						timeout
 					});
 				}
 				const logs = [];
@@ -680,19 +692,26 @@ export async function executeCommand({
 		} else {
 			if (shell) {
 				return await execaCommand(command, {
-					env: { DOCKER_BUILDKIT: '1', DOCKER_HOST: engine }
+					env: { DOCKER_BUILDKIT: '1', DOCKER_HOST: engine },
+					timeout
 				});
 			} else {
 				return await execa(dockerCommand, dockerArgs, {
-					env: { DOCKER_BUILDKIT: '1', DOCKER_HOST: engine }
+					env: { DOCKER_BUILDKIT: '1', DOCKER_HOST: engine },
+					timeout
 				});
 			}
 		}
 	} else {
 		if (shell) {
-			return execaCommand(command, { shell: true });
+			return execaCommand(command, {
+				shell: true,
+				timeout
+			});
 		}
-		return await execa(dockerCommand, dockerArgs);
+		return await execa(dockerCommand, dockerArgs, {
+			timeout
+		});
 	}
 }

@@ -826,7 +845,7 @@ export function generateToken() {
 		{
 			nbf: Math.floor(Date.now() / 1000) - 30
 		},
-		process.env['COOLIFY_SECRET_KEY']
+		getSecretKey()
 	);
 }
 export function generatePassword({
@@ -849,97 +868,97 @@ export function generatePassword({

 type DatabaseConfiguration =
 	| {
-			volume: string;
-			image: string;
-			command?: 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;
+		command?: 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;
-			command?: string;
-			ulimits: Record<string, unknown>;
-			privatePort: number;
-			environmentVariables: {
-				MONGO_INITDB_ROOT_USERNAME?: string;
-				MONGO_INITDB_ROOT_PASSWORD?: string;
-				MONGODB_ROOT_USER?: string;
-				MONGODB_ROOT_PASSWORD?: string;
-			};
-	  }
+		volume: string;
+		image: string;
+		command?: string;
+		ulimits: Record<string, unknown>;
+		privatePort: number;
+		environmentVariables: {
+			MONGO_INITDB_ROOT_USERNAME?: string;
+			MONGO_INITDB_ROOT_PASSWORD?: string;
+			MONGODB_ROOT_USER?: string;
+			MONGODB_ROOT_PASSWORD?: string;
+		};
+	}
 	| {
-			volume: string;
-			image: string;
-			command?: string;
-			ulimits: Record<string, unknown>;
-			privatePort: number;
-			environmentVariables: {
-				MARIADB_ROOT_USER: string;
-				MARIADB_ROOT_PASSWORD: string;
-				MARIADB_USER: string;
-				MARIADB_PASSWORD: string;
-				MARIADB_DATABASE: string;
-			};
-	  }
+		volume: string;
+		image: string;
+		command?: string;
+		ulimits: Record<string, unknown>;
+		privatePort: number;
+		environmentVariables: {
+			MARIADB_ROOT_USER: string;
+			MARIADB_ROOT_PASSWORD: string;
+			MARIADB_USER: string;
+			MARIADB_PASSWORD: string;
+			MARIADB_DATABASE: string;
+		};
+	}
 	| {
-			volume: string;
-			image: string;
-			command?: string;
-			ulimits: Record<string, unknown>;
-			privatePort: number;
-			environmentVariables: {
-				POSTGRES_PASSWORD?: string;
-				POSTGRES_USER?: string;
-				POSTGRES_DB?: string;
-				POSTGRESQL_POSTGRES_PASSWORD?: string;
-				POSTGRESQL_USERNAME?: string;
-				POSTGRESQL_PASSWORD?: string;
-				POSTGRESQL_DATABASE?: string;
-			};
-	  }
+		volume: string;
+		image: string;
+		command?: string;
+		ulimits: Record<string, unknown>;
+		privatePort: number;
+		environmentVariables: {
+			POSTGRES_PASSWORD?: string;
+			POSTGRES_USER?: string;
+			POSTGRES_DB?: string;
+			POSTGRESQL_POSTGRES_PASSWORD?: string;
+			POSTGRESQL_USERNAME?: string;
+			POSTGRESQL_PASSWORD?: string;
+			POSTGRESQL_DATABASE?: string;
+		};
+	}
 	| {
-			volume: string;
-			image: string;
-			command?: string;
-			ulimits: Record<string, unknown>;
-			privatePort: number;
-			environmentVariables: {
-				REDIS_AOF_ENABLED: string;
-				REDIS_PASSWORD: string;
-			};
-	  }
+		volume: string;
+		image: string;
+		command?: string;
+		ulimits: Record<string, unknown>;
+		privatePort: number;
+		environmentVariables: {
+			REDIS_AOF_ENABLED: string;
+			REDIS_PASSWORD: string;
+		};
+	}
 	| {
-			volume: string;
-			image: string;
-			command?: string;
-			ulimits: Record<string, unknown>;
-			privatePort: number;
-			environmentVariables: {
-				COUCHDB_PASSWORD: string;
-				COUCHDB_USER: string;
-			};
-	  }
+		volume: string;
+		image: string;
+		command?: string;
+		ulimits: Record<string, unknown>;
+		privatePort: number;
+		environmentVariables: {
+			COUCHDB_PASSWORD: string;
+			COUCHDB_USER: string;
+		};
+	}
 	| {
-			volume: string;
-			image: string;
-			command?: string;
-			ulimits: Record<string, unknown>;
-			privatePort: number;
-			environmentVariables: {
-				EDGEDB_SERVER_PASSWORD: string;
-				EDGEDB_SERVER_USER: string;
-				EDGEDB_SERVER_DATABASE: string;
-				EDGEDB_SERVER_TLS_CERT_MODE: string;
-			};
-	  };
+		volume: string;
+		image: string;
+		command?: string;
+		ulimits: Record<string, unknown>;
+		privatePort: number;
+		environmentVariables: {
+			EDGEDB_SERVER_PASSWORD: string;
+			EDGEDB_SERVER_USER: string;
+			EDGEDB_SERVER_DATABASE: string;
+			EDGEDB_SERVER_TLS_CERT_MODE: string;
+		};
+	};
 export function generateDatabaseConfiguration(database: any): DatabaseConfiguration {
 	const { id, dbUser, dbUserPassword, rootUser, rootUserPassword, defaultDatabase, version, type } =
 		database;
@@ -1038,9 +1057,8 @@ export function generateDatabaseConfiguration(database: any): DatabaseConfigurat
 		};
 		if (isARM()) {
 			configuration.volume = `${id}-${type}-data:/data`;
-			configuration.command = `/usr/local/bin/redis-server --appendonly ${
-				appendOnly ? 'yes' : 'no'
-			} --requirepass ${dbUserPassword}`;
+			configuration.command = `/usr/local/bin/redis-server --appendonly ${appendOnly ? 'yes' : 'no'
+				} --requirepass ${dbUserPassword}`;
 		}
 		return configuration;
 	} else if (type === 'couchdb') {
@@ -1125,12 +1143,12 @@ export type ComposeFileService = {
 	command?: string;
 	ports?: string[];
 	build?:
-		| {
-				context: string;
-				dockerfile: string;
-				args?: Record<string, unknown>;
-		  }
-		| string;
+	| {
+		context: string;
+		dockerfile: string;
+		args?: Record<string, unknown>;
+	}
+	| string;
 	deploy?: {
 		restart_policy?: {
 			condition?: string;
@@ -1201,7 +1219,7 @@ export const createDirectories = async ({
 	let workdirFound = false;
 	try {
 		workdirFound = !!(await fs.stat(workdir));
-	} catch (error) {}
+	} catch (error) { }
 	if (workdirFound) {
 		await executeCommand({ command: `rm -fr ${workdir}` });
 	}
@@ -1664,9 +1682,6 @@ export function errorHandler({
 	if (message.includes('Unique constraint failed')) {
 		message = 'This data is unique and already exists. Please try again with a different value.';
 	}
-	if (type === 'normal') {
-		Sentry.captureException(message);
-	}
 	throw { status, message };
 }
 export async function generateSshKeyPair(): Promise<{ publicKey: string; privateKey: string }> {
@@ -1728,7 +1743,7 @@ export async function stopBuild(buildId, applicationId) {
 					}
 				}
 				count++;
-			} catch (error) {}
+			} catch (error) { }
 		}, 100);
 	});
 }
@@ -1751,7 +1766,7 @@ export async function cleanupDockerStorage(dockerId) {
 	// Cleanup images that are not used by any container
 	try {
 		await executeCommand({ dockerId, command: `docker image prune -af` });
-	} catch (error) {}
+	} catch (error) { }

 	// Prune coolify managed containers
 	try {
@@ -1759,12 +1774,12 @@ export async function cleanupDockerStorage(dockerId) {
 			dockerId,
 			command: `docker container prune -f --filter "label=coolify.managed=true"`
 		});
-	} catch (error) {}
+	} catch (error) { }

 	// Cleanup build caches
 	try {
 		await executeCommand({ dockerId, command: `docker builder prune -af` });
-	} catch (error) {}
+	} catch (error) { }
 }

 export function persistentVolumes(id, persistentStorage, config) {
--- a/apps/api/src/plugins/jwt.ts
+++ b/apps/api/src/plugins/jwt.ts
@@ -1,33 +1,37 @@
-import fp from 'fastify-plugin'
-import fastifyJwt, { FastifyJWTOptions } from '@fastify/jwt'
+import fp from 'fastify-plugin';
+import fastifyJwt, { FastifyJWTOptions } from '@fastify/jwt';

-declare module "@fastify/jwt" {
-    interface FastifyJWT {
-        user: {
-            userId: string,
-            teamId: string,
-            permission: string,
-            isAdmin: boolean
-        }
-    }
+declare module '@fastify/jwt' {
+	interface FastifyJWT {
+		user: {
+			userId: string;
+			teamId: string;
+			permission: string;
+			isAdmin: boolean;
+		};
+	}
 }

 export default fp<FastifyJWTOptions>(async (fastify, opts) => {
-    fastify.register(fastifyJwt, {
-        secret: fastify.config.COOLIFY_SECRET_KEY
-    })
+	let secretKey = fastify.config.COOLIFY_SECRET_KEY_BETTER;
+	if (!secretKey) {
+		secretKey = fastify.config.COOLIFY_SECRET_KEY;
+	}
+	fastify.register(fastifyJwt, {
+		secret: secretKey
+	});

-    fastify.decorate("authenticate", async function (request, reply) {
-        try {
-            await request.jwtVerify()
-        } catch (err) {
-            reply.send(err)
-        }
-    })
-})
+	fastify.decorate('authenticate', async function (request, reply) {
+		try {
+			await request.jwtVerify();
+		} catch (err) {
+			reply.send(err);
+		}
+	});
+});

 declare module 'fastify' {
-    export interface FastifyInstance {
-        authenticate(): Promise<void>
-    }
+	export interface FastifyInstance {
+		authenticate(): Promise<void>;
+	}
 }
--- a/apps/api/src/routes/api/v1/applications/handlers.ts
+++ b/apps/api/src/routes/api/v1/applications/handlers.ts
@@ -640,8 +640,7 @@ export async function restartApplication(

 			const volumes =
 				persistentStorage?.map((storage) => {
-					return `${applicationId}${storage.path.replace(/\//gi, '-')}:${buildPack !== 'docker' ? '/app' : ''
-						}${storage.path}`;
+					return `${applicationId}${storage.path.replace(/\//gi, '-')}:${storage.path}`;
 				}) || [];
 			const composeVolumes = volumes.map((volume) => {
 				return {
--- a/apps/api/src/routes/api/v1/destinations/handlers.ts
+++ b/apps/api/src/routes/api/v1/destinations/handlers.ts
@@ -18,6 +18,7 @@ import type {
 	Proxy,
 	SaveDestinationSettings
 } from './types';
+import { removeService } from '../../../../lib/services/common';

 export async function listDestinations(request: FastifyRequest<ListDestinations>) {
 	try {
@@ -143,6 +144,35 @@ export async function newDestination(request: FastifyRequest<NewDestination>, re
 		return errorHandler({ status, message });
 	}
 }
+export async function forceDeleteDestination(request: FastifyRequest<OnlyId>) {
+	try {
+		const { id } = request.params;
+		const services = await prisma.service.findMany({ where: { destinationDockerId: id } });
+		for (const service of services) {
+			await removeService({ id: service.id });
+		}
+		const applications = await prisma.application.findMany({ where: { destinationDockerId: id } });
+		for (const application of applications) {
+			await prisma.applicationSettings.deleteMany({ where: { application: { id: application.id } } });
+			await prisma.buildLog.deleteMany({ where: { applicationId: application.id } });
+			await prisma.build.deleteMany({ where: { applicationId: application.id } });
+			await prisma.secret.deleteMany({ where: { applicationId: application.id } });
+			await prisma.applicationPersistentStorage.deleteMany({ where: { applicationId: application.id } });
+			await prisma.applicationConnectedDatabase.deleteMany({ where: { applicationId: application.id } });
+			await prisma.previewApplication.deleteMany({ where: { applicationId: application.id } });
+		}
+		const databases = await prisma.database.findMany({ where: { destinationDockerId: id } });
+		for (const database of databases) {
+			await prisma.databaseSettings.deleteMany({ where: { databaseId: database.id } });
+			await prisma.databaseSecret.deleteMany({ where: { databaseId: database.id } });
+			await prisma.database.delete({ where: { id: database.id } });
+		}
+		await prisma.destinationDocker.delete({ where: { id } });
+		return {};
+	} catch ({ status, message }) {
+		return errorHandler({ status, message });
+	}
+}
 export async function deleteDestination(request: FastifyRequest<OnlyId>) {
 	try {
 		const { id } = request.params;
@@ -318,6 +348,7 @@ export async function verifyRemoteDockerEngineFn(id: string) {
 		}
 		await prisma.destinationDocker.update({ where: { id }, data: { remoteVerified: true } });
 	} catch (error) {
+		console.log(error)
 		throw new Error('Error while verifying remote docker engine');
 	}
 }
--- a/apps/api/src/routes/api/v1/destinations/index.ts
+++ b/apps/api/src/routes/api/v1/destinations/index.ts
@@ -1,5 +1,5 @@
 import { FastifyPluginAsync } from 'fastify';
-import { assignSSHKey, checkDestination, deleteDestination, getDestination, getDestinationStatus, listDestinations, newDestination, restartProxy, saveDestinationSettings, startProxy, stopProxy, verifyRemoteDockerEngine } from './handlers';
+import { assignSSHKey, checkDestination, deleteDestination, forceDeleteDestination, getDestination, getDestinationStatus, listDestinations, newDestination, restartProxy, saveDestinationSettings, startProxy, stopProxy, verifyRemoteDockerEngine } from './handlers';

 import type { OnlyId } from '../../../../types';
 import type { CheckDestination, ListDestinations, NewDestination, Proxy, SaveDestinationSettings } from './types';
@@ -14,6 +14,7 @@ const root: FastifyPluginAsync = async (fastify): Promise<void> => {
    fastify.get<OnlyId>('/:id', async (request) => await getDestination(request));
    fastify.post<NewDestination>('/:id', async (request, reply) => await newDestination(request, reply));
    fastify.delete<OnlyId>('/:id', async (request) => await deleteDestination(request));
+    fastify.delete<OnlyId>('/:id/force', async (request) => await forceDeleteDestination(request));
    fastify.get<OnlyId>('/:id/status', async (request) => await getDestinationStatus(request));

    fastify.post<SaveDestinationSettings>('/:id/settings', async (request) => await saveDestinationSettings(request));
--- a/apps/api/src/routes/api/v1/handlers.ts
+++ b/apps/api/src/routes/api/v1/handlers.ts
@@ -12,7 +12,6 @@ import {
 	prisma,
 	uniqueName,
 	version,
-	sentryDSN,
 	executeCommand
 } from '../../../lib/common';
 import { scheduler } from '../../../lib/scheduler';
@@ -164,7 +163,7 @@ export async function update(request: FastifyRequest<Update>) {
 				await executeCommand({ command: `docker pull ${image}` });
 			}

-			await executeCommand({ shell: true, command: `env | grep COOLIFY > .env` });
+			await executeCommand({ shell: true, command: `ls .env || env | grep COOLIFY > .env` });
 			await executeCommand({
 				command: `sed -i '/COOLIFY_AUTO_UPDATE=/cCOOLIFY_AUTO_UPDATE=${isAutoUpdateEnabled}' .env`
 			});
@@ -452,7 +451,6 @@ export async function getCurrentUser(request: FastifyRequest<GetCurrentUser>, fa
 	});
 	return {
 		settings: await prisma.setting.findUnique({ where: { id: '0' } }),
-		sentryDSN,
 		pendingInvitations,
 		token,
 		...request.user
--- a/apps/api/src/routes/api/v1/services/handlers.ts
+++ b/apps/api/src/routes/api/v1/services/handlers.ts
@@ -412,22 +412,23 @@ export async function saveServiceType(
 			if (foundTemplate.variables) {
 				if (foundTemplate.variables.length > 0) {
 					for (const variable of foundTemplate.variables) {
-						const { defaultValue } = variable;
+						let { defaultValue } = variable;
+						defaultValue = defaultValue.toString();
 						const regex = /^\$\$.*\((\d+)\)$/g;
 						const length = Number(regex.exec(defaultValue)?.[1]) || undefined;
-						if (variable.defaultValue.startsWith('$$generate_password')) {
+						if (defaultValue.startsWith('$$generate_password')) {
 							variable.value = generatePassword({ length });
-						} else if (variable.defaultValue.startsWith('$$generate_hex')) {
+						} else if (defaultValue.startsWith('$$generate_hex')) {
 							variable.value = generatePassword({ length, isHex: true });
-						} else if (variable.defaultValue.startsWith('$$generate_username')) {
+						} else if (defaultValue.startsWith('$$generate_username')) {
 							variable.value = cuid();
-						} else if (variable.defaultValue.startsWith('$$generate_token')) {
+						} else if (defaultValue.startsWith('$$generate_token')) {
 							variable.value = generateToken();
 						} else {
-							variable.value = variable.defaultValue || '';
+							variable.value = defaultValue || '';
 						}
 						const foundVariableSomewhereElse = foundTemplate.variables.find((v) =>
-							v.defaultValue.includes(variable.id)
+							v.defaultValue.toString().includes(variable.id)
 						);
 						if (foundVariableSomewhereElse) {
 							foundVariableSomewhereElse.value = foundVariableSomewhereElse.value.replaceAll(
@@ -746,7 +747,10 @@ export async function saveService(request: FastifyRequest<SaveService>, reply: F
 			let { id: settingId, name, value, changed = false, isNew = false, variableName } = setting;
 			if (value) {
 				if (changed) {
-					await prisma.serviceSetting.update({ where: { id: settingId }, data: { value: value.replace(/\n/, "\\n") } });
+					await prisma.serviceSetting.update({
+						where: { id: settingId },
+						data: { value: value.replace(/\n/, '\\n') }
+					});
 				}
 				if (isNew) {
 					if (!variableName) {
@@ -1101,14 +1105,17 @@ export async function activateWordpressFtp(
 							shell: true
 						});
 					}
-				} catch (error) { }
+				} catch (error) {}
 				const volumes = [
 					`${id}-wordpress-data:/home/${ftpUser}/wordpress`,
-					`${isDev ? hostkeyDir : '/var/lib/docker/volumes/coolify-ssl-certs/_data/hostkeys'
+					`${
+						isDev ? hostkeyDir : '/var/lib/docker/volumes/coolify-ssl-certs/_data/hostkeys'
 					}/${id}.ed25519:/etc/ssh/ssh_host_ed25519_key`,
-					`${isDev ? hostkeyDir : '/var/lib/docker/volumes/coolify-ssl-certs/_data/hostkeys'
+					`${
+						isDev ? hostkeyDir : '/var/lib/docker/volumes/coolify-ssl-certs/_data/hostkeys'
 					}/${id}.rsa:/etc/ssh/ssh_host_rsa_key`,
-					`${isDev ? hostkeyDir : '/var/lib/docker/volumes/coolify-ssl-certs/_data/hostkeys'
+					`${
+						isDev ? hostkeyDir : '/var/lib/docker/volumes/coolify-ssl-certs/_data/hostkeys'
 					}/${id}.sh:/etc/sftp.d/chmod.sh`
 				];

@@ -1178,6 +1185,6 @@ export async function activateWordpressFtp(
 			await executeCommand({
 				command: `rm -fr ${hostkeyDir}/${id}-docker-compose.yml ${hostkeyDir}/${id}.ed25519 ${hostkeyDir}/${id}.ed25519.pub ${hostkeyDir}/${id}.rsa ${hostkeyDir}/${id}.rsa.pub ${hostkeyDir}/${id}.sh`
 			});
-		} catch (error) { }
+		} catch (error) {}
 	}
 }
--- a/apps/api/src/routes/api/v1/settings/handlers.ts
+++ b/apps/api/src/routes/api/v1/settings/handlers.ts
@@ -1,235 +1,312 @@
 import { promises as dns } from 'dns';
 import { X509Certificate } from 'node:crypto';
-import * as Sentry from '@sentry/node';
 import type { FastifyReply, FastifyRequest } from 'fastify';
-import { checkDomainsIsValidInDNS, decrypt, encrypt, errorHandler, executeCommand, getDomain, isDev, isDNSValid, isDomainConfigured, listSettings, prisma, sentryDSN, version } from '../../../../lib/common';
-import { AddDefaultRegistry, CheckDNS, CheckDomain, DeleteDomain, OnlyIdInBody, SaveSettings, SaveSSHKey, SetDefaultRegistry } from './types';
-
+import {
+	checkDomainsIsValidInDNS,
+	decrypt,
+	encrypt,
+	errorHandler,
+	executeCommand,
+	getDomain,
+	isDev,
+	isDNSValid,
+	isDomainConfigured,
+	listSettings,
+	prisma
+} from '../../../../lib/common';
+import {
+	AddDefaultRegistry,
+	CheckDNS,
+	CheckDomain,
+	DeleteDomain,
+	OnlyIdInBody,
+	SaveSettings,
+	SaveSSHKey,
+	SetDefaultRegistry
+} from './types';

 export async function listAllSettings(request: FastifyRequest) {
-    try {
-        const teamId = request.user.teamId;
-        const settings = await listSettings();
-        const sshKeys = await prisma.sshKey.findMany({ where: { team: { id: teamId } } })
-        let registries = await prisma.dockerRegistry.findMany({ where: { team: { id: teamId } } })
-        registries = registries.map((registry) => {
-            if (registry.password) {
-                registry.password = decrypt(registry.password)
-            }
-            return registry
-        })
-        const unencryptedKeys = []
-        if (sshKeys.length > 0) {
-            for (const key of sshKeys) {
-                unencryptedKeys.push({ id: key.id, name: key.name, privateKey: decrypt(key.privateKey), createdAt: key.createdAt })
-            }
-        }
-        const certificates = await prisma.certificate.findMany({ where: { team: { id: teamId } } })
-        let cns = [];
-        for (const certificate of certificates) {
-            const x509 = new X509Certificate(certificate.cert);
-            cns.push({ commonName: x509.subject.split('\n').find((s) => s.startsWith('CN=')).replace('CN=', ''), id: certificate.id, createdAt: certificate.createdAt })
-        }
+	try {
+		const teamId = request.user.teamId;
+		const settings = await listSettings();
+		const sshKeys = await prisma.sshKey.findMany({ where: { team: { id: teamId } } });
+		let registries = await prisma.dockerRegistry.findMany({ where: { team: { id: teamId } } });
+		registries = registries.map((registry) => {
+			if (registry.password) {
+				registry.password = decrypt(registry.password);
+			}
+			return registry;
+		});
+		const unencryptedKeys = [];
+		if (sshKeys.length > 0) {
+			for (const key of sshKeys) {
+				unencryptedKeys.push({
+					id: key.id,
+					name: key.name,
+					privateKey: decrypt(key.privateKey),
+					createdAt: key.createdAt
+				});
+			}
+		}
+		const certificates = await prisma.certificate.findMany({ where: { team: { id: teamId } } });
+		let cns = [];
+		for (const certificate of certificates) {
+			const x509 = new X509Certificate(certificate.cert);
+			cns.push({
+				commonName: x509.subject
+					.split('\n')
+					.find((s) => s.startsWith('CN='))
+					.replace('CN=', ''),
+				id: certificate.id,
+				createdAt: certificate.createdAt
+			});
+		}

-        return {
-            settings,
-            certificates: cns,
-            sshKeys: unencryptedKeys,
-            registries
-        }
-    } catch ({ status, message }) {
-        return errorHandler({ status, message })
-    }
+		return {
+			settings,
+			certificates: cns,
+			sshKeys: unencryptedKeys,
+			registries
+		};
+	} catch ({ status, message }) {
+		return errorHandler({ status, message });
+	}
 }
 export async function saveSettings(request: FastifyRequest<SaveSettings>, reply: FastifyReply) {
-    try {
-        let {
-            previewSeparator,
-            numberOfDockerImagesKeptLocally,
-            doNotTrack,
-            fqdn,
-            isAPIDebuggingEnabled,
-            isRegistrationEnabled,
-            dualCerts,
-            minPort,
-            maxPort,
-            isAutoUpdateEnabled,
-            isDNSCheckEnabled,
-            DNSServers,
-            proxyDefaultRedirect
-        } = request.body
-        const { id, previewSeparator: SetPreviewSeparator } = await listSettings();
-        if (numberOfDockerImagesKeptLocally) {
-            numberOfDockerImagesKeptLocally = Number(numberOfDockerImagesKeptLocally)
-        }
-        if (previewSeparator == '') {
-            previewSeparator = '.'
-        }
-        if (SetPreviewSeparator != previewSeparator) {
-            const applications = await prisma.application.findMany({ where: { previewApplication: { some: { id: { not: undefined } } } }, include: { previewApplication: true } })
-            for (const application of applications) {
-                for (const preview of application.previewApplication) {
-                    const { protocol } = new URL(preview.customDomain)
-                    const { pullmergeRequestId } = preview
-                    const { fqdn } = application
-                    const newPreviewDomain = `${protocol}//${pullmergeRequestId}${previewSeparator}${getDomain(fqdn)}`
-                    await prisma.previewApplication.update({ where: { id: preview.id }, data: { customDomain: newPreviewDomain } })
-                }
-            }
-        }
+	try {
+		let {
+			previewSeparator,
+			numberOfDockerImagesKeptLocally,
+			doNotTrack,
+			fqdn,
+			isAPIDebuggingEnabled,
+			isRegistrationEnabled,
+			dualCerts,
+			minPort,
+			maxPort,
+			isAutoUpdateEnabled,
+			isDNSCheckEnabled,
+			DNSServers,
+			proxyDefaultRedirect
+		} = request.body;
+		const { id, previewSeparator: SetPreviewSeparator } = await listSettings();
+		if (numberOfDockerImagesKeptLocally) {
+			numberOfDockerImagesKeptLocally = Number(numberOfDockerImagesKeptLocally);
+		}
+		if (previewSeparator == '') {
+			previewSeparator = '.';
+		}
+		if (SetPreviewSeparator != previewSeparator) {
+			const applications = await prisma.application.findMany({
+				where: { previewApplication: { some: { id: { not: undefined } } } },
+				include: { previewApplication: true }
+			});
+			for (const application of applications) {
+				for (const preview of application.previewApplication) {
+					const { protocol } = new URL(preview.customDomain);
+					const { pullmergeRequestId } = preview;
+					const { fqdn } = application;
+					const newPreviewDomain = `${protocol}//${pullmergeRequestId}${previewSeparator}${getDomain(
+						fqdn
+					)}`;
+					await prisma.previewApplication.update({
+						where: { id: preview.id },
+						data: { customDomain: newPreviewDomain }
+					});
+				}
+			}
+		}

-        await prisma.setting.update({
-            where: { id },
-            data: { previewSeparator, numberOfDockerImagesKeptLocally, doNotTrack, isRegistrationEnabled, dualCerts, isAutoUpdateEnabled, isDNSCheckEnabled, DNSServers, isAPIDebuggingEnabled }
-        });
-        if (fqdn) {
-            await prisma.setting.update({ where: { id }, data: { fqdn } });
-        }
-        await prisma.setting.update({ where: { id }, data: { proxyDefaultRedirect } });
-        if (minPort && maxPort) {
-            await prisma.setting.update({ where: { id }, data: { minPort, maxPort } });
-        }
-        if (doNotTrack === false) {
-            // Sentry.init({
-            //     dsn: sentryDSN,
-            //     environment: isDev ? 'development' : 'production',
-            //     release: version
-            // });
-            // console.log('Sentry initialized')
-        }
-        return reply.code(201).send()
-    } catch ({ status, message }) {
-        return errorHandler({ status, message })
-    }
+		await prisma.setting.update({
+			where: { id },
+			data: {
+				previewSeparator,
+				numberOfDockerImagesKeptLocally,
+				doNotTrack,
+				isRegistrationEnabled,
+				dualCerts,
+				isAutoUpdateEnabled,
+				isDNSCheckEnabled,
+				DNSServers,
+				isAPIDebuggingEnabled
+			}
+		});
+		if (fqdn) {
+			await prisma.setting.update({ where: { id }, data: { fqdn } });
+		}
+		await prisma.setting.update({ where: { id }, data: { proxyDefaultRedirect } });
+		if (minPort && maxPort) {
+			await prisma.setting.update({ where: { id }, data: { minPort, maxPort } });
+		}
+		if (doNotTrack === false) {
+			// Sentry.init({
+			//     dsn: sentryDSN,
+			//     environment: isDev ? 'development' : 'production',
+			//     release: version
+			// });
+			// console.log('Sentry initialized')
+		}
+		return reply.code(201).send();
+	} catch ({ status, message }) {
+		return errorHandler({ status, message });
+	}
 }
 export async function deleteDomain(request: FastifyRequest<DeleteDomain>, reply: FastifyReply) {
-    try {
-        const { fqdn } = request.body
-        const { DNSServers } = await listSettings();
-        if (DNSServers) {
-            dns.setServers([...DNSServers.split(',')]);
-        }
-        let ip;
-        try {
-            ip = await dns.resolve(fqdn);
-        } catch (error) {
-            // Do not care.
-        }
-        await prisma.setting.update({ where: { fqdn }, data: { fqdn: null } });
-        return reply.redirect(302, ip ? `http://${ip[0]}:3000/settings` : undefined)
-    } catch ({ status, message }) {
-        return errorHandler({ status, message })
-    }
+	try {
+		const { fqdn } = request.body;
+		const { DNSServers } = await listSettings();
+		if (DNSServers) {
+			dns.setServers([...DNSServers.split(',')]);
+		}
+		let ip;
+		try {
+			ip = await dns.resolve(fqdn);
+		} catch (error) {
+			// Do not care.
+		}
+		await prisma.setting.update({ where: { fqdn }, data: { fqdn: null } });
+		return reply.redirect(302, ip ? `http://${ip[0]}:3000/settings` : undefined);
+	} catch ({ status, message }) {
+		return errorHandler({ status, message });
+	}
 }

 export async function checkDomain(request: FastifyRequest<CheckDomain>) {
-    try {
-        const { id } = request.params;
-        let { fqdn, forceSave, dualCerts, isDNSCheckEnabled } = request.body
-        if (fqdn) fqdn = fqdn.toLowerCase();
-        const found = await isDomainConfigured({ id, fqdn });
-        if (found) {
-            throw { message: "Domain already configured" };
-        }
-        if (isDNSCheckEnabled && !forceSave && !isDev) {
-            const hostname = request.hostname.split(':')[0]
-            return await checkDomainsIsValidInDNS({ hostname, fqdn, dualCerts });
-        }
-        return {};
-    } catch ({ status, message }) {
-        return errorHandler({ status, message })
-    }
+	try {
+		const { id } = request.params;
+		let { fqdn, forceSave, dualCerts, isDNSCheckEnabled } = request.body;
+		if (fqdn) fqdn = fqdn.toLowerCase();
+		const found = await isDomainConfigured({ id, fqdn });
+		if (found) {
+			throw { message: 'Domain already configured' };
+		}
+		if (isDNSCheckEnabled && !forceSave && !isDev) {
+			const hostname = request.hostname.split(':')[0];
+			return await checkDomainsIsValidInDNS({ hostname, fqdn, dualCerts });
+		}
+		return {};
+	} catch ({ status, message }) {
+		return errorHandler({ status, message });
+	}
 }
 export async function checkDNS(request: FastifyRequest<CheckDNS>) {
-    try {
-        const { domain } = request.params;
-        await isDNSValid(request.hostname, domain);
-        return {}
-    } catch ({ status, message }) {
-        return errorHandler({ status, message })
-    }
+	try {
+		const { domain } = request.params;
+		await isDNSValid(request.hostname, domain);
+		return {};
+	} catch ({ status, message }) {
+		return errorHandler({ status, message });
+	}
 }

 export async function saveSSHKey(request: FastifyRequest<SaveSSHKey>, reply: FastifyReply) {
-    try {
-        const teamId = request.user.teamId;
-        const { privateKey, name } = request.body;
-        const found = await prisma.sshKey.findMany({ where: { name } })
-        if (found.length > 0) {
-            throw {
-                message: "Name already used. Choose another one please."
-            }
-        }
-        const encryptedSSHKey = encrypt(privateKey)
-        await prisma.sshKey.create({ data: { name, privateKey: encryptedSSHKey, team: { connect: { id: teamId } } } })
-        return reply.code(201).send()
-    } catch ({ status, message }) {
-        return errorHandler({ status, message })
-    }
+	try {
+		const teamId = request.user.teamId;
+		const { privateKey, name } = request.body;
+		const found = await prisma.sshKey.findMany({ where: { name } });
+		if (found.length > 0) {
+			throw {
+				message: 'Name already used. Choose another one please.'
+			};
+		}
+		const encryptedSSHKey = encrypt(privateKey);
+		await prisma.sshKey.create({
+			data: { name, privateKey: encryptedSSHKey, team: { connect: { id: teamId } } }
+		});
+		return reply.code(201).send();
+	} catch ({ status, message }) {
+		return errorHandler({ status, message });
+	}
 }
 export async function deleteSSHKey(request: FastifyRequest<OnlyIdInBody>, reply: FastifyReply) {
-    try {
-        const teamId = request.user.teamId;
-        const { id } = request.body;
-        await prisma.sshKey.deleteMany({ where: { id, teamId } })
-        return reply.code(201).send()
-    } catch ({ status, message }) {
-        return errorHandler({ status, message })
-    }
+	try {
+		const teamId = request.user.teamId;
+		const { id } = request.body;
+		await prisma.sshKey.deleteMany({ where: { id, teamId } });
+		return reply.code(201).send();
+	} catch ({ status, message }) {
+		return errorHandler({ status, message });
+	}
 }

-export async function deleteCertificates(request: FastifyRequest<OnlyIdInBody>, reply: FastifyReply) {
-    try {
-        const teamId = request.user.teamId;
-        const { id } = request.body;
-        await executeCommand({ command: `docker exec coolify-proxy sh -c 'rm -f /etc/traefik/acme/custom/${id}-key.pem /etc/traefik/acme/custom/${id}-cert.pem'`, shell: true })
-        await prisma.certificate.deleteMany({ where: { id, teamId } })
-        return reply.code(201).send()
-    } catch ({ status, message }) {
-        return errorHandler({ status, message })
-    }
+export async function deleteCertificates(
+	request: FastifyRequest<OnlyIdInBody>,
+	reply: FastifyReply
+) {
+	try {
+		const teamId = request.user.teamId;
+		const { id } = request.body;
+		await executeCommand({
+			command: `docker exec coolify-proxy sh -c 'rm -f /etc/traefik/acme/custom/${id}-key.pem /etc/traefik/acme/custom/${id}-cert.pem'`,
+			shell: true
+		});
+		await prisma.certificate.deleteMany({ where: { id, teamId } });
+		return reply.code(201).send();
+	} catch ({ status, message }) {
+		return errorHandler({ status, message });
+	}
 }

-export async function setDockerRegistry(request: FastifyRequest<SetDefaultRegistry>, reply: FastifyReply) {
-    try {
-        const teamId = request.user.teamId;
-        const { id, username, password } = request.body;
+export async function setDockerRegistry(
+	request: FastifyRequest<SetDefaultRegistry>,
+	reply: FastifyReply
+) {
+	try {
+		const teamId = request.user.teamId;
+		const { id, username, password } = request.body;

-        let encryptedPassword = ''
-        if (password) encryptedPassword = encrypt(password)
+		let encryptedPassword = '';
+		if (password) encryptedPassword = encrypt(password);

-        if (teamId === '0') {
-            await prisma.dockerRegistry.update({ where: { id }, data: { username, password: encryptedPassword } })
-        } else {
-            await prisma.dockerRegistry.updateMany({ where: { id, teamId }, data: { username, password: encryptedPassword } })
-        }
-        return reply.code(201).send()
-    } catch ({ status, message }) {
-        return errorHandler({ status, message })
-    }
+		if (teamId === '0') {
+			await prisma.dockerRegistry.update({
+				where: { id },
+				data: { username, password: encryptedPassword }
+			});
+		} else {
+			await prisma.dockerRegistry.updateMany({
+				where: { id, teamId },
+				data: { username, password: encryptedPassword }
+			});
+		}
+		return reply.code(201).send();
+	} catch ({ status, message }) {
+		return errorHandler({ status, message });
+	}
 }
-export async function addDockerRegistry(request: FastifyRequest<AddDefaultRegistry>, reply: FastifyReply) {
-    try {
-        const teamId = request.user.teamId;
-        const { name, url, username, password } = request.body;
+export async function addDockerRegistry(
+	request: FastifyRequest<AddDefaultRegistry>,
+	reply: FastifyReply
+) {
+	try {
+		const teamId = request.user.teamId;
+		const { name, url, username, password } = request.body;

-        let encryptedPassword = ''
-        if (password) encryptedPassword = encrypt(password)
-        await prisma.dockerRegistry.create({ data: { name, url, username, password: encryptedPassword, team: { connect: { id: teamId } } } })
+		let encryptedPassword = '';
+		if (password) encryptedPassword = encrypt(password);
+		await prisma.dockerRegistry.create({
+			data: { name, url, username, password: encryptedPassword, team: { connect: { id: teamId } } }
+		});

-        return reply.code(201).send()
-    } catch ({ status, message }) {
-        return errorHandler({ status, message })
-    }
+		return reply.code(201).send();
+	} catch ({ status, message }) {
+		return errorHandler({ status, message });
+	}
+}
+export async function deleteDockerRegistry(
+	request: FastifyRequest<OnlyIdInBody>,
+	reply: FastifyReply
+) {
+	try {
+		const teamId = request.user.teamId;
+		const { id } = request.body;
+		await prisma.application.updateMany({
+			where: { dockerRegistryId: id },
+			data: { dockerRegistryId: null }
+		});
+		await prisma.dockerRegistry.deleteMany({ where: { id, teamId } });
+		return reply.code(201).send();
+	} catch ({ status, message }) {
+		return errorHandler({ status, message });
+	}
 }
-export async function deleteDockerRegistry(request: FastifyRequest<OnlyIdInBody>, reply: FastifyReply) {
-    try {
-        const teamId = request.user.teamId;
-        const { id } = request.body;
-        await prisma.application.updateMany({ where: { dockerRegistryId: id }, data: { dockerRegistryId: null } })
-        await prisma.dockerRegistry.deleteMany({ where: { id, teamId } })
-        return reply.code(201).send()
-    } catch ({ status, message }) {
-        return errorHandler({ status, message })
-    }
-}
--- a/apps/api/templates.json
+++ b/apps/api/templates.json
--- a/apps/ui/package.json
+++ b/apps/ui/package.json
@@ -42,8 +42,6 @@
 	},
 	"type": "module",
 	"dependencies": {
-		"@sentry/svelte": "7.21.1",
-		"@sentry/tracing": "7.21.1",
 		"@sveltejs/adapter-static": "1.0.0-next.48",
 		"@tailwindcss/typography": "0.5.8",
 		"cuid": "2.1.8",
--- a/apps/ui/src/hooks.ts
+++ b/apps/ui/src/hooks.ts
@@ -1,13 +1,10 @@
-import * as Sentry from '@sentry/svelte';
 export async function handle({ event, resolve }) {
-    const response = await resolve(event, { ssr: false });
-    return response;
+	const response = await resolve(event, { ssr: false });
+	return response;
 }
 export const handleError = ({ error, event }) => {
-    Sentry.captureException(error, { event });
-
-    return {
-        message: 'Whoops!',
-        code: error?.code ?? 'UNKNOWN'
-    };
-};
+	return {
+		message: 'Whoops!',
+		code: error?.code ?? 'UNKNOWN'
+	};
+};
--- a/apps/ui/src/routes/__layout.svelte
+++ b/apps/ui/src/routes/__layout.svelte
@@ -65,7 +65,6 @@

 <script lang="ts">
 	export let settings: any;
-	export let sentryDSN: any;
 	export let baseSettings: any;
 	export let pendingInvitations: any = 0;

@@ -98,10 +97,6 @@
 	import Toasts from '$lib/components/Toasts.svelte';
 	import Tooltip from '$lib/components/Tooltip.svelte';
 	import { onMount } from 'svelte';
-	import LocalePicker from '$lib/components/LocalePicker.svelte';
-	import * as Sentry from '@sentry/svelte';
-	import { BrowserTracing } from '@sentry/tracing';
-	import { dev } from '$app/env';

 	if (userId) $appSession.userId = userId;
 	if (teamId) $appSession.teamId = teamId;
@@ -293,7 +288,7 @@
 						</a>
 						<a
 							id="documentation"
-							href="https://docs.coollabs.io/coolify/"
+							href="https://docs.coollabs.io/coolify-v3/"
 							target="_blank"
 							rel="noreferrer external"
 							class="icons hover:text-info"
@@ -384,7 +379,7 @@
 	</div>
 	<div class="drawer-side">
 		<label for="main-drawer" class="drawer-overlay w-full" />
-		<ul class="menu bg-coolgray-200 w-60 p-2  space-y-3 pt-4 ">
+		<ul class="menu bg-coolgray-200 w-60 p-2 space-y-3 pt-4">
 			<li>
 				<a
 					class="no-underline icons hover:text-white hover:bg-pink-500"
@@ -498,7 +493,7 @@
 			<li>
 				<a
 					class="no-underline icons hover:text-white hover:bg-info"
-					href="https://docs.coollabs.io/coolify/"
+					href="https://docs.coollabs.io/coolify-v3/"
 					target="_blank"
 					rel="noreferrer external"
 				>
--- a/apps/ui/src/routes/applications/[id]/configuration/source.svelte
+++ b/apps/ui/src/routes/applications/[id]/configuration/source.svelte
@@ -255,12 +255,12 @@
 	{/if}
 	<div class="flex flex-row items-center">
 		<div class="title py-4 pr-4">Public Repository from Git</div>
-		<DocLink url="https://docs.coollabs.io/coolify/applications/#public-repository-from-git" />
+		<DocLink url="https://docs.coollabs.io/coolify-v3/applications/#public-repository-from-git" />
 	</div>
 	<PublicRepository />
 	<div class="flex flex-row items-center pt-10">
 		<div class="title py-4 pr-4">Simple Dockerfile <Beta /></div>
-		<DocLink url="https://docs.coollabs.io/coolify/applications/#dockerfile" />
+		<DocLink url="https://docs.coollabs.io/coolify-v3/applications/#dockerfile" />
 	</div>
 	<div class="mx-auto max-w-screen-2xl">
 		<form class="flex flex-col" on:submit|preventDefault={handleDockerImage}>
--- a/apps/ui/src/routes/applications/[id]/logs/index.svelte
+++ b/apps/ui/src/routes/applications/[id]/logs/index.svelte
@@ -51,16 +51,22 @@
 	async function loadLogs() {
 		if (logsLoading) return;
 		try {
-			const newLogs: any = await get(
-				`/applications/${id}/logs/${selectedService}?since=${lastLog?.split(' ')[0] || 0}`
-			);
+			const since = lastLog?.split(' ')[0] || 0;
+			const newLogs: any = await get(`/applications/${id}/logs/${selectedService}?since=${since}`);
 			if (newLogs.noContainer) {
 				noContainer = true;
 			} else {
 				noContainer = false;
 			}
 			if (newLogs?.logs && newLogs.logs[newLogs.logs.length - 1] !== logs[logs.length - 1]) {
-				logs = logs.concat(newLogs.logs);
+				if (since === 0) {
+					logs = logs.concat(newLogs.logs);
+				} else {
+					const newParsedLogs = newLogs.logs.filter((log: any) => {
+						return log !== logs[logs.length - 1];
+					});
+					logs = logs.concat(newParsedLogs);
+				}
 				lastLog = newLogs.logs[newLogs.logs.length - 1];
 			}
 		} catch (error) {
@@ -135,7 +141,7 @@
 		{:else}
 			<div class="relative w-full">
 				<div class="flex justify-start sticky space-x-2 pb-2">
-					<button on:click={followBuild} class="btn btn-sm " class:bg-coollabs={followingLogs}>
+					<button on:click={followBuild} class="btn btn-sm" class:bg-coollabs={followingLogs}>
 						<svg
 							xmlns="http://www.w3.org/2000/svg"
 							class="w-6 h-6 mr-2"
--- a/apps/ui/src/routes/destinations/[id]/_NewRemoteDocker.svelte
+++ b/apps/ui/src/routes/destinations/[id]/_NewRemoteDocker.svelte
@@ -34,14 +34,20 @@
 		customClass="max-w-[32rem]"
 		text="Remote Docker Engines are using <span class='text-white font-bold'>SSH</span> to communicate with the remote docker engine. 
        You need to setup an <span class='text-white font-bold'>SSH key</span> in advance on the server and install Docker. 
-        <br>See <a class='text-white' href='https://docs.coollabs.io/coolify/destinations#remote-docker-engine' target='blank'>docs</a> for more details."
+        <br>See <a class='text-white' href='https://docs.coollabs.io-v3/coolify/destinations#remote-docker-engine' target='blank'>docs</a> for more details."
 	/>
 </div>
 <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-start lg:items-center space-x-0 lg:space-x-4 pb-5 flex-col lg:flex-row space-y-4 lg:space-y-0">
+		<div
+			class="flex items-start lg:items-center space-x-0 lg:space-x-4 pb-5 flex-col lg:flex-row space-y-4 lg:space-y-0"
+		>
 			<div class="title font-bold">{$t('forms.configuration')}</div>
-			<button type="submit" class="btn btn-sm bg-destinations w-full lg:w-fit" class:loading disabled={loading}
+			<button
+				type="submit"
+				class="btn btn-sm bg-destinations w-full lg:w-fit"
+				class:loading
+				disabled={loading}
 				>{loading
 					? payload.isCoolifyProxyUsed
 						? $t('destination.new.saving_and_configuring_proxy')
--- a/apps/ui/src/routes/destinations/[id]/__layout.svelte
+++ b/apps/ui/src/routes/destinations/[id]/__layout.svelte
@@ -75,6 +75,25 @@
 			}
 		}
 	}
+	async function forceDeleteDestination(destination: any) {
+		let sure = confirm($t('application.confirm_to_delete', { name: destination.name }));
+		if (sure) {
+			sure = confirm(
+				'Are you REALLY sure? This will delete all resources associated with this destination, but not on the destination (server) itself. You will have manually delete everything on the server afterwards.'
+			);
+			if (sure) {
+				sure = confirm('REALLY?');
+				if (sure) {
+					try {
+						await del(`/destinations/${destination.id}/force`, { id: destination.id });
+						return await goto('/', { replaceState: true });
+					} catch (error) {
+						return errorNotification(error);
+					}
+				}
+			}
+		}
+	}
 	function deletable() {
 		if (!isDestinationDeletable) {
 			return 'Please delete all resources before deleting this.';
@@ -88,7 +107,7 @@
 </script>

 {#if $page.params.id !== 'new'}
-	<nav class="header lg:flex-row flex-col-reverse">
+	<nav class="header lg:flex-row flex-col-reverse gap-2">
 		<div class="flex flex-row space-x-2 font-bold pt-10 lg:pt-0">
 			<div class="flex flex-col items-center justify-center title">
 				{#if $page.url.pathname === `/destinations/${$page.params.id}`}
@@ -111,6 +130,16 @@
 			>
 			<Tooltip triggeredBy="#delete">{deletable()}</Tooltip>
 		</div>
+		<div class="flex flex-row flex-wrap justify-center lg:justify-start lg:py-0 items-center">
+			<button
+				id="forceDelete"
+				on:click={() => forceDeleteDestination(destination)}
+				type="submit"
+				disabled={!$appSession.isAdmin && isDestinationDeletable}
+				class="icons bg-transparent text-sm text-red-500"><DeleteIcon /></button
+			>
+			<Tooltip triggeredBy="#forceDelete">Force Delete</Tooltip>
+		</div>
 	</nav>
 {/if}
 <slot />
--- a/apps/ui/src/routes/services/[id]/index.svelte
+++ b/apps/ui/src/routes/services/[id]/index.svelte
@@ -43,6 +43,7 @@
 			return true;
 		}
 	});
+	let customVersion: string;
 	$: isDisabled =
 		!$appSession.isAdmin ||
 		$status.service.overallStatus === 'degraded' ||
@@ -111,6 +112,7 @@
 			setLocation(service);
 			forceSave = false;
 			$isDeploymentEnabled = checkIfDeploymentEnabledServices(service);
+			customVersion = null;
 			return addToast({
 				message: 'Configuration saved.',
 				type: 'success'
@@ -196,26 +198,12 @@
 	async function selectTag(event: any) {
 		service.version = event.detail.value;
 	}
+	async function setCustomVersion() {
+		service.version = customVersion;
+	}
 	onMount(async () => {
 		if (browser && window.location.hostname === 'demo.coolify.io' && !service.fqdn) {
 			service.fqdn = `http://${cuid()}.demo.coolify.io`;
-			// if (service.type === 'wordpress') {
-			// 	service.wordpress.mysqlDatabase = 'db';
-			// }
-			// if (service.type === 'plausibleanalytics') {
-			// 	service.plausibleAnalytics.email = 'noreply@demo.com';
-			// 	service.plausibleAnalytics.username = 'admin';
-			// }
-			// if (service.type === 'minio') {
-			// 	service.minio.apiFqdn = `http://${cuid()}.demo.coolify.io`;
-			// }
-			// if (service.type === 'ghost') {
-			// 	service.ghost.mariadbDatabase = 'db';
-			// }
-			// if (service.type === 'fider') {
-			// 	service.fider.emailNoreply = 'noreply@demo.com';
-			// }
-			// await handleSubmit();
 		}
 	});
 </script>
@@ -224,7 +212,7 @@
 	<form id="saveForm" on:submit|preventDefault={handleSubmit}>
 		<div class="mx-auto w-full">
 			<div class="flex flex-row border-b border-coolgray-500 mb-6 space-x-2">
-				<div class="title font-bold pb-3 ">General</div>
+				<div class="title font-bold pb-3">General</div>
 				{#if $appSession.isAdmin}
 					<button
 						type="submit"
@@ -289,6 +277,7 @@
 			</div>
 			<div class="grid grid-cols-2 items-center">
 				<label for="version">Version / Tag</label>
+				<div class="flex gap-2">
 				{#if tags.tags?.length > 0}
 					<div class="custom-select-wrapper w-full">
 						<Select
@@ -303,9 +292,11 @@
 							isClearable={false}
 						/>
 					</div>
-				{:else}
+					{:else}
 					<input class="w-full border-red-500" disabled placeholder="Error getting tags..." />
-				{/if}
+					{/if}
+					<input class="w-full" placeholder="Custom version" on:change={setCustomVersion} bind:value={customVersion} />
+					</div>
 			</div>

 			<div class="grid grid-cols-2 items-center">
--- a/apps/ui/src/routes/sources/[id]/_Gitlab.svelte
+++ b/apps/ui/src/routes/sources/[id]/_Gitlab.svelte
@@ -52,7 +52,7 @@
 					appSecret: source.gitlabApp.appSecret,
 					groupName: source.gitlabApp.groupName,
 					customPort: source.customPort,
-					customUser: source.customUser,
+					customUser: source.customUser
 				});
 				const from = $page.url.searchParams.get('from');
 				if (from) {
@@ -169,8 +169,8 @@
 		<div class="grid grid-flow-row gap-2 lg:px-10">
 			{#if !source.gitlabAppId}
 				<a
-					href="https://docs.coollabs.io/coolify/sources#how-to-integrate-with-gitlab"
-					class="font-bold "
+					href="https://docs.coollabs.io-v3/coolify/sources#how-to-integrate-with-gitlab"
+					class="font-bold"
 					target="_blank noreferrer"
 					rel="noopener noreferrer">Documentation and detailed instructions.</a
 				>
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "coolify",
  "description": "An open-source & self-hostable Heroku / Netlify alternative.",
-  "version": "3.12.30",
+  "version": "3.12.33",
  "license": "Apache-2.0",
  "repository": "github:coollabsio/coolify",
  "scripts": {
@@ -32,7 +32,7 @@
    "build:api": "NODE_ENV=production pnpm run --filter api build",
    "build:ui": "NODE_ENV=production pnpm run --filter ui build",
    "dockerlogin": "echo $DOCKER_PASS | docker login --username=$DOCKER_USER --password-stdin",
-    "release:staging:amd": "docker build -t ghcr.io/coollabsio/coolify:next . && docker push ghcr.io/coollabsio/coolify:next",
+    "release:staging:amd": "docker build -t ghcr.io/coollabsio/coolify:v3 . && docker push ghcr.io/coollabsio/coolify:v3",
    "release:local": "rm -fr ./local-serve && mkdir ./local-serve && pnpm build && cp -Rp apps/api/build/* ./local-serve && cp -Rp apps/ui/build/ ./local-serve/public && cp -Rp apps/api/prisma/ ./local-serve/prisma && cp -Rp apps/api/package.json ./local-serve && env | grep '^COOLIFY_' > ./local-serve/.env && cd ./local-serve && pnpm install . && pnpm start"
  },
  "devDependencies": {
@@ -50,4 +50,4 @@
    "open-source",
    "coolify"
  ]
-}
+}
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
Author	SHA1	Message	Date
Andras Bacsai	5cb0bcfd9b	fix: increase query time for new services etc	2023-07-18 09:50:05 +02:00
Andras Bacsai	3ba44a1e23	backup db file	2023-07-17 15:17:18 +02:00
Andras Bacsai	de4efbb555	update GH actions	2023-07-17 14:36:33 +02:00
Andras Bacsai	6f443680f3	typo	2023-07-17 14:02:51 +02:00
Andras Bacsai	23b22e5ca8	wip: reencrypt everything	2023-07-17 13:50:26 +02:00
Andras Bacsai	1bba747ce5	update	2023-07-15 09:50:29 +02:00
Andras Bacsai	9ebfc6646e	wip	2023-07-14 23:15:43 +02:00
Andras Bacsai	055ff6dbbd	updates	2023-07-14 22:30:40 +02:00
Andras Bacsai	6430e7b288	fix seed	2023-07-14 22:19:52 +02:00
Andras Bacsai	87b0050161	update seed	2023-07-14 22:11:59 +02:00
Andras Bacsai	369d8b408d	version ++	2023-07-14 21:36:28 +02:00
Andras Bacsai	505abc592c	fix: gh actions	2023-07-14 21:33:30 +02:00
Andras Bacsai	c9df812258	testing seeder	2023-07-14 21:30:08 +02:00
Andras Bacsai	0bfcf6b66f	fix: gh actions	2023-07-14 21:06:26 +02:00
Andras Bacsai	67853acabd	docs link update	2023-07-14 20:58:54 +02:00
Andras Bacsai	33b853b981	Merge pull request #1081 from coollabsio/next v3.12.32	2023-05-25 09:14:17 +02:00
Andras Bacsai	e6063fb93a	fix: force delete stucked destinations	2023-05-24 21:55:24 +02:00
Andras Bacsai	f30f23af59	fix: restart storage volumes	2023-05-24 20:51:33 +02:00
Andras Bacsai	d4798a3b22	fix: more aggressive cleanup	2023-05-24 20:34:40 +02:00
Andras Bacsai	f3beb5d8db	Merge pull request #1045 from coollabsio/next v3.12.31	2023-04-19 08:53:20 +02:00
Andras Bacsai	e86b916415	fix: application logs duplicate	2023-04-19 08:50:55 +02:00
Andras Bacsai	e14cc6f2f0	remove assignment for issues	2023-04-18 14:52:26 +02:00
Andras Bacsai	8c1eb94401	fix: remove git is not necessary for docker bp	2023-04-18 14:51:31 +02:00
Andras Bacsai	29fa421945	feat: add custom version/tag	2023-04-18 14:46:40 +02:00
Andras Bacsai	7cfe98d988	fix: fail build if no application found.	2023-04-18 14:32:29 +02:00
Andras Bacsai	e2314c350b	update lock file	2023-04-18 14:27:54 +02:00
Andras Bacsai	3713b33578	Update templates fix: non string inputs in templates	2023-04-18 14:22:46 +02:00