diff --git a/.github/workflows/_kotlin.yml b/.github/workflows/_kotlin.yml
index 76ef64d9e..7c826c3e4 100644
--- a/.github/workflows/_kotlin.yml
+++ b/.github/workflows/_kotlin.yml
@@ -76,6 +76,7 @@ jobs:
         run: |
           echo -n "$FIREBASE_APP_DISTRIBUTION_CREDENTIALS" > $FIREBASE_CREDENTIALS_PATH
           ./gradlew --info appDistributionUploadRelease uploadCrashlyticsSymbolFileRelease
+
   build_debug:
     # Android SDK tools hardware accel is available only on Linux runners
     runs-on: ubuntu-22.04
diff --git a/kotlin/android/app/build.gradle.kts b/kotlin/android/app/build.gradle.kts
index 18af5d908..8e12e7385 100644
--- a/kotlin/android/app/build.gradle.kts
+++ b/kotlin/android/app/build.gradle.kts
@@ -59,6 +59,9 @@ android {
         versionName = "1.2.1"
         multiDexEnabled = true
         testInstrumentationRunner = "dev.firezone.android.core.HiltTestRunner"
+
+        val gitSha = System.getenv("GITHUB_SHA") ?: "unknown"
+        resValue("string", "git_sha", "Build: \"${gitSha.take(8)}\"")
     }
 
     signingConfigs {
diff --git a/kotlin/android/app/src/main/res/layout/fragment_settings_advanced.xml b/kotlin/android/app/src/main/res/layout/fragment_settings_advanced.xml
index f4c3f3247..dacbf11b4 100644
--- a/kotlin/android/app/src/main/res/layout/fragment_settings_advanced.xml
+++ b/kotlin/android/app/src/main/res/layout/fragment_settings_advanced.xml
@@ -77,5 +77,15 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/ilLogFilterInput" />
 
+        <TextView
+            android:id="@+id/tvGitSha"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="56dp"
+            android:text="@string/git_sha"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/website/src/components/Changelog/Android.tsx b/website/src/components/Changelog/Android.tsx
index b6e4ede59..d87cfa09f 100644
--- a/website/src/components/Changelog/Android.tsx
+++ b/website/src/components/Changelog/Android.tsx
@@ -17,6 +17,9 @@ export default function Android() {
             established to a gateway, due to routes being updated with no actual
             change.
           </ChangeItem>
+          <ChangeItem pull="6405">
+            Shows the Git SHA corresponding to the build on the Settings -> Advanced screen.
+          </ChangeItem>
         </ul>
       </Entry>
       */}