diff --git a/docker/Keystone/Dockerfile b/docker/Keystone/Dockerfile
index 9163562..263716a 100644
--- a/docker/Keystone/Dockerfile
+++ b/docker/Keystone/Dockerfile
@@ -21,25 +21,12 @@
     rm -rf /var/lib/apt/lists/* && \
     chmod +x start.sh
 
-# DB Hostname
-ENV DB_HOST                 keystone-db
+ENV DB_HOST                 keystone-db     # DB Hostname
+ENV DB_PORT                 3306            # DB Port
+ENV ROOT_DB_USER            root            # DB Root User
+ENV ROOT_DB_PASSWORD        admin           # DB Root Password
+ENV KEYSTONE_DB_PASSWORD    admin           # Keystone user password
+ENV ADMIN_PASSWORD          admin           # Admin password
+ENV NBI_PASSWORD            nbi             # NBI password
 
-# DB Port
-ENV DB_PORT                 3306
-
-# DB Root User
-ENV ROOT_DB_USER            root
-
-# DB Root Password
-ENV ROOT_DB_PASSWORD        admin
-
-# Keystone user password
-ENV KEYSTONE_DB_PASSWORD    admin
-
-# Admin password
-ENV ADMIN_PASSWORD          admin
-
-# NBI password
-ENV NBI_PASSWORD            nbi
-
-ENTRYPOINT ./start.sh
\ No newline at end of file
+ENTRYPOINT ./start.sh