diff --git a/vector-app/build.gradle b/vector-app/build.gradle
index 235c92cfc5..5f039dfbd5 100644
--- a/vector-app/build.gradle
+++ b/vector-app/build.gradle
@@ -340,6 +340,10 @@ android {
                 "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
         ]
     }
+
+    buildFeatures {
+        viewBinding true
+    }
 }
 
 dependencies {
diff --git a/vector/src/nightly/res/xml/shortcuts.xml b/vector-app/src/nightly/res/xml/shortcuts.xml
similarity index 100%
rename from vector/src/nightly/res/xml/shortcuts.xml
rename to vector-app/src/nightly/res/xml/shortcuts.xml
diff --git a/vector/build.gradle b/vector/build.gradle
index a5538053fc..0e9e03f31a 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -66,10 +66,6 @@ android {
                 testCoverageEnabled = coverage.enableTestCoverage
             }
         }
-        nightly {
-            initWith release
-            matchingFallbacks = ['release']
-        }
         release
     }
 
@@ -111,10 +107,6 @@ android {
         test {
             java.srcDirs += "src/sharedTest/java"
         }
-        // Add sourceSets for `release` version when building `nightly`
-        nightly {
-            java.srcDirs += "src/release/java"
-        }
     }
 
     buildFeatures {