diff --git a/frc971/control_loops/drivetrain/drivetrain.cc b/frc971/control_loops/drivetrain/drivetrain.cc
index 66a3dcd..4b36714 100644
--- a/frc971/control_loops/drivetrain/drivetrain.cc
+++ b/frc971/control_loops/drivetrain/drivetrain.cc
@@ -28,6 +28,11 @@
 namespace control_loops {
 namespace drivetrain {
 
+namespace {
+// Maximum variation to allow in the gyro when zeroing.
+constexpr double kMaxYawGyroZeroingRange = 0.05;
+}
+
 DrivetrainFilters::DrivetrainFilters(const DrivetrainConfig<double> &dt_config,
                                      ::aos::EventLoop *event_loop,
                                      LocalizerInterface *localizer)
@@ -204,9 +209,27 @@
       break;
   }
 
-  ready_ = dt_config_.gyro_type == GyroType::SPARTAN_GYRO ||
-           dt_config_.gyro_type == GyroType::FLIPPED_SPARTAN_GYRO ||
-           imu_zeroer_.Zeroed();
+  switch (dt_config_.gyro_type) {
+    case GyroType::SPARTAN_GYRO:
+    case GyroType::FLIPPED_SPARTAN_GYRO:
+      if (!yaw_gyro_zero_.has_value()) {
+        yaw_gyro_zeroer_.AddData(last_gyro_rate_);
+        if (yaw_gyro_zeroer_.GetRange() < kMaxYawGyroZeroingRange) {
+          yaw_gyro_zero_ = yaw_gyro_zeroer_.GetAverage()(0);
+        }
+      }
+      ready_ = yaw_gyro_zero_.has_value();
+      if (ready_) {
+        last_gyro_rate_ = last_gyro_rate_ - yaw_gyro_zero_.value();
+      }
+      break;
+    case GyroType::IMU_X_GYRO:
+    case GyroType::IMU_Y_GYRO:
+    case GyroType::IMU_Z_GYRO:
+    case GyroType::FLIPPED_IMU_Z_GYRO:
+      ready_ = imu_zeroer_.Zeroed();
+      break;
+  }
 
   // TODO(james): How aggressively can we fault here? If we fault to
   // aggressively, we might have issues during startup if wpilib_interface takes
diff --git a/frc971/control_loops/drivetrain/drivetrain.h b/frc971/control_loops/drivetrain/drivetrain.h
index 52ae605..a06b965 100644
--- a/frc971/control_loops/drivetrain/drivetrain.h
+++ b/frc971/control_loops/drivetrain/drivetrain.h
@@ -138,6 +138,9 @@
   // Last applied voltage.
   Eigen::Matrix<double, 2, 1> last_voltage_;
   Eigen::Matrix<double, 2, 1> last_last_voltage_;
+
+  std::optional<double> yaw_gyro_zero_;
+  zeroing::Averager<double, 200> yaw_gyro_zeroer_;
 };
 
 class DrivetrainLoop