Merged changes from feature/81819596_csaturnino_create_dockerfile
Update ExecStart command