improve docker generation