Make enter-image script more generic
Add node id to make container script