diff --git a/internal/repository/job.go b/internal/repository/job.go
index 16390f2..d408341 100644
--- a/internal/repository/job.go
+++ b/internal/repository/job.go
@@ -603,12 +603,13 @@ func (r *JobRepository) UpdateEnergy(
 
 	for _, fp := range sc.EnergyFootprint {
 		if i, err := archive.MetricIndex(sc.MetricConfig, fp); err == nil {
-			// FIXME: Check for unit conversions
-			// Energy: Watts * Time // Power: Energy / Time  -> Correct labelling here?
-			if sc.MetricConfig[i].Energy == "power" {
-				// Unit: ( W * s ) / 3600 = Wh ; Rounded to 2 nearest digits
-				energy = math.Round(((LoadJobStat(jobMeta, fp, "avg")*float64(jobMeta.Duration))/3600)*100) / 100
-			} else if sc.MetricConfig[i].Energy == "energy" {
+			// Note: For DB data, calculate and save as kWh
+			// Energy: Power (in Watts) * Time (in Seconds)
+			if sc.MetricConfig[i].Energy == "energy" {
+				// Unit: ( W * s ) / 3600 / 1000 = kWh ; Rounded to 2 nearest digits
+				energy = math.Round(((LoadJobStat(jobMeta, fp, "avg")*float64(jobMeta.Duration))/3600/1000)*100) / 100
+				// Power: Use directly as sum (Or as: [Energy (in Ws) / Time (in s)]
+			} else if sc.MetricConfig[i].Energy == "power" {
 				// This assumes the metric is of aggregation type sum
 			}
 		} else {
diff --git a/web/frontend/src/job/EnergySummary.svelte b/web/frontend/src/job/EnergySummary.svelte
index 099cb57..6b8e318 100644
--- a/web/frontend/src/job/EnergySummary.svelte
+++ b/web/frontend/src/job/EnergySummary.svelte
@@ -29,8 +29,8 @@
   let carbonMass;
 
   $: if (carbonPerkWh) {
-    // (( Wh / 1000 )* g/kWh) / 1000 = kg || Rounded to 2 Digits via [ round(x * 100) / 100 ]
-    carbonMass = round( (((jobEnergy ? jobEnergy : 0.0) / 1000 ) * carbonPerkWh) / 10 ) / 100;
+    // ( kWh * g/kWh) / 1000 = kg || Rounded to 2 Digits via [ round(x * 100) / 100 ]
+    carbonMass = round( ((jobEnergy ? jobEnergy : 0.0) * carbonPerkWh) / 10 ) / 100;
   }
 </script>
 
@@ -54,7 +54,7 @@
             <Icon name="plug-fill" style="font-size: 1.5rem;"/>
           </div>
           <hr class="mt-0 mb-1"/>
-          <div class="mr-2"><b>{efp.hardware}:</b> {efp.value} Wh (<i>{efp.metric}</i>)</div>
+          <div class="mr-2"><b>{efp.hardware}:</b> {efp.value} kWh (<i>{efp.metric}</i>)</div>
         </Col>
         <Tooltip
           target={`energy-footprint-${jobId}-${efp.hardware}`}
@@ -67,7 +67,7 @@
           <Icon name="lightning-charge-fill" style="font-size: 1.5rem;"/>
         </div>
         <hr class="mt-0 mb-1"/>
-        <div><b>Total Energy:</b> {jobEnergy? jobEnergy : 0} Wh</div>
+        <div><b>Total Energy:</b> {jobEnergy? jobEnergy : 0} kWh</div>
       </Col>
       {#if carbonPerkWh}
         <Col class="text-center cursor-help" id={`energy-footprint-${jobId}-carbon`}>