Fix the issue with store device images