diff --git a/CLI/actioner/sonic-cli-pfm.py b/CLI/actioner/sonic-cli-pfm.py
index d681ecf1c2..055ae0245b 100755
--- a/CLI/actioner/sonic-cli-pfm.py
+++ b/CLI/actioner/sonic-cli-pfm.py
@@ -107,12 +107,12 @@ def format_env_data(content):
                     psu['index'] = sensor['index']
                     psu['presence'] = sensor['presence']
                     psu['status'] = sensor['status']
-                    psu['Input Voltage'] = sensor['input_voltage']
-                    psu['Input Power'] = sensor['input_power']
-                    psu['Input Current'] =  sensor['input_current']
-                    psu['Output Current'] = sensor['output_current']
-                    psu['Output Power'] = sensor['output_power']
-                    psu['Output Voltage'] = sensor['output_voltage']
+                    psu['Input Voltage'] = sensor['input_voltage'] + " Volts"
+                    psu['Input Power'] = sensor['input_power'] + " Watts"
+                    psu['Input Current'] =  sensor['input_current'] + " Amps"
+                    psu['Output Current'] = sensor['output_current'] + " Amps"
+                    psu['Output Power'] = sensor['output_power'] + " Watts"
+                    psu['Output Voltage'] = sensor['output_voltage'] + " Volts"
                     psus[sensor['name']] = psu
             elif slist_key == 'TEMPERATURE_INFO_LIST':
                 for sensor in sensor_list:
@@ -121,10 +121,12 @@ def format_env_data(content):
                     temps[sensor['name']] = temp
 
     for name in psus.keys():
-        psus[name]['AF Temperature'] = temps[name + ' AF Temp']['temperature']
-        psus[name]['Mid Temperature'] = temps[name + ' Mid Temp']['temperature']
-        psus[name]['Rear Temperature'] = temps[name + ' Rear Temp']['temperature']
-        psus[name]['FAN RPM'] = psufans[psus[name]['index'] + ' FAN 1']['speed']
+        for snc in temps:
+            if snc.startswith(name):
+                nmlist = snc.split(" ")
+                tname = ' '.join(nmlist[1:]) + " Temperature"
+                psus[name][tname] = temps[snc]['temperature'] + " degrees C"
+        psus[name]['FAN RPM'] = psufans[psus[name]['index'] + ' FAN 1']['speed'] + " RPM"
         if psufans[psus[name]['index'] + ' FAN 1']['direction'] == 'exhaust':
             psus[name]['Airflow'] = 'Exhaust'
         else:
diff --git a/CLI/renderer/templates/platform_env_show.j2 b/CLI/renderer/templates/platform_env_show.j2
index 6ce0edc505..e64a5b4099 100755
--- a/CLI/renderer/templates/platform_env_show.j2
+++ b/CLI/renderer/templates/platform_env_show.j2
@@ -21,17 +21,12 @@ PSUs :
     {{ name}}              : NOT OK
     {% else %}
     {{ name }} :
-        Input Voltage      : {{psu['Input Voltage']}} Volts
-        Input Power        : {{psu['Input Power']}} Watts
-        Input Current      : {{psu['Input Current']}} Amps
-        Output Voltage     : {{psu['Output Voltage']}} Volts
-        Output Power       : {{psu['Output Power']}} Watts
-        Output Current     : {{psu['Output Current']}} Amps
-        AF Temperature     : {{psu['AF Temperature']}} degrees C
-        Rear Temperature   : {{psu['Rear Temperature']}} degrees C
-        Mid Temperature    : {{psu['Mid Temperature']}} degrees C
-        Airflow            : {{psu['Airflow']}}
-        FAN RPM            : {{psu['FAN RPM']}} RPM
+        {% for id, nm in psu.items()  %}
+        {% if id == 'index' or id == 'presence' or id == 'status' %}
+        {% continue %}
+        {% endif %}
+        {{ '%-22s'|format(id) }} : {{ '%-22s'|format(nm) }}
+        {% endfor %}
     {% endif %}      
 {% endfor %}