NRF9160 / Asset Tracker V2 / AWS - Power consumption problem with MQTT_KEEPALIVE

I have an application modified from the Asset Tracker V2. It is on the 1.8 SDK.

I am able to get the power consumption low, but every 20 minutes the application starts the modem and pings AWS. This is because of:

# Maximum specified MQTT keepalive timeout for AWS IoT is 1200 seconds.
#CONFIG_MQTT_KEEPALIVE=1200
The Asset Tracker V2 code does not disconnect from AWS until the modem is shutdown, but in PSM mode- it will not shutdown (and therefore send a shutdown event).
What is the easiest way to stop these connections?
Thanks
Related