diff --git a/README.md b/README.md
index 70fe12d..d79f7eb 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,7 @@ services:
     - MONITORED_CONDITIONS=status,capacity
     - BATTERY_HEALTH=1
     - TIME_REMAINING=1
+    - SHOW_UNITS=1
     volumes:
     - /sys/class/power_supply:/sys/class/power_supply:ro
     restart: unless-stopped
@@ -54,12 +55,13 @@ services:
 | `MONITORED_CONDITIONS` | (See below) | Battery properties to send to MQTT (must be a comma-separated string.) |
 | `BATTERY_HEALTH` | `1` | Set to 1 to enable battery health percentage calculation or 0 to disable. |
 | `TIME_REMAINING` | `1` | Set to 1 to enable time remaining estimate (in hours) or 0 to disable. |
+| `SHOW_UNITS` | `1` | Set to 1 to show power units in the MQTT payload or 0 to disable. |
 
 # Monitored conditions
-You can specify only those conditions that you'd like to track. The default is to track `alarm, capacity, capacity_level, present, status, and voltage_now`. You can add more conditions (found at `/sys/class/power_supply/$NAME`) or choose only those you want to track. The variable in your `docker-compose.yaml` must follow this format:
+You can specify only those conditions that you'd like to track. The default is to track `status, capacity, energy_now, energy_full, energy_full_design, power_now, voltage_now`. You can add more conditions (found at `/sys/class/power_supply/$NAME`) or choose only those you want to track. The variable in your `docker-compose.yaml` must follow this comma-separated format:
 
 ```
-alarm,capacity,capacity_level,present,status,voltage_now
+status,capacity,energy_now,energy_full,energy_full_design,power_now,voltage_now
 ```
 
 # Battery health and time remaining calculations
diff --git a/battery2mqtt.py b/battery2mqtt.py
index 6dfddd4..f074efa 100644
--- a/battery2mqtt.py
+++ b/battery2mqtt.py
@@ -10,7 +10,8 @@ MQTT_PASSWORD = os.getenv('MQTT_PASSWORD')
 MQTT_QOS = int(os.getenv('MQTT_QOS', 1))
 MQTT_TOPIC = os.getenv('MQTT_TOPIC', 'server')
 INTERVAL = int(os.getenv('INTERVAL', 60))
-MONITORED_CONDITIONS = os.environ.get('MONITORED_CONDITIONS','alarm,capacity,capacity_level,present,status,voltage_now')
+MONITORED_CONDITIONS = os.environ.get('MONITORED_CONDITIONS','status,capacity,energy_now,energy_full,energy_full_design,power_now,voltage_now')
+SHOW_UNITS = os.getenv('SHOW_UNITS', 1)
 BATTERY_HEALTH = os.getenv('BATTERY_HEALTH', 1)
 TIME_REMAINING = os.getenv('TIME_REMAINING', 1)
 
@@ -35,7 +36,17 @@ while True:
                     if name in ['alarm', 'capacity', 'cycle_count', 'online', 'present']:
                         payload[name] = int(file.read().replace('\n',''))
                     elif name.startswith('voltage') or name.startswith('energy') or name.startswith('power'):
-                        payload[name] = round(float(file.read().replace('\n','')) / 1000000,2)
+                        if name.startswith('voltage'):
+                            unit = ' V' if SHOW_UNITS == '1' else ''
+                        elif name.startswith('energy'):
+                            unit = ' Wh' if SHOW_UNITS == '1' else ''
+                        else:
+                            unit = ' W' if SHOW_UNITS == '1' else ''
+
+                        if SHOW_UNITS == '1':
+                            payload[name] = str(round(float(file.read().replace('\n','')) / 1000000,2)) + unit
+                        else:
+                            payload[name] = round(float(file.read().replace('\n','')) / 1000000,2)
                     else:
                         payload[name] = file.read().replace('\n','')
             except:
@@ -46,16 +57,23 @@ while True:
                 for name in ['energy_full_design', 'energy_full']:
                     with open(path + dir + '/' + name, 'r') as file:
                         health_calc[name] = int(file.read().replace('\n',''))
-                payload['battery_health'] = round((health_calc['energy_full'] / health_calc['energy_full_design']) * 100,2)
+                if SHOW_UNITS == '1':
+                    payload['battery_health'] = str(round((health_calc['energy_full'] / health_calc['energy_full_design']) * 100,2)) + unit
+                else:
+                    payload['battery_health'] = round((health_calc['energy_full'] / health_calc['energy_full_design']) * 100,2)
             except:
                 pass
         
         if TIME_REMAINING == '1':
+            unit = ' h' if SHOW_UNITS == '1' else ''
             try:
                 for name in ['energy_now', 'power_now']:
                     with open(path + dir + '/' + name, 'r') as file:
                         time_remaining[name] = int(file.read().replace('\n',''))
-                payload['time_remaining'] = round((time_remaining['energy_now'] / time_remaining['power_now']),2)
+                if SHOW_UNITS == '1':
+                    payload['time_remaining'] = str(round((time_remaining['energy_now'] / time_remaining['power_now']),2) if round((time_remaining['energy_now'] / time_remaining['power_now']),2) < 24 else '> 24') + unit
+                else:
+                    payload['time_remaining'] = round((time_remaining['energy_now'] / time_remaining['power_now']),2) if round((time_remaining['energy_now'] / time_remaining['power_now']),2) < 24 else '> 24'
             except:
                 pass
 
diff --git a/docker-compose.yaml b/docker-compose.yaml
index bf98730..baecc10 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -6,9 +6,13 @@
     - MQTT_PORT=1883
     - MQTT_USER=user
     - MQTT_PASSWORD=password
+    - MQTT_TOPIC=server
     - MQTT_QOS=1
     - INTERVAL=60
-    - MONITORED_CONDITIONS=status,capacity
+    - MONITORED_CONDITIONS=status,capacity,energy_now,energy_full,energy_full_design,power_now,voltage_now
+    - BATTERY_HEALTH=1
+    - TIME_REMAINING=1
+    - SHOW_UNITS=1
     volumes:
     - /sys/class/power_supply:/sys/class/power_supply:ro
     restart: unless-stopped