diff --git a/blueprints/glitchtip/docker-compose.yml b/blueprints/glitchtip/docker-compose.yml
index f47742f01..8a483a619 100644
--- a/blueprints/glitchtip/docker-compose.yml
+++ b/blueprints/glitchtip/docker-compose.yml
@@ -1,55 +1,52 @@
+version: "3.8"
+
 x-environment: &default-environment
   DATABASE_URL: postgres://postgres:postgres@postgres:5432/postgres
+  VALKEY_URL: redis://valkey:6379
   SECRET_KEY: ${SECRET_KEY}
   PORT: ${GLITCHTIP_PORT}
   EMAIL_URL: consolemail://
-  GLITCHTIP_DOMAIN: http://${GLITCHTIP_HOST}
-  DEFAULT_FROM_EMAIL: email@glitchtip.com
-  CELERY_WORKER_AUTOSCALE: "1,3"
-  CELERY_WORKER_MAX_TASKS_PER_CHILD: "10000"
+  GLITCHTIP_DOMAIN: ${GLITCHTIP_DOMAIN}
+  DEFAULT_FROM_EMAIL: ${DEFAULT_FROM_EMAIL}
 
 x-depends_on: &default-depends_on
   - postgres
-  - redis
+  - valkey
 
 services:
   postgres:
-    image: postgres:16
+    image: postgres:18
     environment:
       POSTGRES_HOST_AUTH_METHOD: "trust"
     restart: unless-stopped
     volumes:
       - pg-data:/var/lib/postgresql/data
-
-  redis:
-    image: redis
+  valkey:
+    image: valkey/valkey:9
     restart: unless-stopped
-
   web:
-    image: glitchtip/glitchtip:v4.0
+    image: glitchtip/glitchtip:6.1.0
     depends_on: *default-depends_on
-    ports:
+    expose:
       - ${GLITCHTIP_PORT}
     environment: *default-environment
     restart: unless-stopped
     volumes:
       - uploads:/code/uploads
   worker:
-    image: glitchtip/glitchtip:v4.0
-    command: ./bin/run-celery-with-beat.sh
+    image: glitchtip/glitchtip:6.1.0
+    command: ./bin/run-worker.sh
     depends_on: *default-depends_on
     environment: *default-environment
     restart: unless-stopped
     volumes:
       - uploads:/code/uploads
-
   migrate:
-    image: glitchtip/glitchtip:v4.0
+    image: glitchtip/glitchtip:6.1.0
     depends_on: *default-depends_on
-    command: "./manage.py migrate"
+    command: ./bin/run-migrate.sh
     environment: *default-environment
 
-
 volumes:
   pg-data:
   uploads:
diff --git a/blueprints/glitchtip/template.toml b/blueprints/glitchtip/template.toml
index c5b7a46c3..af90c5ff8 100644
--- a/blueprints/glitchtip/template.toml
+++ b/blueprints/glitchtip/template.toml
@@ -4,7 +4,8 @@ secret_key = "${base64:32}"
 
 [config]
 env = [
-  "GLITCHTIP_HOST=${main_domain}",
+  "DEFAULT_FROM_EMAIL=${email}",
+  "GLITCHTIP_DOMAIN=https://${main_domain}",
   "GLITCHTIP_PORT=8000",
   "SECRET_KEY=${secret_key}",
 ]
@@ -12,5 +13,5 @@ mounts = []
 
 [[config.domains]]
 serviceName = "web"
-port = 8_000
+port = 8000
 host = "${main_domain}"
diff --git a/meta.json b/meta.json
index 3ae0cb5ef..09707a658 100644
--- a/meta.json
+++ b/meta.json
@@ -2763,7 +2763,7 @@
   {
     "id": "glitchtip",
     "name": "Glitchtip",
-    "version": "v4.0",
+    "version": "6.1.0",
     "description": "Glitchtip is simple, open source error tracking",
     "logo": "glitchtip.png",
     "links": {