diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
index 5891deaf..5b2438bf 100644
--- a/.github/workflows/debug.yml
+++ b/.github/workflows/debug.yml
@@ -33,7 +33,7 @@ jobs:
         if: steps.cache.outputs.cache-hit != 'true'
         with:
           stable: false
-          go-version: 1.18.0-beta1
+          go-version: 1.18.0-beta2
       - name: Native Build
         if: steps.cache.outputs.cache-hit != 'true'
         run: ./run lib core
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f0e7e70a..c2d27bf5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -46,7 +46,7 @@ jobs:
         if: steps.cache.outputs.cache-hit != 'true'
         with:
           stable: false
-          go-version: 1.18.0-beta1
+          go-version: 1.18.0-beta2
       - name: Gradle cache
         uses: actions/cache@v2
         if: steps.cache.outputs.cache-hit != 'true'
diff --git a/bin/fdroid/install_golang.sh b/bin/fdroid/install_golang.sh
index 665e27c2..18c355ec 100755
--- a/bin/fdroid/install_golang.sh
+++ b/bin/fdroid/install_golang.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-curl -o golang.tar.gz https://dl.google.com/go/go1.18beta1.linux-amd64.tar.gz
+curl -o golang.tar.gz "https://dl.google.com/go/go$1.linux-amd64.tar.gz"
 mkdir "$HOME/.go"
 tar -C "$HOME/.go" --strip-components=1 -xzf golang.tar.gz
 rm golang.tar.gz
diff --git a/bin/fdroid/prebuild.sh b/bin/fdroid/prebuild.sh
index e24bd66a..a04092b8 100755
--- a/bin/fdroid/prebuild.sh
+++ b/bin/fdroid/prebuild.sh
@@ -5,7 +5,7 @@ source "bin/init/env.sh"
 git submodule update --init 'external/*'
 git submodule update --init 'library/*'
 
-bin/fdroid/install_golang.sh
+bin/fdroid/install_golang.sh 1.18beta2
 
 echo "sdk.dir=$ANDROID_HOME" >>local.properties
 echo "ndk.dir=$ANDROID_NDK_HOME" >>local.properties
diff --git a/bin/fdroid/prebuild_plugin_golang.sh b/bin/fdroid/prebuild_plugin_golang.sh
index 9d2b2673..997b6a47 100755
--- a/bin/fdroid/prebuild_plugin_golang.sh
+++ b/bin/fdroid/prebuild_plugin_golang.sh
@@ -2,4 +2,4 @@
 
 git submodule update --init "plugin/$1"
 
-bin/fdroid/install_golang.sh
+bin/fdroid/install_golang.sh 1.17.6