diff --git a/src/board/system76/oryp6/board.mk b/src/board/system76/oryp6/board.mk
index 9640ffd64..3586ac5cd 100644
--- a/src/board/system76/oryp6/board.mk
+++ b/src/board/system76/oryp6/board.mk
@@ -28,10 +28,15 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=180 \
 	-DPOWER_LIMIT_DC=28
 
+# Disable fan smoothing
+CFLAGS+=-DSMOOTH_FANS=0
+
 # Don't smooth fan speed changes below 25% to mitigate buzzing
 CFLAGS+=-DSMOOTH_FANS_MIN=25
 
 # Custom fan curve
+CFLAGS+=-DBOARD_HEATUP=5
+CFLAGS+=-DBOARD_COOLDOWN=20
 CFLAGS+=-DBOARD_FAN_POINTS="\
 	FAN_POINT(55, 25), \
 	FAN_POINT(65, 30), \
@@ -44,6 +49,8 @@ CFLAGS+=-DBOARD_FAN_POINTS="\
 
 # Enable DGPU support
 CFLAGS+=-DHAVE_DGPU=1
+CFLAGS+=-DBOARD_DGPU_HEATUP=5
+CFLAGS+=-DBOARD_DGPU_COOLDOWN=20
 CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\
 	FAN_POINT(55, 25), \
 	FAN_POINT(65, 30), \
diff --git a/src/board/system76/oryp7/board.mk b/src/board/system76/oryp7/board.mk
index 9640ffd64..3586ac5cd 100644
--- a/src/board/system76/oryp7/board.mk
+++ b/src/board/system76/oryp7/board.mk
@@ -28,10 +28,15 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=180 \
 	-DPOWER_LIMIT_DC=28
 
+# Disable fan smoothing
+CFLAGS+=-DSMOOTH_FANS=0
+
 # Don't smooth fan speed changes below 25% to mitigate buzzing
 CFLAGS+=-DSMOOTH_FANS_MIN=25
 
 # Custom fan curve
+CFLAGS+=-DBOARD_HEATUP=5
+CFLAGS+=-DBOARD_COOLDOWN=20
 CFLAGS+=-DBOARD_FAN_POINTS="\
 	FAN_POINT(55, 25), \
 	FAN_POINT(65, 30), \
@@ -44,6 +49,8 @@ CFLAGS+=-DBOARD_FAN_POINTS="\
 
 # Enable DGPU support
 CFLAGS+=-DHAVE_DGPU=1
+CFLAGS+=-DBOARD_DGPU_HEATUP=5
+CFLAGS+=-DBOARD_DGPU_COOLDOWN=20
 CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\
 	FAN_POINT(55, 25), \
 	FAN_POINT(65, 30), \
diff --git a/src/board/system76/oryp8/board.mk b/src/board/system76/oryp8/board.mk
index bf22ccc9f..3b61fe380 100644
--- a/src/board/system76/oryp8/board.mk
+++ b/src/board/system76/oryp8/board.mk
@@ -31,10 +31,15 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=180 \
 	-DPOWER_LIMIT_DC=28
 
+# Disable fan smoothing
+CFLAGS+=-DSMOOTH_FANS=0
+
 # Don't smooth fan speed changes below 25% to mitigate buzzing
 CFLAGS+=-DSMOOTH_FANS_MIN=25
 
 # Custom fan curve
+CFLAGS+=-DBOARD_HEATUP=5
+CFLAGS+=-DBOARD_COOLDOWN=20
 CFLAGS+=-DBOARD_FAN_POINTS="\
 	FAN_POINT(55, 25), \
 	FAN_POINT(65, 30), \
@@ -47,6 +52,8 @@ CFLAGS+=-DBOARD_FAN_POINTS="\
 
 # Enable DGPU support
 CFLAGS+=-DHAVE_DGPU=1
+CFLAGS+=-DBOARD_DGPU_HEATUP=5
+CFLAGS+=-DBOARD_DGPU_COOLDOWN=20
 CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\
 	FAN_POINT(55, 25), \
 	FAN_POINT(65, 30), \