diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..1df2a13
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,9 @@
+# SPDX-FileCopyrightText: 2022 Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: Apache-2.0
+
+[gerrit]
+host=gerrit.opencord.org
+port=29418
+project=network-diag-app.git
+defaultremote=origin
diff --git a/README.md b/README.md
index 615fae1..7db9103 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 #
 # Network Diagnostics Application for Aether Edge
 
-python3 networkdiag.py --user=xxx --password=yyy
+python3 network-diag-app.py --user=xxx --password=yyy
 
 curl http://localhost:3333/subnet
 curl http://localhost:3333/imsi
diff --git a/docker/Dockerfile b/docker/Dockerfile
index dee64fa..5641eee 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -3,12 +3,11 @@
 # SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
 # SPDX-License-Identifier: Apache-2.0
 #
-FROM ubuntu:18.04
-ADD . /
-RUN set -xe \
-    && apt-get update -y \
-    && apt-get install -y python3-pip
+FROM python:3.6-slim-buster
+WORKDIR /app
+COPY requirements.txt requirements.txt
 RUN pip3 install --upgrade pip
 RUN pip3 install -r requirements.txt
+COPY . .
 EXPOSE 3333
-ENTRYPOINT [ "python3", "./app.py"]
+ENTRYPOINT [ "python3", "./network-diag-app.py"]
diff --git a/network-diag-app.py b/network-diag-app.py
index 86d564f..78e74d5 100644
--- a/network-diag-app.py
+++ b/network-diag-app.py
@@ -133,7 +133,7 @@
 
 
 def do_probe(devices):
-    for imsi_id, device in devices.items():
+    for _, device in devices.items():
         if device.ip is None:
             continue
         if ping(device.ip):