diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eeebd2f62665787f3548bb50fbdfda111d4a7033..b251e96e0bfbecc6ecdda8f453a39c4ae7c913c0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: "k8r.eu/justjanne/android-sdk:dfb791e9"
+image: "k8r.eu/justjanne/android-sdk:eef7852b"
 
 cache:
   key: "$CI_PROJECT_NAME"
diff --git a/gradle/convention/src/main/kotlin/AndroidApplicationConvention.kt b/gradle/convention/src/main/kotlin/AndroidApplicationConvention.kt
index f8b6348f7ccb7cfb8993c8d21ffa86ff2a76b5a8..034284bbcf259647b10689356c9462b430732ad9 100644
--- a/gradle/convention/src/main/kotlin/AndroidApplicationConvention.kt
+++ b/gradle/convention/src/main/kotlin/AndroidApplicationConvention.kt
@@ -24,13 +24,14 @@ class AndroidApplicationConvention : Plugin<Project> {
 
           applicationId = "${rootProject.group}.${rootProject.name.lowercase(Locale.ROOT)}"
 
-          val commit = git("rev-parse", "HEAD")!!
-          val name = git("describe", "--always", "--tags", "HEAD")!!
+          val commit = git("rev-parse", "HEAD")
+          val name = git("describe", "--always", "--tags", "HEAD")
 
-          versionCode = git("rev-list", "--count", "HEAD")!!.toInt()
-          versionName = git("describe", "--always", "--tags", "HEAD")!!
+          versionCode = git("rev-list", "--count", "HEAD")?.toIntOrNull()
+          versionName = git("describe", "--always", "--tags", "HEAD")
 
-          val fancyVersionName = "<a href=\\\"https://git.kuschku.de/justJanne/QuasselDroid-ng/commit/$commit\\\">$name</a>"
+          val fancyVersionName = if (commit == null || name == null) name
+          else "<a href=\\\"https://git.kuschku.de/justJanne/QuasselDroid-ng/commit/$commit\\\">$name</a>"
 
           buildConfigField("String", "GIT_HEAD", "\"${git("rev-parse", "HEAD") ?: ""}\"")
           buildConfigField("String", "FANCY_VERSION_NAME", "\"${fancyVersionName ?: ""}\"")