diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 5a011f69..5acc94a2 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,18 +1,15 @@
 name: Deploy (Production)
 
-on: 
-  workflow_dispatch:
-    inputs:
-      hostname:
-        description: Hostname
-        type: string
-        required: true
-        default: antville.org
+on: workflow_dispatch
 
 jobs:
   deploy:
     runs-on: antville
 
+    environment:
+      name: antville.org
+      url: https://antville.org
+
     steps:
       - name: Copy files to production server
-        run: ssh ${{ inputs.hostname }} deploy-helma
+        run: ssh staging-server deploy-helma
diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml
index 94e991cf..17e693d4 100644
--- a/.github/workflows/stage.yml
+++ b/.github/workflows/stage.yml
@@ -1,13 +1,6 @@
 name: Deploy (Staging)
 
-on: 
-  workflow_dispatch:
-    inputs:
-      hostname:
-        description: Hostname
-        type: string
-        required: true
-        default: antville.org
+on: workflow_dispatch
 
 jobs:
   stage:
@@ -15,7 +8,7 @@ jobs:
 
     environment:
       name: stage
-      url: ${{ inputs.hostname }}
+      url: ${{ vars.stage_url }}
 
     steps:
       - uses: actions/checkout@v4
@@ -23,9 +16,9 @@ jobs:
       - name: Build with Gradle
         run: ./gradlew installDist
 
-      - name: Copy build files to server
+      - name: Publish to staging server
         run: |
-          rsync ./build/install/helma/ ${{ inputs.hostname }}:./ \
+          rsync ./build/install/helma/ staging-server:./ \
             --verbose --archive --delete --compress \
             --filter '+ /bin' \
             --filter '+ /extras' \
@@ -36,4 +29,4 @@ jobs:
             --filter '- /*'
 
       - name: Restart Helma
-        run: ssh ${{ inputs.hostname }} restart
+        run: ssh staging-server restart
diff --git a/.gitignore b/.gitignore
index 7bf7bcbc..552a74e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,5 @@
-# Generally ignore hidden files
 .*
 
-# Manage some Codium configuration
 .vscode/*
 !.vscode
 !.vscode/extensions.json
@@ -9,22 +7,22 @@
 !.vscode/settings.json
 !.vscode/tasks.json
 
-# Ignore files created during build or run
+build
+
+/apps
 /bin
 /backups
-build
+/db
 /docs
+/extras
 /lib
 /licenses
 /log
-
-# Ignore files managed in src/dist
-/*.properties
-/apps
-/db
-/extras
-/launcher.jar
 /static
 
-# Manage Gradle configuration
+/*.properties
 !/gradle.properties
+
+/launcher.jar
+/passwd
+/start.*