diff --git a/lib/AmsMqttHandler/include/AmsMqttHandler.h b/lib/AmsData/include/AmsMqttHandler.h
similarity index 100%
rename from lib/AmsMqttHandler/include/AmsMqttHandler.h
rename to lib/AmsData/include/AmsMqttHandler.h
diff --git a/lib/HomeAssistantMqttHandler/src/HomeAssistantMqttHandler.cpp b/lib/HomeAssistantMqttHandler/src/HomeAssistantMqttHandler.cpp
index 80ef0012..2629b65f 100644
--- a/lib/HomeAssistantMqttHandler/src/HomeAssistantMqttHandler.cpp
+++ b/lib/HomeAssistantMqttHandler/src/HomeAssistantMqttHandler.cpp
@@ -280,7 +280,11 @@ bool HomeAssistantMqttHandler::publishSystem(HwTools* hw, EntsoeApi* eapi, Energ
             String uom = String(sensor.uom);
             if(strncmp(sensor.devcl, "monetary", 8) == 0) {
                 if(eapi == NULL) continue;
-                uom = String(eapi->getCurrency());
+                if(strncmp(sensor.path, "prices", 5) == 0) {
+                    uom = String(eapi->getCurrency()) + "/kWh";
+                } else {
+                    uom = String(eapi->getCurrency());
+                }
             }
             if(strncmp(sensor.path, "peaks[", 6) == 0) {
                 if(peaks >= peakCount) continue;
diff --git a/platformio.ini b/platformio.ini
index 132d0bb5..627f9b0a 100755
--- a/platformio.ini
+++ b/platformio.ini
@@ -2,7 +2,7 @@
 extra_configs = platformio-user.ini
 
 [common]
-lib_deps = EEPROM, LittleFS, DNSServer, 256dpi/MQTT@2.5.0, OneWireNg@0.10.0, DallasTemperature@3.9.1, EspSoftwareSerial@6.14.1, https://github.com/gskjold/RemoteDebug.git, Time@1.6.1, Timezone@1.2.4, AmsConfiguration, AmsData, AmsDataStorage, HwTools, Uptime, AmsDecoder, EntsoePriceApi, EnergyAccounting, AmsMqttHandler, RawMqttHandler, JsonMqttHandler, DomoticzMqttHandler, HomeAssistantMqttHandler, SvelteUi
+lib_deps = EEPROM, LittleFS, DNSServer, 256dpi/MQTT@2.5.0, OneWireNg@0.10.0, DallasTemperature@3.9.1, EspSoftwareSerial@6.14.1, https://github.com/gskjold/RemoteDebug.git, Time@1.6.1, Timezone@1.2.4, AmsConfiguration, AmsData, AmsDataStorage, HwTools, Uptime, AmsDecoder, EntsoePriceApi, EnergyAccounting, RawMqttHandler, JsonMqttHandler, DomoticzMqttHandler, HomeAssistantMqttHandler, SvelteUi
 lib_ignore = OneWire
 extra_scripts =
     pre:scripts/addversion.py