diff --git a/resources/views/livewire/project/new/public-git-repository.blade.php b/resources/views/livewire/project/new/public-git-repository.blade.php
index 46a963269..12aee9912 100644
--- a/resources/views/livewire/project/new/public-git-repository.blade.php
+++ b/resources/views/livewire/project/new/public-git-repository.blade.php
@@ -21,8 +21,8 @@
                             <div class='text-helper'>git@..</div>
                         </div>
                         <div class="flex gap-1">
-                            <div>Preselect branch (eg: static):</div>
-                            <div class='text-helper'>https://github.com/coollabsio/coolify-examples/tree/static</div>
+                            <div>Preselect branch (eg: main):</div>
+                            <div class='text-helper'>https://github.com/coollabsio/coolify-examples/tree/main</div>
                         </div>
                         <div>
                             For example application deployments, checkout <a class="text-white underline"
diff --git a/templates/compose/penpot.env b/templates/compose/penpot.env
deleted file mode 100644
index a0b07199f..000000000
--- a/templates/compose/penpot.env
+++ /dev/null
@@ -1,12 +0,0 @@
-PENPOT_BACKEND_FLAGS=enable-login-with-password enable-smtp enable-prepl-server
-PENPOT_FRONTEND_FLAGS=enable-login-with-password
-PENPOT_SECRET_KEY=$SERVICE_PASSWORD_64_PENPOT
-PENPOT_SMTP_DEFAULT_FROM=
-PENPOT_SMTP_DEFAULT_REPLY_TO=
-PENPOT_SMTP_HOST=
-PENPOT_SMTP_PASSWORD=
-PENPOT_SMTP_PORT=
-PENPOT_SMTP_SSL=false
-PENPOT_SMTP_TLS=false
-PENPOT_SMTP_USERNAME=
-PENPOT_TELEMETRY_ENABLED=true
\ No newline at end of file
diff --git a/templates/compose/penpot.yaml b/templates/compose/penpot.yaml
index 646c1a706..32d7466be 100644
--- a/templates/compose/penpot.yaml
+++ b/templates/compose/penpot.yaml
@@ -2,82 +2,87 @@
 # slogan: Penpot is the first Open Source design and prototyping platform for product teams.
 # tags: penpot,design,prototyping,figma,open,source
 
-version: '3.5'
-networks:
-  penpot: null
-volumes:
-  penpot_postgres_v15: null
-  penpot_assets: null
+version: "3.5"
 services:
-  penpot-frontend:
-    image: 'penpotapp/frontend:latest'
-    restart: always
-    ports:
-      - '9001:80'
+  frontend:
+    image: "penpotapp/frontend:latest"
     volumes:
-      - 'penpot_assets:/opt/data/assets'
+      - penpot-assets:/opt/data/assets
     depends_on:
       - penpot-backend
       - penpot-exporter
-    networks:
-      - penpot
     environment:
-      - SERVICE_FQDN_PENPOT-FRONTEND
-      - 'PENPOT_FLAGS=${PENPOT_FRONTEND_FLAGS}'
+      - SERVICE_FQDN_FRONTEND
+      - PENPOT_FLAGS=${PENPOT_FRONTEND_FLAGS:-enable-login-with-password}
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:80"]
+      interval: 2s
+      timeout: 10s
+      retries: 15
   penpot-backend:
-    image: 'penpotapp/backend:latest'
-    restart: always
+    image: penpotapp/backend:latest
     volumes:
-      - 'penpot_assets:/opt/data/assets'
+      - penpot-assets:/opt/data/assets
     depends_on:
-      - penpot-postgres
-      - penpot-redis
-    networks:
-      - penpot
+      - postgres
+      - redis
     environment:
-      - SERVICE_FQDN_PENPOT-BACKEND
-      - 'PENPOT_FLAGS=${PENPOT_BACKEND_FLAGS}'
-      - 'PENPOT_SECRET_KEY=${PENPOT_SECRET_KEY}'
-      - 'PENPOT_PUBLIC_URI=${SERVICE_FQDN_PENPOT-FRONTEND}'
-      - 'PENPOT_DATABASE_URI=postgresql://penpot-postgres/penpot'
-      - 'PENPOT_DATABASE_USERNAME=${SERVICE_USER_POSTGRES}'
-      - 'PENPOT_DATABASE_PASSWORD=${SERVICE_PASSWORD_POSTGRES}'
-      - 'PENPOT_REDIS_URI=redis://penpot-redis/0'
+      - PENPOT_FLAGS=${PENPOT_BACKEND_FLAGS:-enable-login-with-password enable-smtp enable-prepl-server}
+      - PENPOT_HTTP_SERVER_PORT=6060
+      - PENPOT_SECRET_KEY=$SERVICE_REALBASE64_64_PENPOT
+      - PENPOT_PUBLIC_URI=$SERVICE_FQDN_FRONTEND
+      - PENPOT_BACKEND_URI=http://penpot-backend
+      - PENPOT_EXPORTER_URI=http://penpot-exporter
+      - PENPOT_DATABASE_URI=postgresql://postgres/${POSTGRES_DB:-penpot}
+      - PENPOT_DATABASE_USERNAME=${SERVICE_USER_POSTGRES}
+      - PENPOT_DATABASE_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
+      - PENPOT_REDIS_URI=redis://redis/0
       - PENPOT_ASSETS_STORAGE_BACKEND=assets-fs
       - PENPOT_STORAGE_ASSETS_FS_DIRECTORY=/opt/data/assets
