diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
index 2ec9d6cb9..58020fb21 100644
--- a/.github/workflows/ant.yml
+++ b/.github/workflows/ant.yml
@@ -13,7 +13,6 @@ permissions:
 jobs:
   build:
     runs-on: ubuntu-latest
-
     steps:
       - name: GetText
         run: sudo apt install gettext git
@@ -31,7 +30,7 @@ jobs:
       - name: build with Gradle
         run: |
           echo "i2psrc=$HOME/i2p.i2p" > routerjars/local.properties
-          git clone -b i2p-2.3.0 https://github.com/i2p/i2p.i2p "$HOME/i2p.i2p"
+          git clone -b i2p-2.4.0 https://github.com/i2p/i2p.i2p "$HOME/i2p.i2p"
           ./gradlew assembleDebug
           find . -name '*.apk'
       - name: Upload i2p-debug-${{ github.sha }}.apk
@@ -42,7 +41,6 @@ jobs:
 
   trunk:
     runs-on: ubuntu-latest
-
     steps:
       - name: GetText
         run: sudo apt install gettext git
@@ -71,5 +69,5 @@ jobs:
       - name: Upload i2p-debug-${{ github.sha }}.apk
         uses: actions/upload-artifact@v4
         with:
-          name: i2p-debug-${{ github.sha }}.apk
+          name: i2p-debug-trunk-${{ github.sha }}.apk
           path: ./app/build/outputs/apk/free/debug/app-free-debug.apk
diff --git a/.github/workflows/sign.yml b/.github/workflows/sign.yml
new file mode 100644
index 000000000..71da539bd
--- /dev/null
+++ b/.github/workflows/sign.yml
@@ -0,0 +1,77 @@
+# Mostly copied from https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-ant
+# zlatinb
+
+name: Java CI
+
+on: [push]
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: GetText
+        run: sudo apt install gettext git
+      - uses: actions/checkout@v4
+      - name: Set up JDK 11
+        uses: actions/setup-java@v4
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+      - name : Generate override.properties
+        run: |
+          rm -f override.properties
+          mv etc/github.gradle.properties gradle.properties
+          mv etc/github.signing.properties signing.properties
+          echo "build.built-by=GitHub Actions" >> override.properties
+          echo "noExe=true" >> override.properties
+      - name: build with Gradle
+        run: |
+          echo "i2psrc=$HOME/i2p.i2p" > routerjars/local.properties
+          git clone -b i2p-2.4.0 https://github.com/i2p/i2p.i2p "$HOME/i2p.i2p"
+          ./gradlew assembleRelease
+          find . -name '*.apk'
+      - name: Upload i2p-debug-${{ github.sha }}.apk
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2p-debug.apk
+          path: ./app/build/outputs/apk/free/debug/app-free-debug.apk
+
+  trunk:
+    runs-on: ubuntu-latest
+    steps:
+      - name: GetText
+        run: sudo apt install gettext git
+      - uses: actions/checkout@v4
+      - name: Set up JDK 11
+        uses: actions/setup-java@v4
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+      - name : Generate override.properties
+        run: |
+          rm -f override.properties
+          echo "build.built-by=GitHub Actions" >> override.properties
+          echo "noExe=true" >> override.properties
+          mv etc/github.gradle.properties gradle.properties
+          mv etc/github.signing.properties signing.properties
+          grep -v I2P_ gradle.properties > gradle.properties.update
+          echo "I2P_VERSION=2.4.0-1" >> gradle.properties.update
+          echo "I2P_ANDROID_VERSION=2.4.0-1" >> gradle.properties.update
+          cp -v gradle.properties.update gradle.properties
+      - name: build with Gradle
+        run: |
+          echo "i2psrc=$HOME/i2p.i2p" > routerjars/local.properties
+          git clone -b master https://github.com/i2p/i2p.i2p "$HOME/i2p.i2p"
+          bash -c "cd $HOME/i2p.i2p && ./installer/resources/maven-dev-release.sh 1"
+          ./gradlew assembleRelease
+          find . -name '*.apk'
+      - name: Upload i2p-debug-${{ github.sha }}.apk
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2p-debug-trunk-${{ github.sha }}.apk
+          path: ./app/build/outputs/apk/free/debug/app-free-debug.apk
diff --git a/etc/github.gradle.properties b/etc/github.gradle.properties
new file mode 100644
index 000000000..d71d65829
--- /dev/null
+++ b/etc/github.gradle.properties
@@ -0,0 +1,23 @@
+
+GROUP=net.i2p.android
+
+org.gradle.jvmargs=-Xmx1536M
+
+POM_URL=https://github.com/i2p/i2p.android.base
+POM_SCM_URL=https://github.com/i2p/i2p.android.base
+POM_SCM_CONNECTION=scm:git:git@github.com:i2p/i2p.android.base.git
+POM_SCM_DEV_CONNECTION=scm:git:git@github.com:i2p/i2p.android.base.git
+POM_LICENCE_NAME=The Apache Software License, Version 2.0
+POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
+POM_LICENCE_DIST=repo
+POM_DEVELOPER_ID=github-ci
+POM_DEVELOPER_NAME=github-ci
+POM_DEVELOPER_EMAIL=hankhill19580@gmail.com
+
+ANDROID_BUILD_TARGET_SDK_VERSION=33
+ANDROID_BUILD_SDK_VERSION=33
+
+I2P_VERSION=2.4.0
+I2P_ANDROID_VERSION=2.4.0
+android.disableAutomaticComponentCreation=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/etc/github.signing.properties b/etc/github.signing.properties
new file mode 100644
index 000000000..a2f69835b
--- /dev/null
+++ b/etc/github.signing.properties
@@ -0,0 +1,2 @@
+STORE_FILE=/home/user/keystores/android-release.keystore
+KEY_ALIAS=github-ci