diff --git a/src/board/system76/galp3-c/acpi.c b/src/board/system76/galp3-c/acpi.c
index cb9ea63..0dfe748 100644
--- a/src/board/system76/galp3-c/acpi.c
+++ b/src/board/system76/galp3-c/acpi.c
@@ -28,6 +28,8 @@ uint8_t acpi_read(uint8_t addr) {
         ACPI_16(0x10, peci_offset);
         ACPI_16(0x12, peci_temp);
         ACPI_8 (0x14, peci_duty);
+        ACPI_8 (0x15, peci_tcontrol);
+        ACPI_8 (0x16, peci_tjmax);
     }
 
     DEBUG("acpi_read %02X = %02X\n", addr, data);
diff --git a/src/board/system76/galp3-c/include/board/peci.h b/src/board/system76/galp3-c/include/board/peci.h
index b7e1db3..a71c04b 100644
--- a/src/board/system76/galp3-c/include/board/peci.h
+++ b/src/board/system76/galp3-c/include/board/peci.h
@@ -6,6 +6,8 @@
 extern int16_t peci_offset;
 extern int16_t peci_temp;
 extern uint8_t peci_duty;
+extern uint8_t peci_tcontrol;
+extern uint8_t peci_tjmax;
 
 void peci_event(void);
 
diff --git a/src/board/system76/galp3-c/peci.c b/src/board/system76/galp3-c/peci.c
index 6d82935..6d075ae 100644
--- a/src/board/system76/galp3-c/peci.c
+++ b/src/board/system76/galp3-c/peci.c
@@ -1,13 +1,70 @@
+#include <stdbool.h>
+
 #include <board/peci.h>
 #include <common/debug.h>
 #include <ec/pwm.h>
 
+// Tjunction = 100C for i7-8565U (and probably the same for all WHL-U)
+#define T_JUNCTION 100
+
 int16_t peci_offset = 0;
 int16_t peci_temp = 0;
 uint8_t peci_duty = 0;
+uint8_t peci_tcontrol = 0;
+uint8_t peci_tjmax = T_JUNCTION;
+static bool peci_config_loaded = false;
+
+#define PECI_TEMP(X) (((int16_t)(X)) << 6)
+
+// Read tjmax using index 16 of RdPkgConfig
+static void peci_config(void) {
+    // Wait for completion
+    while (HOSTAR & 1) {}
+    // Clear status
+    HOSTAR  = HOSTAR;
+
+    // Enable PECI, clearing data fifo's
+    HOCTLR = (1 << 5) | (1 << 3);
+    // Set address to default
+    HOTRADDR = 0x30;
+    // Set write length
+    HOWRLR = 5;
+    // Set read length
+    HORDLR = 5;
+    // Set command
+    HOCMDR = 0xA1;
+    // Set Host ID ?
+    HOWRDR = 0x00;
+    // Set index
+    HOWRDR = 16;
+    // Set parameter
+    HOWRDR = 0;
+    HOWRDR = 0;
+    // Start transaction
+    HOCTLR |= 1;
+
+    // Wait for completion
+    while (HOSTAR & 1) {}
+
+    if (HOSTAR & (1 << 1)) {
+        // Use result if finished successfully
+
+        //TODO: check completion code
+        uint8_t data = HOWRDR;
+
+        // Throw away reserved byte
+        data = HOWRDR;
+        // Tead tcontrol for now
+        peci_tcontrol = HOWRDR;
+        // Read tjmax
+        peci_tjmax = HOWRDR;
+        // Throw away reserved byte
+        data = HOWRDR;
+
+        peci_config_loaded = true;
+    }
+}
 
-// Tjunction = 100C for i7-8565U (and probably the same for all WHL-U)
-#define T_JUNCTION 10000
 
 // PECI information can be found here: https://www.intel.com/content/dam/www/public/us/en/documents/design-guides/core-i7-lga-2011-guide.pdf
 void peci_event(void) {
@@ -16,6 +73,7 @@ void peci_event(void) {
     // Clear status
     HOSTAR = HOSTAR;
 
+
     // Enable PECI, clearing data fifo's
     HOCTLR = (1 << 5) | (1 << 3);
     // Set address to default
@@ -37,26 +95,33 @@ void peci_event(void) {
         uint8_t low = HORDDR;
         uint8_t high = HORDDR;
         peci_offset = ((int16_t)high << 8) | (int16_t)low;
-        peci_temp = T_JUNCTION + peci_offset;
+
+        // TODO: Update max value if possible
+        // if (!peci_config_loaded) {
+        //     peci_config();
+        // }
+
+        // TODO: tjmax
+        peci_temp = PECI_TEMP(T_JUNCTION) + peci_offset;
 
         // Set fan based on temp, adapted from
         // https://github.com/pop-os/system76-power/blob/master/src/fan.rs#L218
-        if (peci_temp >= 9000) {
+        if (peci_temp >= PECI_TEMP(90)) {
             // 90C = 100%
             peci_duty = 255;
-        } else if (peci_temp >= 8000) {
+        } else if (peci_temp >= PECI_TEMP(80)) {
             // 80C = 50%
             peci_duty = 128;
-        } else if (peci_temp >= 7500) {
+        } else if (peci_temp >= PECI_TEMP(75)) {
             // 75C = 45%
             peci_duty = 115;
-        } else if (peci_temp >= 6500) {
+        } else if (peci_temp >= PECI_TEMP(65)) {
             // 65C = 40%
             peci_duty = 102;
-        } else if (peci_temp >= 5500) {
+        } else if (peci_temp >= PECI_TEMP(55)) {
             // 55C = 35%
             peci_duty = 90;
-        } else if (peci_temp >= 4500) {
+        } else if (peci_temp >= PECI_TEMP(45)) {
             // 45C = 30%
             peci_duty = 77;
         } else {