diff --git a/cli/src/lib/generateManifest.js b/cli/src/lib/generateManifest.js
index 014ff2a89..999768f86 100644
--- a/cli/src/lib/generateManifest.js
+++ b/cli/src/lib/generateManifest.js
@@ -32,5 +32,12 @@ module.exports = (paths, config, publicUrl) => {
 
     reporter.debug('Generated manifest', manifest)
 
+    // For backwards compatibility, WILL BE DEPRECATED
     fs.writeJsonSync(paths.buildAppManifest, manifest, { spaces: 2 })
+
+    // Write config json
+    const appConfig = { ...config }
+    delete appConfig['entryPoints']
+
+    fs.writeJsonSync(paths.buildAppConfigJson, appConfig, { spaces: 2 })
 }
diff --git a/cli/src/lib/paths.js b/cli/src/lib/paths.js
index e87ac9230..7d267b199 100644
--- a/cli/src/lib/paths.js
+++ b/cli/src/lib/paths.js
@@ -48,6 +48,7 @@ module.exports = (cwd = process.cwd()) => {
         buildOutput: path.join(base, './build'),
         buildAppOutput: path.join(base, './build/app'),
         buildAppManifest: path.join(base, './build/app/manifest.webapp'),
+        buildAppConfigJson: path.join(base, './build/app/d2.config.json'),
         buildAppBundle: path.join(
             base,
             './build/bundle/dhis2-{{name}}-{{version}}.zip'