[18.09] Make -dm image based not tag based Upstream-commit: 4264c8e1a826c76b0fde570f867cc7e7c6cd30bb Component: packaging