Fixing Dockerfile & adding env vars