-      - 'PENPOT_TELEMETRY_ENABLED=${PENPOT_TELEMETRY_ENABLED}'
-      - 'PENPOT_SMTP_DEFAULT_FROM=${PENPOT_SMTP_DEFAULT_FROM}'
-      - 'PENPOT_SMTP_DEFAULT_REPLY_TO=${PENPOT_SMTP_DEFAULT_REPLY_TO}'
-      - 'PENPOT_SMTP_HOST=${PENPOT_SMTP_HOST}'
-      - 'PENPOT_SMTP_PORT=${PENPOT_SMTP_PORT}'
-      - 'PENPOT_SMTP_USERNAME=${PENPOT_SMTP_USERNAME}'
-      - 'PENPOT_SMTP_PASSWORD=${PENPOT_SMTP_PASSWORD}'
-      - 'PENPOT_SMTP_TLS=${PENPOT_SMTP_TLS}'
-      - 'PENPOT_SMTP_SSL=${PENPOT_SMTP_SSL}'
+      - PENPOT_TELEMETRY_ENABLED=${PENPOT_TELEMETRY_ENABLED:-false}
+      - PENPOT_SMTP_DEFAULT_FROM=${PENPOT_SMTP_DEFAULT_FROM:-no-reply@example.com}
+      - PENPOT_SMTP_DEFAULT_REPLY_TO=${PENPOT_SMTP_DEFAULT_REPLY_TO:-no-reply@example.com}
+      - PENPOT_SMTP_HOST=${PENPOT_SMTP_HOST:-mailpit}
+      - PENPOT_SMTP_PORT=${PENPOT_SMTP_PORT:-1025}
+      - PENPOT_SMTP_USERNAME=${PENPOT_SMTP_USERNAME:-penpot}
+      - PENPOT_SMTP_PASSWORD=${PENPOT_SMTP_PASSWORD:-penpot}
+      - PENPOT_SMTP_TLS=${PENPOT_SMTP_TLS:-false}
+      - PENPOT_SMTP_SSL=${PENPOT_SMTP_SSL:-false}
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:6060"]
+      interval: 2s
+      timeout: 10s
+      retries: 15
   penpot-exporter:
-    image: 'penpotapp/exporter:latest'
-    restart: always
-    networks:
-      - penpot
+    image: penpotapp/exporter:latest
     environment:
-      - SERVICE_FQDN_PENPOT-EXPORTER
-      - 'PENPOT_PUBLIC_URI=${SERVICE_FQDN_PENPOT-FRONTEND}'
-      - 'PENPOT_REDIS_URI=redis://penpot-redis/0'
-  penpot-postgres:
-    image: 'postgres:15'
-    restart: always
-    stop_signal: SIGINT
+      - PENPOT_PUBLIC_URI=$SERVICE_FQDN_FRONTEND
+      - PENPOT_REDIS_URI=redis://redis/0
+  mailpit:
+    image: "axllent/mailpit:latest"
+    environment:
+      - SERVICE_FQDN_MAILPIT_8025
+  postgres:
+    image: postgres:15
     volumes:
-      - 'penpot_postgres_v15:/var/lib/postgresql/data'
-    networks:
-      - penpot
+      - penpot-postgresql-data:/var/lib/postgresql/data
     environment:
       - POSTGRES_INITDB_ARGS=--data-checksums
-      - POSTGRES_DB=penpot
-      - 'POSTGRES_USER=${SERVICE_USER_POSTGRES}'
-      - 'POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}'
-  penpot-redis:
-    image: 'redis:7'
-    restart: always
-    networks:
-      - penpot
\ No newline at end of file
+      - POSTGRES_USER=$SERVICE_USER_POSTGRES
+      - POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
+      - POSTGRES_DB=${POSTGRES_DB:-penpot}
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      interval: 5s
+      timeout: 20s
+      retries: 10
+  redis:
+    image: redis:7-alpine
+    command: redis-server --appendonly yes
+    volumes:
+      - penpot-redis-data:/data
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 5s
+      timeout: 20s
+      retries: 10
diff --git a/templates/service-templates.json b/templates/service-templates.json
index d098f1e4a..c7a4d91db 100644
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@@ -613,6 +613,21 @@
         "minversion": "0.0.0",
         "port": "3000"
     },
