- Reorder the Dockerfile build, annotate images with targets - Using entrypoint to execute the container