diff --git a/app.py b/network-diag-app.py
similarity index 95%
rename from app.py
rename to network-diag-app.py
index fded67e..d8c9002 100644
--- a/app.py
+++ b/network-diag-app.py
@@ -3,6 +3,7 @@
 SPDX-License-Identifier: LicenseRef-ONF-Member-1.01
 """
 import sys
+import os
 from datetime import datetime
 
 from flask import Flask, request
@@ -177,6 +178,13 @@
 
     args = build_argparser().parse_args()
 
+    if not args.user:
+        args.user = os.environ.get('ROCUSER')
+    if not args.password:
+        args.password = os.environ.get('ROCPASSWORD')
+    if not args.token:
+        args.token= os.environ.get('KEYCLOAKTOKEN')
+
     roc = Roc(args.url, args.user, args.password, args.enterprise, args.site)
     prom = Prometheus(args.token.split(':')[0], args.token.split(':')[1])