diff --git a/CLAUDE.md b/CLAUDE.md
index a6dfc30..fded005 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -96,6 +96,6 @@ The repository uses an automated tool to maintain consistency across package REA
 ## Important Notes
 
 - This is a workspace managed by Melos - always run commands from the root
-- Each package/plugin maintains its own changelog and version
+- Each package/plugin maintains its own changelog and version — **do not manually update CHANGELOG.md or pubspec.yaml versions**; versioning is managed by Melos
 - Use `melos exec` to run commands across all packages
 - The workspace includes both published packages and internal development tools
\ No newline at end of file
diff --git a/packages/nonstop_cli/README.md b/packages/nonstop_cli/README.md
index a58bfa8..7a8508d 100644
--- a/packages/nonstop_cli/README.md
+++ b/packages/nonstop_cli/README.md
@@ -62,7 +62,6 @@ nonstop create <project-name> [arguments]
 | `--output-directory` | `-o`     | Output directory for the new project                  | Current directory                                                   |
 | `--description`      | `--desc` | Description for the new project                       | "A Melos-managed project for mono-repo, created using NonStop CLI." |
 | `--org-name`         | `--org`  | Organization name for the new project                 | `com.example`                                                       |
-| `--application-id`   |          | Bundle identifier on iOS or application id on Android | `<org-name>.<project-name>`                                         |
 
 #### 📦 Template Options
 
diff --git a/packages/nonstop_cli/bricks/flutter_plugin_for_mono_repo/brick.yaml b/packages/nonstop_cli/bricks/flutter_plugin_for_mono_repo/brick.yaml
index ad2c947..fc717d4 100644
--- a/packages/nonstop_cli/bricks/flutter_plugin_for_mono_repo/brick.yaml
+++ b/packages/nonstop_cli/bricks/flutter_plugin_for_mono_repo/brick.yaml
@@ -12,4 +12,9 @@ vars:
   description:
     type: string
     description: Description of the project
-    prompt: What is your project's description?
\ No newline at end of file
+    prompt: What is your project's description?
+  org_name:
+    type: string
+    description: Organization name
+    prompt: What is your organization name?
+    default: com.example
diff --git a/packages/nonstop_cli/bricks/flutter_plugin_for_mono_repo/hooks/commands/flutter_plugin_create_command.dart b/packages/nonstop_cli/bricks/flutter_plugin_for_mono_repo/hooks/commands/flutter_plugin_create_command.dart
index e76c343..33794d9 100644
--- a/packages/nonstop_cli/bricks/flutter_plugin_for_mono_repo/hooks/commands/flutter_plugin_create_command.dart
+++ b/packages/nonstop_cli/bricks/flutter_plugin_for_mono_repo/hooks/commands/flutter_plugin_create_command.dart
@@ -6,6 +6,7 @@ final class FlutterPluginCreateCommand extends BaseFlutterCommand {
   Future<void> run(HookContext context) async {
     final String name = context.vars['name'];
     final String description = context.vars['description'];
+    final String orgName = context.vars['org_name'] ?? 'com.example';
     final appName = name.snakeCase;
 
     await createFlutterProject(
@@ -14,6 +15,7 @@ final class FlutterPluginCreateCommand extends BaseFlutterCommand {
       description: description,
       outputPath: '.',
       template: 'plugin',
+      orgName: orgName,
     );
 
     final isMonoRepo = context.vars['is_mono_repo'] ?? false;
diff --git a/packages/nonstop_cli/bricks/flutter_project_with_mono_repo/brick.yaml b/packages/nonstop_cli/bricks/flutter_project_with_mono_repo/brick.yaml
index 58de862..6b5f65d 100644
--- a/packages/nonstop_cli/bricks/flutter_project_with_mono_repo/brick.yaml
+++ b/packages/nonstop_cli/bricks/flutter_project_with_mono_repo/brick.yaml
@@ -17,3 +17,8 @@ vars:
     type: string
     description: Description of the project
     prompt: What is your project's description?
+  org_name:
+    type: string
+    description: Organization name
+    prompt: What is your organization name?
+    default: com.example
diff --git a/packages/nonstop_cli/bricks/flutter_project_with_mono_repo/hooks/commands/flutter_create_command.dart b/packages/nonstop_cli/bricks/flutter_project_with_mono_repo/hooks/commands/flutter_create_command.dart
index 3175bb8..267a00b 100644
--- a/packages/nonstop_cli/bricks/flutter_project_with_mono_repo/hooks/commands/flutter_create_command.dart
+++ b/packages/nonstop_cli/bricks/flutter_project_with_mono_repo/hooks/commands/flutter_create_command.dart
@@ -9,6 +9,7 @@ final class FlutterCreateCommand extends BaseFlutterCommand {
   Future<void> run(HookContext context) async {
     final String name = context.vars['name'];
     final String description = context.vars['description'];
+    final String orgName = context.vars['org_name'] ?? 'com.example';
     final appName = name.snakeCase;
     final outputPath = p.normalize('$appName/apps');
 
@@ -17,6 +18,7 @@ final class FlutterCreateCommand extends BaseFlutterCommand {
       name: appName,
       description: description,
       outputPath: outputPath,
+      orgName: orgName,
     );
 
     await removeAnalysisOptions(
diff --git a/packages/nonstop_cli/lib/commands/create/command.dart b/packages/nonstop_cli/lib/commands/create/command.dart
index 8fd0e38..df63d75 100644
--- a/packages/nonstop_cli/lib/commands/create/command.dart
+++ b/packages/nonstop_cli/lib/commands/create/command.dart
@@ -22,11 +22,6 @@ class CreateCommand extends Command<int> {
   })  : _generatorFromBundle = generatorFromBundle ?? MasonGenerator.fromBundle,
         _generatorFromBrick = generatorFromBrick ?? MasonGenerator.fromBrick {
     argParser
-      ..addOption(
-        'application-id',
-        help: 'The bundle identifier on iOS or application id on Android. '
-            '(defaults to <org-name>.<project-name>)',
-      )
       ..addOption(
         'output-directory',
         abbr: 'o',
@@ -204,13 +199,11 @@ class CreateCommand extends Command<int> {
   Map<String, dynamic> getTemplateVars() {
     final projectName = this.projectName;
     final projectDescription = this.projectDescription;
-    final applicationId = argResults['application-id'] as String?;
 
     return <String, dynamic>{
       'name': projectName,
       'description': projectDescription,
       'org_name': orgName,
-      if (applicationId != null) 'application_id': applicationId
     };
   }
 }