Refactor importimg

Fixes also deploys of the same image