diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 02b67a4bf..c2ca1bfa5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -150,7 +150,7 @@ firebase feature tests:
   dependencies:
     - build uiAutomation
   rules:
-    - if: '$TEST_TYPE == "feature" || $TEST_TYPE == "regression"'
+    - when: never
   tags:
     - medium
   variables:
diff --git a/app/src/uiTest/kotlin/ch/protonmail/android/uitests/tests/composer/ForwardMessageTests.kt b/app/src/uiTest/kotlin/ch/protonmail/android/uitests/tests/composer/ForwardMessageTests.kt
index 900f51a8d..46f5fc95b 100644
--- a/app/src/uiTest/kotlin/ch/protonmail/android/uitests/tests/composer/ForwardMessageTests.kt
+++ b/app/src/uiTest/kotlin/ch/protonmail/android/uitests/tests/composer/ForwardMessageTests.kt
@@ -26,9 +26,7 @@ import ch.protonmail.android.uitests.testsHelper.TestData.fwSubject
 import ch.protonmail.android.uitests.testsHelper.TestData.updatedSubject
 import ch.protonmail.android.uitests.testsHelper.TestUser.internalEmailTrustedKeys
 import ch.protonmail.android.uitests.testsHelper.TestUser.onePassUser
-import ch.protonmail.android.uitests.testsHelper.annotations.SmokeTest
 import ch.protonmail.android.uitests.testsHelper.annotations.TestId
-import org.junit.experimental.categories.Category
 import kotlin.test.BeforeTest
 import kotlin.test.Test
 
@@ -69,7 +67,6 @@ class ForwardMessageTests : BaseTest() {
     }
 
     @TestId("1950")
-    @Category(SmokeTest::class)
     @Test
     fun forwardMessageWithAttachment() {
         val to = internalEmailTrustedKeys.email
diff --git a/buildSrc/src/main/kotlin/ProtonMail.kt b/buildSrc/src/main/kotlin/ProtonMail.kt
index 3effe667d..aef624b4a 100644
--- a/buildSrc/src/main/kotlin/ProtonMail.kt
+++ b/buildSrc/src/main/kotlin/ProtonMail.kt
@@ -25,8 +25,8 @@ import org.gradle.api.JavaVersion
  */
 object ProtonMail {
 
-    const val versionName = "3.0.8"
-    const val versionCode = 922
+    const val versionName = "3.0.9"
+    const val versionCode = 923
 
     const val compileSdk = 32
     const val targetSdk = 31
diff --git a/buildSrc/src/main/kotlin/versionsConfig.kt b/buildSrc/src/main/kotlin/versionsConfig.kt
index e8c670911..f3249bcc6 100644
--- a/buildSrc/src/main/kotlin/versionsConfig.kt
+++ b/buildSrc/src/main/kotlin/versionsConfig.kt
@@ -62,7 +62,7 @@ fun initVersions() {
 }
 
 // Proton Core
-const val `Proton-core version` =               "9.2.1"
+const val `Proton-core version` =               "9.2.2"
 
 // Test
 const val `aerogear version` =                  "1.0.0"         // Released: Mar 23, 2013
diff --git a/proton-libs b/proton-libs
index 2c4f24239..f09138ec2 160000
--- a/proton-libs
+++ b/proton-libs
@@ -1 +1 @@
-Subproject commit 2c4f242393eeb1e5030eb1f2f7f059e37598e71c
+Subproject commit f09138ec2e95655d31072369d4319142be948b82