diff --git a/.env.sample b/.env.sample
index fad5615..39e647c 100644
--- a/.env.sample
+++ b/.env.sample
@@ -103,7 +103,7 @@ GITEA_STORAGE_TYPE=local
 # Indexer (for issue search)
 # GITEA_REPO_INDEXER_ENABLED=false
 # GITEA_ISSUE_INDEXER_TYPE=db
-# GITEA_STARTUP_TIMEOUT=-1
+# GITEA_STARTUP_TIMEOUT=0s
 
 # Prometheus metrics
 # FORGEJO_METRICS_ENABLED=false
diff --git a/app.ini.tmpl b/app.ini.tmpl
index b9deb35..914ee0e 100644
--- a/app.ini.tmpl
+++ b/app.ini.tmpl
@@ -80,7 +80,7 @@ SHOW_USER_EMAIL = {{ env "GITEA_SHOW_USER_EMAIL" }}
 [indexer]
 REPO_INDEXER_ENABLED = {{ or (env "GITEA_REPO_INDEXER_ENABLED") "false" }}
 ISSUE_INDEXER_TYPE= {{ or (env "GITEA_ISSUE_INDEXER_TYPE") "db" }}
-STARTUP_TIMEOUT = {{ or (env "GITEA_STARTUP_TIMEOUT") "-1" }}
+STARTUP_TIMEOUT = {{ or (env "GITEA_STARTUP_TIMEOUT") "0s" }}
 
 [server]
 DOMAIN = {{ env "GITEA_DOMAIN" }}
diff --git a/compose.yml b/compose.yml
index f5b13f0..e555559 100644
--- a/compose.yml
+++ b/compose.yml
@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: codeberg.org/forgejo/forgejo:15.0.10-rootless
+    image: codeberg.org/forgejo/forgejo:17.0.0-rootless
     configs:
       - source: app_ini
         target: /var/lib/gitea/custom/conf/app.ini
diff --git a/release/next b/release/next
new file mode 100644
index 0000000..76a3b5a
--- /dev/null
+++ b/release/next
@@ -0,0 +1,5 @@
+Since PR 10273 was merged, durations need a unit, otherwise Forgejo
+would refuse to start.  Check your GITEA_STARTUP_TIMEOUT value and make
+sure it ends with s for seconds.
+
+https://codeberg.org/forgejo/forgejo/pulls/10273