diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 5acc94a2..9eeb14b0 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,15 +1,39 @@
-name: Deploy (Production)
+name: Deploy
 
-on: workflow_dispatch
+on:
+  workflow_dispatch:
+    inputs:
+      hostname:
+        description: Hostname
+        type: string
+        required: true
+        default: antville.org
 
 jobs:
-  deploy:
+  stage:
     runs-on: antville
 
     environment:
-      name: antville.org
-      url: https://antville.org
+      name: production
+      url: ${{ inputs.hostname }}
 
     steps:
-      - name: Copy files to production server
-        run: ssh staging-server deploy-helma
+      - uses: actions/checkout@v4
+
+      - name: Build with Gradle
+        run: ./gradlew installDist
+
+      - name: Copy build files to server
+        run: |
+          rsync ./build/install/helma/ ${{ inputs.hostname }}:./ \
+            --verbose --archive --delete --compress \
+            --filter '+ /bin' \
+            --filter '+ /extras' \
+            --filter '+ /launcher.jar' \
+            --filter '- /lib/ext' \
+            --filter '+ /lib' \
+            --filter '+ /modules' \
+            --filter '- /*'
+
+      - name: Restart Helma
+        run: ssh ${{ inputs.hostname }} restart
diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml
deleted file mode 100644
index 17e693d4..00000000
--- a/.github/workflows/stage.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: Deploy (Staging)
-
-on: workflow_dispatch
-
-jobs:
-  stage:
-    runs-on: antville
-
-    environment:
-      name: stage
-      url: ${{ vars.stage_url }}
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Build with Gradle
-        run: ./gradlew installDist
-
-      - name: Publish to staging server
-        run: |
-          rsync ./build/install/helma/ staging-server:./ \
-            --verbose --archive --delete --compress \
-            --filter '+ /bin' \
-            --filter '+ /extras' \
-            --filter '+ /launcher.jar' \
-            --filter '- /lib/ext' \
-            --filter '+ /lib' \
-            --filter '+ /modules' \
-            --filter '- /*'
-
-      - name: Restart Helma
-        run: ssh staging-server restart
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index a4b76b95..1b33c55b 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e18bc253..002b867c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f3b75f3b..23d15a93 100755
--- a/gradlew
+++ b/gradlew
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/gradlew.bat b/gradlew.bat
index 9b42019c..5eed7ee8 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/src/dist/extras/deploy.sh b/src/dist/extras/deploy.sh
index 6ebd6bf2..869cf945 100755
--- a/src/dist/extras/deploy.sh
+++ b/src/dist/extras/deploy.sh
@@ -3,50 +3,11 @@
 # Use this script as forced command of an authorized SSH key:
 # command="/home/helma/extras/deploy.sh" ssh-ed25519 AAAAC3NzaC…
 
-# Define HELMA_HOST and ANTVILLE_HOST in this file
-# shellcheck source=/dev/null
-. "$HOME"/deploy.env
-
 case "$SSH_ORIGINAL_COMMAND" in
   ping)
     echo pong
     ;;
 
-  deploy-helma)
-    rsync ./ "$HELMA_HOST":./ \
-      --archive --compress --delete --verbose \
-      --filter '+ /bin' \
-      --filter '+ /extras' \
-      --filter '+ /launcher.jar' \
-      --filter '- /lib/ext' \
-      --filter '+ /lib' \
-      --filter '+ /modules' \
-      --filter '- /*'
-    printf 'Restarting Helma on HELMA_host… '
-    ssh "$HELMA_HOST" sudo /bin/systemctl restart helma
-    ;;
-
-  deploy-antville)
-    rsync ./apps/antville/ "$ANTVILLE_HOST":./apps/antville/ \
-      --archive --compress --delete --verbose \
-      --filter '+ /claustra' \
-      --filter '+ /code' \
-      --filter '+ /compat' \
-      --filter '+ /i18n' \
-      --filter '+ /lib' \
-      --filter '- /*'
-    rsync ./apps/antville/static/helma/ "$ANTVILLE_HOST":./apps/antville/static/helma/ \
-      --archive --compress --verbose \
-      --filter '+ /fonts' \
-      --filter '+ /formica.html' \
-      --filter '+ /img' \
-      --filter '+ /scripts' \
-      --filter '+ /styles' \
-      --filter '- /*'
-    printf 'Restarting Helma on ANTVILLE_host… '
-    ssh "$ANTVILLE_HOST" sudo /bin/systemctl restart helma
-    ;;
-
   restart)
     printf 'Restarting Helma… '
     sudo /bin/systemctl restart helma