diff --git a/app/Models/Service.php b/app/Models/Service.php
index 11189b4ac..cc8074b74 100644
--- a/app/Models/Service.php
+++ b/app/Models/Service.php
@@ -778,7 +778,8 @@ public function extraFields()
                     }
                     $rpc_secret = $this->environment_variables()->where('key', 'GARAGE_RPC_SECRET')->first();
                     if (is_null($rpc_secret)) {
-                        $rpc_secret = $this->environment_variables()->where('key', 'SERVICE_HEX_32_RPCSECRET')->first();
+                        $rpc_secret = $this->environment_variables()->where('key', 'SERVICE_HEX_64_RPCSECRET')->first()
+                            ?? $this->environment_variables()->where('key', 'SERVICE_HEX_32_RPCSECRET')->first();
                     }
                     $metrics_token = $this->environment_variables()->where('key', 'GARAGE_METRICS_TOKEN')->first();
                     if (is_null($metrics_token)) {
diff --git a/public/svgs/healthchecks.webp b/public/svgs/healthchecks.webp
new file mode 100644
index 000000000..003f05f3f
Binary files /dev/null and b/public/svgs/healthchecks.webp differ
diff --git a/templates/compose/garage.yaml b/templates/compose/garage.yaml
index 0c559cebd..e3292dffc 100644
--- a/templates/compose/garage.yaml
+++ b/templates/compose/garage.yaml
@@ -12,7 +12,7 @@ services:
       - GARAGE_S3_API_URL=$GARAGE_S3_API_URL
       - GARAGE_WEB_URL=$GARAGE_WEB_URL
       - GARAGE_ADMIN_URL=$GARAGE_ADMIN_URL
-      - GARAGE_RPC_SECRET=${SERVICE_HEX_32_RPCSECRET}
+      - GARAGE_RPC_SECRET=${SERVICE_HEX_64_RPCSECRET}
       - GARAGE_ADMIN_TOKEN=$SERVICE_PASSWORD_GARAGE
       - GARAGE_METRICS_TOKEN=$SERVICE_PASSWORD_GARAGEMETRICS
       - GARAGE_ALLOW_WORLD_READABLE_SECRETS=true
diff --git a/templates/compose/gitea-runner.yaml b/templates/compose/gitea-runner.yaml
index 4cf5ac503..bc6b4bd77 100644
--- a/templates/compose/gitea-runner.yaml
+++ b/templates/compose/gitea-runner.yaml
@@ -6,7 +6,7 @@
 
 services:
   runner:
-    image: 'docker.io/gitea/runner:1.0.6'
+    image: 'docker.io/gitea/runner:1.0.7'
     environment:
       - 'GITEA_INSTANCE_URL=${GITEA_INSTANCE_URL}'
       - 'GITEA_RUNNER_REGISTRATION_TOKEN=${GITEA_RUNNER_REGISTRATION_TOKEN}'
diff --git a/templates/compose/healthchecks.yaml b/templates/compose/healthchecks.yaml
new file mode 100644
index 000000000..246fabb7b
--- /dev/null
+++ b/templates/compose/healthchecks.yaml
@@ -0,0 +1,30 @@
+# documentation: https://healthchecks.io/docs
+# slogan: Healthchecks is a cron job monitoring service. It listens for HTTP requests and email messages from your cron jobs and scheduled tasks.
+# category: monitoring
+# tags: monitoring, status, performance, web, services, applications, real-time
+# logo: svgs/healthchecks.webp
+# port: 80000
+
+services:
+  healthchecks:
+    image: "healthchecks/healthchecks:v4.2"
+    container_name: healthchecks
+    environment:
+      - SERVICE_URL_HEALTHCHECKS_8000
+      - DB=sqlite
+      - DB_NAME=/data/hc.sqlite
+      - "ALLOWED_HOSTS=${ALLOWED_HOSTS:-*}"
+      - "REGISTRATION_OPEN=${REGISTRATION_OPEN:-True}"
+      - "DEBUG=${DEBUG:-False}"
+      - "SECRET_KEY=${SECRET_KEY:?${SERVICE_PASSWORD_64_HEALTHCHECKS}}"
+      - "SITE_ROOT=${SERVICE_URL_HEALTHCHECKS}"
+      - "DEFAULT_FROM_EMAIL=${DEFAULT_FROM_EMAIL:-fixme-email-address-here}"
+      - "EMAIL_HOST=${EMAIL_HOST:-my-smtp-server-here.com}"
+      - "EMAIL_PORT=${EMAIL_PORT:-465}"
+      - "EMAIL_HOST_USER=${EMAIL_HOST_USER:-my_username}"
+      - "EMAIL_HOST_PASSWORD=${EMAIL_HOST_PASSWORD:-mypassword}"
+      - "EMAIL_USE_SSL=${EMAIL_USE_SSL:-True}"
+      - "EMAIL_USE_TLS=${EMAIL_USE_TLS:-False}"
+    volumes:
+      - "healthchecks-data:/data"
+