diff --git a/cmd/modulectl/scaffold/cmd_test.go b/cmd/modulectl/scaffold/cmd_test.go
index a97d78d8..dde11afa 100644
--- a/cmd/modulectl/scaffold/cmd_test.go
+++ b/cmd/modulectl/scaffold/cmd_test.go
@@ -56,7 +56,7 @@ func Test_Execute_ParsesOptions(t *testing.T) {
 	os.Args = []string{
 		"scaffold",
 		"--directory", directory,
-		"--module-config", moduleConfigFile,
+		"--config-file", moduleConfigFile,
 		"--overwrite",
 		"--gen-manifest", manifestFile,
 		"--gen-default-cr=" + defaultCRFile,
diff --git a/cmd/modulectl/scaffold/flags.go b/cmd/modulectl/scaffold/flags.go
index 7c487053..9c0c754f 100644
--- a/cmd/modulectl/scaffold/flags.go
+++ b/cmd/modulectl/scaffold/flags.go
@@ -12,7 +12,7 @@ const (
 	DirectoryFlagDefault = "./"
 	directoryFlagUsage   = `Specifies the target directory where the scaffolding shall be generated (default "./").`
 
-	ModuleConfigFileFlagName    = "module-config"
+	ModuleConfigFileFlagName    = "config-file"
 	ModuleConfigFileFlagDefault = "scaffold-module-config.yaml"
 	moduleConfigFileFlagUsage   = `Specifies the name of the generated module configuration file (default "scaffold-module-config.yaml").`
 
diff --git a/cmd/modulectl/scaffold/long.txt b/cmd/modulectl/scaffold/long.txt
index 42e9a721..d98c36ba 100644
--- a/cmd/modulectl/scaffold/long.txt
+++ b/cmd/modulectl/scaffold/long.txt
@@ -8,7 +8,7 @@ allowing for a tailored scaffolding experience according to the specific needs o
 The command generates or uses the following files:
  - Module Config:
 	Enabled: Always
-	Adjustable with flag: --module-config=VALUE
+	Adjustable with flag: --config-file=VALUE
 	Generated when: The file doesn't exist or the --overwrite=true flag is provided
 	Default file name: scaffold-module-config.yaml
  - Manifest:
diff --git a/docs/gen-docs/modulectl_scaffold.md b/docs/gen-docs/modulectl_scaffold.md
index db629281..324e6c9c 100644
--- a/docs/gen-docs/modulectl_scaffold.md
+++ b/docs/gen-docs/modulectl_scaffold.md
@@ -17,7 +17,7 @@ allowing for a tailored scaffolding experience according to the specific needs o
 The command generates or uses the following files:
  - Module Config:
 	Enabled: Always
-	Adjustable with flag: --module-config=VALUE
+	Adjustable with flag: --config-file=VALUE
 	Generated when: The file doesn't exist or the --overwrite=true flag is provided
 	Default file name: scaffold-module-config.yaml
  - Manifest:
@@ -75,7 +75,7 @@ Generate a scaffold with a manifest file, default CR and security-scanners confi
     --gen-security-config string   Specifies the security file in the generated module config. A scaffold security config file is generated if it doesn't exist (default "sec-scanners-config.yaml").
 -h, --help                         Provides help for the scaffold command.
     --module-channel string        Specifies the module channel in the generated module config file (default "regular").
-    --module-config string         Specifies the name of the generated module configuration file (default "scaffold-module-config.yaml").
+    --config-file string           Specifies the name of the generated module configuration file (default "scaffold-module-config.yaml").
     --module-name string           Specifies the module name in the generated config file (default "kyma-project.io/module/mymodule").
     --module-version string        Specifies the module version in the generated module config file (default "0.0.1").
 -o, --overwrite                    Specifies if the command overwrites an existing module configuration file.
diff --git a/tests/e2e/scaffold/scaffold_suite_test.go b/tests/e2e/scaffold/scaffold_suite_test.go
index a666607d..fc83177a 100644
--- a/tests/e2e/scaffold/scaffold_suite_test.go
+++ b/tests/e2e/scaffold/scaffold_suite_test.go
@@ -47,7 +47,7 @@ func (cmd *scaffoldCmd) execute() error {
 	}
 
 	if cmd.moduleConfigFileFlag != "" {
-		args = append(args, "--module-config="+cmd.moduleConfigFileFlag)
+		args = append(args, "--config-file="+cmd.moduleConfigFileFlag)
 	}
 
 	if cmd.genDefaultCRFlag != "" {