Add production image support
Merge branch 'release/v0.0.11'