diff --git a/vector/build.gradle b/vector/build.gradle
index 5a34196893..7bdc496c91 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -348,6 +348,10 @@ android {
         test {
             java.srcDirs += "src/sharedTest/java"
         }
+        // Add sourceSets for `release` version when building `nightly`
+        nightly {
+            java.srcDirs += "src/release/java"
+        }
     }
 
     buildFeatures {
diff --git a/vector/src/nightly/res/xml/shortcuts.xml b/vector/src/nightly/res/xml/shortcuts.xml
new file mode 100644
index 0000000000..f3056d0f8c
--- /dev/null
+++ b/vector/src/nightly/res/xml/shortcuts.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <share-target android:targetClass="im.vector.app.features.share.IncomingShareActivity">
+        <data android:mimeType="*/*" />
+        <category android:name="im.vector.app.nightly.SHORTCUT_SHARE" />
+    </share-target>
+</shortcuts>
diff --git a/vector/src/release/java/im/vector/app/config/AnalyticsConfig.kt b/vector/src/release/java/im/vector/app/config/AnalyticsConfig.kt
index 7f7ef1a54e..e1427338b2 100644
--- a/vector/src/release/java/im/vector/app/config/AnalyticsConfig.kt
+++ b/vector/src/release/java/im/vector/app/config/AnalyticsConfig.kt
@@ -19,8 +19,13 @@ package im.vector.app.config
 import im.vector.app.BuildConfig
 import im.vector.app.features.analytics.AnalyticsConfig
 
+private val allowedPackageList = listOf(
+        "im.vector.app",
+        "im.vector.app.nightly",
+)
+
 val analyticsConfig: AnalyticsConfig = object : AnalyticsConfig {
-    override val isEnabled = BuildConfig.APPLICATION_ID == "im.vector.app"
+    override val isEnabled = BuildConfig.APPLICATION_ID in allowedPackageList
     override val postHogHost = "https://posthog.hss.element.io"
     override val postHogApiKey = "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO"
     override val policyLink = "https://element.io/cookie-policy"