diff --git a/templates/compose/penpot.yaml b/templates/compose/penpot.yaml
index 72736ab48..fa92abb7f 100644
--- a/templates/compose/penpot.yaml
+++ b/templates/compose/penpot.yaml
@@ -2,7 +2,7 @@
 # slogan: Penpot is the first Open Source design and prototyping platform for product teams.
 # tags: penpot,design,prototyping,figma,open,source
 # logo: svgs/penpot.svg
-# port: 80
+# port: 8080
 
 services:
   frontend:
@@ -15,10 +15,10 @@ services:
       penpot-exporter:
         condition: service_healthy
     environment:
-      - SERVICE_FQDN_FRONTEND
+      - SERVICE_FQDN_FRONTEND_8080
       - PENPOT_FLAGS=${PENPOT_FRONTEND_FLAGS:-enable-login-with-password}
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://127.0.0.1:80"]
+      test: ['CMD', 'curl', '-f', 'http://127.0.0.1:8080']
       interval: 2s
       timeout: 10s
       retries: 15
@@ -36,7 +36,7 @@ services:
       - 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_PUBLIC_URI=$SERVICE_FQDN_FRONTEND_8080
       - PENPOT_BACKEND_URI=http://penpot-backend
       - PENPOT_EXPORTER_URI=http://penpot-exporter
       - PENPOT_DATABASE_URI=postgresql://postgres/${POSTGRES_DB:-penpot}
@@ -55,18 +55,18 @@ services:
       - PENPOT_SMTP_TLS=${PENPOT_SMTP_TLS:-false}
       - PENPOT_SMTP_SSL=${PENPOT_SMTP_SSL:-false}
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://127.0.0.1:6060/readyz"]
-      interval: 2s
-      timeout: 10s
+      test: ['CMD', 'curl', '-f', 'http://127.0.0.1:6060/readyz']
+      interval: 10s
+      timeout: 30s
       retries: 15
 
   penpot-exporter:
     image: penpotapp/exporter:latest
     environment:
-      - PENPOT_PUBLIC_URI=$SERVICE_FQDN_FRONTEND
+      - PENPOT_PUBLIC_URI=$SERVICE_FQDN_FRONTEND_8080
       - PENPOT_REDIS_URI=redis://redis/0
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://127.0.0.1:6061/readyz"]
+      test: ['CMD', 'curl', '-f', 'http://127.0.0.1:6061/readyz']
       interval: 2s
       timeout: 10s
       retries: 15
@@ -76,7 +76,7 @@ services:
     environment:
       - SERVICE_FQDN_MAILPIT_8025
     healthcheck:
-      test: ["CMD", "/mailpit", "readyz"]
+      test: ['CMD', '/mailpit', 'readyz']
       interval: 5s
       timeout: 20s
       retries: 10
@@ -91,7 +91,7 @@ services:
       - POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
       - POSTGRES_DB=${POSTGRES_DB:-penpot}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      test: ['CMD-SHELL', 'pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}']
       interval: 5s
       timeout: 20s
       retries: 10
@@ -102,7 +102,7 @@ services:
     volumes:
       - penpot-redis-data:/data
     healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
+      test: ['CMD', 'redis-cli', 'ping']
       interval: 5s
       timeout: 20s
       retries: 10