diff --git a/modules/EvseManager/CarManufacturer.cpp b/modules/EvseManager/CarManufacturer.cpp
index a530d090c..e3d441d9e 100644
--- a/modules/EvseManager/CarManufacturer.cpp
+++ b/modules/EvseManager/CarManufacturer.cpp
@@ -1,16 +1,37 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright 2020 - 2022 Pionix GmbH and Contributors to EVerest
 #include "CarManufacturer.hpp"
+#include <set>
 
 namespace module {
 
 types::evse_manager::CarManufacturer get_manufacturer_from_mac(const std::string& mac) {
-    if (mac.size() < 8)
+    // Tesla OUIs according to http://standards-oui.ieee.org/oui.txt
+    const std::set<std::string> tesla = {
+        "0C:29:8F",
+        "4C:FC:AA",
+        "54:F8:F0",
+        "98:ED:5C",
+    };
+
+    if (mac.size() < 8) {
         return types::evse_manager::CarManufacturer::Unknown;
-    if (mac.substr(0, 8) == "00:7D:FA")
+    }
+
+    if (mac.substr(0, 8) == "00:7D:FA") {
         return types::evse_manager::CarManufacturer::VolkswagenGroup;
-    if (mac.substr(0, 8) == "98:ED:5C")
+    }
+
+    if (tesla.count(mac.substr(0, 8)) > 0) {
         return types::evse_manager::CarManufacturer::Tesla;
+    }
+
+    // Tesla also acquired a /28 sub-range, let's have a dedicated check for this
+    // https://mac.lc/address/DC:44:27
+    if (mac.substr(0, 10) == "DC:44:27:1") {
+        return types::evse_manager::CarManufacturer::Tesla;
+    }
+
     return types::evse_manager::CarManufacturer::Unknown;
 }
 
diff --git a/modules/EvseManager/CarManufacturer.hpp b/modules/EvseManager/CarManufacturer.hpp
index cdbe515aa..81a0de2f8 100644
--- a/modules/EvseManager/CarManufacturer.hpp
+++ b/modules/EvseManager/CarManufacturer.hpp
@@ -12,7 +12,8 @@
 
  used for mapping:
 
- Tesla: 98:ED:5C
+ Tesla: 0C:29:8F, 4C:FC:AA, 54:F8:F0, 98:ED:5C,
+        DC:44:27:1x:xx:xx/28
  VW: 00:7D:FA (used for all brands such as Skoda as well)
 
  not used here since they might be in use in multiple cars: