diff --git a/doc/cli.markdown b/doc/cli.markdown
index b3a85991..67630d3d 100644
--- a/doc/cli.markdown
+++ b/doc/cli.markdown
@@ -1138,13 +1138,13 @@ that will be asked for the relevant device type.
 
 Examples:
 
-	$ balena config generate --device 7cf02a6
-	$ balena config generate --device 7cf02a6 --generate-device-api-key
-	$ balena config generate --device 7cf02a6 --device-api-key <existingDeviceKey>
-	$ balena config generate --device 7cf02a6 --output config.json
-	$ balena config generate --app MyApp
-	$ balena config generate --app MyApp --output config.json
-	$ balena config generate --app MyApp --network wifi --wifiSsid mySsid --wifiKey abcdefgh --appUpdatePollInterval 1
+	$ balena config generate --device 7cf02a6 --version 2.12.7
+	$ balena config generate --device 7cf02a6 --version 2.12.7 --generate-device-api-key
+	$ balena config generate --device 7cf02a6 --version 2.12.7 --device-api-key <existingDeviceKey>
+	$ balena config generate --device 7cf02a6 --version 2.12.7 --output config.json
+	$ balena config generate --app MyApp --version 2.12.7
+	$ balena config generate --app MyApp --version 2.12.7 --output config.json
+	$ balena config generate --app MyApp --version 2.12.7 --network wifi --wifiSsid mySsid --wifiKey abcdefgh --appUpdatePollInterval 1
 
 ### Options
 
diff --git a/lib/actions/config.coffee b/lib/actions/config.coffee
index 9fe833dd..0932ae9c 100644
--- a/lib/actions/config.coffee
+++ b/lib/actions/config.coffee
@@ -231,17 +231,17 @@ exports.generate =
 
 		Examples:
 
-			$ balena config generate --device 7cf02a6
-			$ balena config generate --device 7cf02a6 --generate-device-api-key
-			$ balena config generate --device 7cf02a6 --device-api-key <existingDeviceKey>
-			$ balena config generate --device 7cf02a6 --output config.json
-			$ balena config generate --app MyApp
-			$ balena config generate --app MyApp --output config.json
-			$ balena config generate --app MyApp \
+			$ balena config generate --device 7cf02a6 --version 2.12.7
+			$ balena config generate --device 7cf02a6 --version 2.12.7 --generate-device-api-key
+			$ balena config generate --device 7cf02a6 --version 2.12.7 --device-api-key <existingDeviceKey>
+			$ balena config generate --device 7cf02a6 --version 2.12.7 --output config.json
+			$ balena config generate --app MyApp --version 2.12.7
+			$ balena config generate --app MyApp --version 2.12.7 --output config.json
+			$ balena config generate --app MyApp --version 2.12.7 \
 				--network wifi --wifiSsid mySsid --wifiKey abcdefgh --appUpdatePollInterval 1
 	'''
 	options: [
-		commandOptions.optionalOsVersion
+		commandOptions.osVersion
 		commandOptions.optionalApplication
 		commandOptions.optionalDevice
 		commandOptions.optionalDeviceApiKey