diff --git a/mastodon.yaml b/mastodon.yaml
index e3819e8..447c37d 100644
--- a/mastodon.yaml
+++ b/mastodon.yaml
@@ -160,7 +160,8 @@ services:
       - SMTP_LOGIN=$SMTP_USER
       - SMTP_PASSWORD=$SMTP_PASSWORD
       - SMTP_FROM_ADDRESS=mastodon@$DOMAIN_NAME
-    command: bundle exec sidekiq
+      - VAPID_KEY_FILE=/mastodon/public/system/vapid_key
+    entrypoint: ['/bin/bash', '-c', 'if [ -r "$$VAPID_KEY_FILE" ]; then . "$$VAPID_KEY_FILE" ; export VAPID_PUBLIC_KEY VAPID_PRIVATE_KEY ; echo "VAPID_PUBLIC_KEY=$$VAPID_PUBLIC_KEY"; fi ; exec bundle exec sidekiq' ]
     depends_on:
       - mastodon-db
       - mastodon-redis
diff --git a/mastodon/entrypoint.sh b/mastodon/entrypoint.sh
index cf9b3cc..da7edaa 100755
--- a/mastodon/entrypoint.sh
+++ b/mastodon/entrypoint.sh
@@ -21,6 +21,7 @@ if [ ! -r "$VAPID_KEY" ]; then
 fi
 
 . "$VAPID_KEY"
+export VAPID_PRIVATE_KEY VAPID_PUBLIC_KEY
 
 if [ ! -r "$DB_SETUP" ]; then
 	rails db:setup \