diff --git a/recipes-bsp/fng-install/common/fnginstall-common.sh b/recipes-bsp/fng-install/common/fnginstall-common.sh
index caae598e621a99a13c7bb698908ee3e2b8ce00a6..4a46874d2cba5137bb9c861693c5e10c54962938 100644
--- a/recipes-bsp/fng-install/common/fnginstall-common.sh
+++ b/recipes-bsp/fng-install/common/fnginstall-common.sh
@@ -37,16 +37,6 @@ COMMON_PARAMETERS="\
 #                                   Will display a warning and exit, when another partition
 #                                   scheme is found but --auto-repartition is not set,
 #                                   otherwise the partition table is adapted if needed.
-#     --partition-scheme=*          Specify the partitioning scheme, allowed is 1 or 2
-#                                     1: Bootloader and config are put to emmc boot0 and
-#                                        boot1 partition. Default is to have one OS
-#                                        (--no-AB) and no User Partition
-#                                        (--user-partition-size=0)
-#
-#                                     2: All partitions are put to the emmc/sdcards user
-#                                        partition. Default is to have two OS (--AB)
-#                                        and one user partition ( auto size).
-#                                     Default for this device is $PART_SCHEME_DEFAULT.
 #     --machine|--machine=*         Overwrite the machine type for the install for testing,
 #                                   default is '$MACHINE'
 #     -t=*|--target=*               Set the device to install to, default is '$TARGETDEVICE'.
@@ -912,10 +902,6 @@ parse_args()
             --dry) # Dry run, don't actaully write anything
                 DRYRUN="error_text DRYRUN Skipping: "
                 ;;
-            --partition-scheme|--partition-scheme=*) # Select the partition scheme for reformating
-                parse_args_value PART_SCHEME_PARAM "$1" "$2" || shift
-                [ "$PART_SCHEME_PARAM" != "1" ] && [ "$PART_SCHEME_PARAM" != "2" ] && param_error "Select 1 or 2 for --partition-scheme"
-                ;;
             --skip-postinstall)
                 SKIP_POSTINSTALL=true
                 ;;
diff --git a/recipes-bsp/fng-install/fng-install-fngsystem/fngsystem-self-update.sh b/recipes-bsp/fng-install/fng-install-fngsystem/fngsystem-self-update.sh
index cf86521080d1bb45ce68472f485e5e994d7aea1c..6cc8b39ff52daf82bd1e810893833c1fa1a3913e 100755
--- a/recipes-bsp/fng-install/fng-install-fngsystem/fngsystem-self-update.sh
+++ b/recipes-bsp/fng-install/fng-install-fngsystem/fngsystem-self-update.sh
@@ -30,6 +30,16 @@ HELP="
 #          --FS=*                   File containing the Flash-N-Go system files
 #     -d=*|--DTB=*                  Device tree, copy file, adapt boot config to use the devicetree as default
 #         |--DTBO=*                 Device tree overlay
+#     --partition-scheme=*          Specify the partitioning scheme, allowed is 1 or 2
+#                                     1: Bootloader and config are put to emmc boot0 and
+#                                        boot1 partition. Default is to have one OS
+#                                        (--no-AB) and no User Partition
+#                                        (--user-partition-size=0)
+#
+#                                     2: All partitions are put to the emmc/sdcards user
+#                                        partition. Default is to have two OS (--AB)
+#                                        and one user partition ( auto size).
+#                                     Default for this device is $PART_SCHEME_DEFAULT.
 #
 "
 
@@ -76,6 +86,10 @@ parse_extra_args()
             parse_args_value filename "$1" "$2" || ret=2
             FNGSYSTEM="${SUBDIR}${filename}"
             ;;
+        --partition-scheme|--partition-scheme=*) # Select the partition scheme for reformating
+            parse_args_value PART_SCHEME_PARAM "$1" "$2" || shift
+            [ "$PART_SCHEME_PARAM" != "1" ] && [ "$PART_SCHEME_PARAM" != "2" ] && param_error "Select 1 or 2 for --partition-scheme"
+            ;;
         *)  return 0 ;;
     esac
     return "$ret"