+    "penpot": {
+        "documentation": "https:\/\/help.penpot.app\/technical-guide\/getting-started\/#install-with-docker",
+        "slogan": "Penpot is the first Open Source design and prototyping platform for product teams.",
+        "compose": "dmVyc2lvbjogJzMuNScKc2VydmljZXM6CiAgZnJvbnRlbmQ6CiAgICBpbWFnZTogJ3BlbnBvdGFwcC9mcm9udGVuZDpsYXRlc3QnCiAgICB2b2x1bWVzOgogICAgICAtICdwZW5wb3QtYXNzZXRzOi9vcHQvZGF0YS9hc3NldHMnCiAgICBkZXBlbmRzX29uOgogICAgICAtIHBlbnBvdC1iYWNrZW5kCiAgICAgIC0gcGVucG90LWV4cG9ydGVyCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fRlJPTlRFTkQKICAgICAgLSAnUEVOUE9UX0ZMQUdTPSR7UEVOUE9UX0ZST05URU5EX0ZMQUdTOi1lbmFibGUtbG9naW4td2l0aC1wYXNzd29yZH0nCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gY3VybAogICAgICAgIC0gJy1mJwogICAgICAgIC0gJ2h0dHA6Ly9sb2NhbGhvc3Q6ODAnCiAgICAgIGludGVydmFsOiAycwogICAgICB0aW1lb3V0OiAxMHMKICAgICAgcmV0cmllczogMTUKICBwZW5wb3QtYmFja2VuZDoKICAgIGltYWdlOiAncGVucG90YXBwL2JhY2tlbmQ6bGF0ZXN0JwogICAgdm9sdW1lczoKICAgICAgLSAncGVucG90LWFzc2V0czovb3B0L2RhdGEvYXNzZXRzJwogICAgZGVwZW5kc19vbjoKICAgICAgLSBwb3N0Z3JlcwogICAgICAtIHJlZGlzCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSAnUEVOUE9UX0ZMQUdTPSR7UEVOUE9UX0JBQ0tFTkRfRkxBR1M6LWVuYWJsZS1sb2dpbi13aXRoLXBhc3N3b3JkIGVuYWJsZS1zbXRwIGVuYWJsZS1wcmVwbC1zZXJ2ZXJ9JwogICAgICAtIFBFTlBPVF9IVFRQX1NFUlZFUl9QT1JUPTYwNjAKICAgICAgLSBQRU5QT1RfU0VDUkVUX0tFWT0kU0VSVklDRV9SRUFMQkFTRTY0XzY0X1BFTlBPVAogICAgICAtIFBFTlBPVF9QVUJMSUNfVVJJPSRTRVJWSUNFX0ZRRE5fRlJPTlRFTkQKICAgICAgLSAnUEVOUE9UX0JBQ0tFTkRfVVJJPWh0dHA6Ly9wZW5wb3QtYmFja2VuZCcKICAgICAgLSAnUEVOUE9UX0VYUE9SVEVSX1VSST1odHRwOi8vcGVucG90LWV4cG9ydGVyJwogICAgICAtICdQRU5QT1RfREFUQUJBU0VfVVJJPXBvc3RncmVzcWw6Ly9wb3N0Z3Jlcy8ke1BPU1RHUkVTX0RCOi1wZW5wb3R9JwogICAgICAtICdQRU5QT1RfREFUQUJBU0VfVVNFUk5BTUU9JHtTRVJWSUNFX1VTRVJfUE9TVEdSRVN9JwogICAgICAtICdQRU5QT1RfREFUQUJBU0VfUEFTU1dPUkQ9JHtTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTfScKICAgICAgLSAnUEVOUE9UX1JFRElTX1VSST1yZWRpczovL3JlZGlzLzAnCiAgICAgIC0gUEVOUE9UX0FTU0VUU19TVE9SQUdFX0JBQ0tFTkQ9YXNzZXRzLWZzCiAgICAgIC0gUEVOUE9UX1NUT1JBR0VfQVNTRVRTX0ZTX0RJUkVDVE9SWT0vb3B0L2RhdGEvYXNzZXRzCiAgICAgIC0gJ1BFTlBPVF9URUxFTUVUUllfRU5BQkxFRD0ke1BFTlBPVF9URUxFTUVUUllfRU5BQkxFRDotZmFsc2V9JwogICAgICAtICdQRU5QT1RfU01UUF9ERUZBVUxUX0ZST009JHtQRU5QT1RfU01UUF9ERUZBVUxUX0ZST006LW5vLXJlcGx5QGV4YW1wbGUuY29tfScKICAgICAgLSAnUEVOUE9UX1NNVFBfREVGQVVMVF9SRVBMWV9UTz0ke1BFTlBPVF9TTVRQX0RFRkFVTFRfUkVQTFlfVE86LW5vLXJlcGx5QGV4YW1wbGUuY29tfScKICAgICAgLSAnUEVOUE9UX1NNVFBfSE9TVD0ke1BFTlBPVF9TTVRQX0hPU1Q6LW1haWxwaXR9JwogICAgICAtICdQRU5QT1RfU01UUF9QT1JUPSR7UEVOUE9UX1NNVFBfUE9SVDotMTAyNX0nCiAgICAgIC0gJ1BFTlBPVF9TTVRQX1VTRVJOQU1FPSR7UEVOUE9UX1NNVFBfVVNFUk5BTUU6LXBlbnBvdH0nCiAgICAgIC0gJ1BFTlBPVF9TTVRQX1BBU1NXT1JEPSR7UEVOUE9UX1NNVFBfUEFTU1dPUkQ6LXBlbnBvdH0nCiAgICAgIC0gJ1BFTlBPVF9TTVRQX1RMUz0ke1BFTlBPVF9TTVRQX1RMUzotZmFsc2V9JwogICAgICAtICdQRU5QT1RfU01UUF9TU0w9JHtQRU5QT1RfU01UUF9TU0w6LWZhbHNlfScKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBjdXJsCiAgICAgICAgLSAnLWYnCiAgICAgICAgLSAnaHR0cDovL2xvY2FsaG9zdDo2MDYwJwogICAgICBpbnRlcnZhbDogMnMKICAgICAgdGltZW91dDogMTBzCiAgICAgIHJldHJpZXM6IDE1CiAgcGVucG90LWV4cG9ydGVyOgogICAgaW1hZ2U6ICdwZW5wb3RhcHAvZXhwb3J0ZXI6bGF0ZXN0JwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gUEVOUE9UX1BVQkxJQ19VUkk9JFNFUlZJQ0VfRlFETl9GUk9OVEVORAogICAgICAtICdQRU5QT1RfUkVESVNfVVJJPXJlZGlzOi8vcmVkaXMvMCcKICBtYWlscGl0OgogICAgaW1hZ2U6ICdheGxsZW50L21haWxwaXQ6bGF0ZXN0JwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gU0VSVklDRV9GUUROX01BSUxQSVRfODAyNQogIHBvc3RncmVzOgogICAgaW1hZ2U6ICdwb3N0Z3JlczoxNScKICAgIHZvbHVtZXM6CiAgICAgIC0gJ3BlbnBvdC1wb3N0Z3Jlc3FsLWRhdGE6L3Zhci9saWIvcG9zdGdyZXNxbC9kYXRhJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gUE9TVEdSRVNfSU5JVERCX0FSR1M9LS1kYXRhLWNoZWNrc3VtcwogICAgICAtIFBPU1RHUkVTX1VTRVI9JFNFUlZJQ0VfVVNFUl9QT1NUR1JFUwogICAgICAtIFBPU1RHUkVTX1BBU1NXT1JEPSRTRVJWSUNFX1BBU1NXT1JEX1BPU1RHUkVTCiAgICAgIC0gJ1BPU1RHUkVTX0RCPSR7UE9TVEdSRVNfREI6LXBlbnBvdH0nCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRC1TSEVMTAogICAgICAgIC0gJ3BnX2lzcmVhZHkgLVUgJCR7UE9TVEdSRVNfVVNFUn0gLWQgJCR7UE9TVEdSRVNfREJ9JwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCiAgcmVkaXM6CiAgICBpbWFnZTogJ3JlZGlzOjctYWxwaW5lJwogICAgY29tbWFuZDogJ3JlZGlzLXNlcnZlciAtLWFwcGVuZG9ubHkgeWVzJwogICAgdm9sdW1lczoKICAgICAgLSAncGVucG90LXJlZGlzLWRhdGE6L2RhdGEnCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gcmVkaXMtY2xpCiAgICAgICAgLSBwaW5nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAK",
+        "tags": [
+            "penpot",
+            "design",
+            "prototyping",
+            "figma",
+            "open",
+            "source"
+        ],
+        "logo": "svgs\/unknown.svg",
+        "minversion": "0.0.0"
+    },
     "phpmyadmin": {
         "documentation": "https:\/\/phpmyadmin.net",
         "slogan": "phpMyAdmin is a web-based database management tool for administering your MySQL and MariaDB databases through a user-friendly interface.",