diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 4d46119..8a42110 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -36,11 +36,12 @@ jobs:
         with:
           name: badgey
       - name: Pre-seed known_hosts
-        run: mkdir -pv ~/.ssh && ssh-keyscan -t rsa badgey >> ~/.ssh/known_hosts
+        run: mkdir -pv ~/.ssh && ssh-keyscan -t rsa ${{ vars.BADGEY_SERVER_HOSTNAME }} >> ~/.ssh/known_hosts
       - uses: cschleiden/replace-tokens@v1.2
         with:
           files: config/production.badgey.json
         env:
+          BOT_NICKNAME: ${{ vars.BADGEY_BOT_NICKNAME }}
           POSTGRES_HOST: ${{ vars.POSTGRES_HOST }}
           POSTGRES_USER: ${{ vars.POSTGRES_USER }}
           POSTGRES_DATABASE_NAME: ${{ vars.POSTGRES_DATABASE_NAME }}
@@ -51,4 +52,4 @@ jobs:
       - name: Seed SSH key for deploy
         run: echo "${{ secrets.DEPLOY_KEY }}" | tr -d '\r' > ~/.ssh/id_rsa && chmod 0600 ~/.ssh/id_rsa
       - name: Deploy
-        run: bash cicd/deploy.sh
+        run: bash cicd/deploy.sh ${{ vars.BADGEY_SERVER_HOSTNAME }}
diff --git a/cicd/deploy.sh b/cicd/deploy.sh
index 5395e4d..3e2098d 100755
--- a/cicd/deploy.sh
+++ b/cicd/deploy.sh
@@ -1,7 +1,11 @@
 #!/bin/bash
 
-ssh badgey@badgey sudo /usr/bin/systemctl stop badgey
-rsync -avP badgey badgey@badgey:/srv/badgey/
-rsync -avP config badgey@badgey:/srv/badgey/
-rsync -avP txt badgey@badgey:/srv/badgey/
-ssh badgey@badgey sudo /usr/bin/systemctl start badgey
\ No newline at end of file
+bot=$(echo "$1" | tr '[:upper:]' '[:lower:]')
+
+echo "Running deploy for bot ${bot}"
+
+ssh $bot@$bot sudo /usr/bin/systemctl stop $bot
+rsync -avP badgey $bot@$bot:/srv/$bot/
+rsync -avP config $bot@$bot:/srv/$bot/
+rsync -avP txt $bot@$bot:/srv/$bot/
+ssh $bot@$bot sudo /usr/bin/systemctl start $bot
\ No newline at end of file