How to properly set LoRaWAN identifiers through serial commands at production time?

[Regimbal]

Hello guys,
We develop our firmware based on the LoRaMac-node repository, 4.7.0 version as of today with OTAA and Soft SE nvm management.
We use to set the lorawan identifiers and other production data through serial commands, and not by customizing the se-identity.he file.

Our current implementation reveals some weird behavior by times. Indeed major serialized parts get the correct ids, some fall back to the identifiers in the se-identity.h.
We suspect we have an issue with the way we interact with the NVM.

Below is how we set the parameters:

int8_t setAtConfigDevEui(const char *arg, char *response)
{
    uint32_t devEui[8] = {0};
    uint8_t buff[8] = {0};
    MibRequestConfirm_t mibSet;
    int ret = sscanf(arg, "%02x%02x%02x%02x%02x%02x%02x%02x", (unsigned int*) &devEui[0], (unsigned int*) &devEui[1], (unsigned int*) &devEui[2], (unsigned int*) &devEui[3], (unsigned int*) &devEui[4], (unsigned int*) &devEui[5], (unsigned int*) &devEui[6], (unsigned int*) &devEui[7]);
    if (ret == 8)
    {
        mibSet.Type = MIB_DEV_EUI;
        for(uint16_t i = 0; i < 8; i++)
        {
            buff[i] = devEui[i];
        }
        mibSet.Param.DevEui = buff;
        if(LoRaMacMibSetRequestConfirm( &mibSet ) == LORAMAC_STATUS_OK)
        {
            NvmDataMgmtEvent(LORAMAC_NVM_NOTIFY_FLAG_SECURE_ELEMENT);
            NvmDataMgmtStore();
            return 0;
        } else {
            return -1;
        }
    }
    else
    {
        return -1;
    }
}

We do merely the same for Nwkkey / AppKey except we do not call NvmDataMgmtEvent and NvmDataMgmtStore.
After that we reset the device.
I suspect that some times the reset is called too soon, not living time for the NVM management machine to do CRC, set flags and actually write the new set of data.

Would you have a recommandation of a proper way to set these data?

Thanks for your help,