diff --git a/app/build.gradle b/app/build.gradle
index c5c86e12e..8ea89ee88 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         resValue "string", "app_name", "NewPipe"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 973
-        versionName "0.21.7"
+        versionCode 974
+        versionName "0.21.8"
 
         multiDexEnabled true
 
@@ -186,7 +186,7 @@ dependencies {
     // name and the commit hash with the commit hash of the (pushed) commit you want to test
     // This works thanks to JitPack: https://jitpack.io/
     implementation 'com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751'
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:v0.21.6'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:v0.21.8'
 
 /** Checkstyle **/
     checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"
diff --git a/fastlane/metadata/android/en-US/changelogs/974.txt b/fastlane/metadata/android/en-US/changelogs/974.txt
new file mode 100644
index 000000000..e028a5e0b
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/974.txt
@@ -0,0 +1,5 @@
+Hotfix
+• Fix buffering issues caused by YouTube throttling
+• Fix YouTube comments extraction and crashes with disabled comments
+• Fix YouTube music search
+• Fix PeerTube livestreams