Merge "Update Dockerfile to use non root user"