Is there a way to install Greengrass deployment components to a recovered device?

In our AWS IoT Greengrass implementation, we have a Deployment targeting a Thing Group.

During the first time setup once our device has been registered in AWS IoT (as a Thing, and Core Device), the deployment is queued and completed as expected, installing all required GG components.

NOTE: We are using a static thing name based on our Hardware serial number, so this thing name cannot be modified or duplicated.

If for some reason we need to reflash our device (for example due to filesystem corruption, or a Linux BSP update that requires reflashing the SD Card), when doing the first-time setup again, on the same unit, we do not get the components installed because there is no Deployment job scheduled (and we understand that this is because the deployment completed and the Thing and Core Device already existed).

So, for now, we have 2 workarounds, the first is to delete the Thing and Core Device from the AWS IoT console before reflashing a device to prevent this situation, and the second is to Revise the Deployment.

The question is, is there a way to tell Greengrass that the device needs a "re-deploy" of the components or something like that?

This was not an issue before for us because we were using randomly generated thing name IDs, but now we are using static names this is an issue.

Your help will be much appreciated.

Thanks,