Get idempotence and image chaining working