diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 8a42110..2e0b705 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -41,10 +41,10 @@ jobs:
         with:
           files: config/production.badgey.json
         env:
-          BOT_NICKNAME: ${{ vars.BADGEY_BOT_NICKNAME }}
+          BOT_NICKNAME: ${{ vars[format('{0}_BOT_NICKNAME', 'BADGEY')] }}
           POSTGRES_HOST: ${{ vars.POSTGRES_HOST }}
           POSTGRES_USER: ${{ vars.POSTGRES_USER }}
-          POSTGRES_DATABASE_NAME: ${{ vars.POSTGRES_DATABASE_NAME }}
+          POSTGRES_DATABASE_NAME: ${{ vars[format('{0}_POSTGRES_DATABASE_NAME', 'BADGEY')] }}
           POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
           WEATHER_API_KEY: ${{ secrets.WEATHER_API_KEY }}
           DOGPICS_API_KEY: ${{ secrets.DOGPICS_API_KEY }}