diff --git a/configfiles/EventBuilderV2/PhaseIIADCHitFinderConfig b/configfiles/EventBuilderV2/PhaseIIADCHitFinderConfig
index 991f5d222..c736dbb2a 100644
--- a/configfiles/EventBuilderV2/PhaseIIADCHitFinderConfig
+++ b/configfiles/EventBuilderV2/PhaseIIADCHitFinderConfig
@@ -3,7 +3,7 @@ verbosity 0
 UseLEDWaveforms 0
 
 PulseFindingApproach threshold
-PulseWindowType Fixed_2023_Gains
+PulseWindowType NoDoubleHits
 DefaultADCThreshold 7
 DefaultThresholdType relative
 
diff --git a/configfiles/EventBuilderV2_AmBe/PhaseIIADCHitFinderConfig b/configfiles/EventBuilderV2_AmBe/PhaseIIADCHitFinderConfig
index 991f5d222..c736dbb2a 100644
--- a/configfiles/EventBuilderV2_AmBe/PhaseIIADCHitFinderConfig
+++ b/configfiles/EventBuilderV2_AmBe/PhaseIIADCHitFinderConfig
@@ -3,7 +3,7 @@ verbosity 0
 UseLEDWaveforms 0
 
 PulseFindingApproach threshold
-PulseWindowType Fixed_2023_Gains
+PulseWindowType NoDoubleHits
 DefaultADCThreshold 7
 DefaultThresholdType relative
 
diff --git a/configfiles/EventBuilderV2_LED/PhaseIIADCHitFinderConfig b/configfiles/EventBuilderV2_LED/PhaseIIADCHitFinderConfig
index 991f5d222..c736dbb2a 100644
--- a/configfiles/EventBuilderV2_LED/PhaseIIADCHitFinderConfig
+++ b/configfiles/EventBuilderV2_LED/PhaseIIADCHitFinderConfig
@@ -3,7 +3,7 @@ verbosity 0
 UseLEDWaveforms 0
 
 PulseFindingApproach threshold
-PulseWindowType Fixed_2023_Gains
+PulseWindowType NoDoubleHits
 DefaultADCThreshold 7
 DefaultThresholdType relative
 
diff --git a/configfiles/EventBuilderV2_cosmic/PhaseIIADCHitFinderConfig b/configfiles/EventBuilderV2_cosmic/PhaseIIADCHitFinderConfig
index 991f5d222..c736dbb2a 100644
--- a/configfiles/EventBuilderV2_cosmic/PhaseIIADCHitFinderConfig
+++ b/configfiles/EventBuilderV2_cosmic/PhaseIIADCHitFinderConfig
@@ -3,7 +3,7 @@ verbosity 0
 UseLEDWaveforms 0
 
 PulseFindingApproach threshold
-PulseWindowType Fixed_2023_Gains
+PulseWindowType NoDoubleHits
 DefaultADCThreshold 7
 DefaultThresholdType relative
 
diff --git a/configfiles/EventBuilderV2_laser/PhaseIIADCHitFinderConfig b/configfiles/EventBuilderV2_laser/PhaseIIADCHitFinderConfig
index 991f5d222..c736dbb2a 100644
--- a/configfiles/EventBuilderV2_laser/PhaseIIADCHitFinderConfig
+++ b/configfiles/EventBuilderV2_laser/PhaseIIADCHitFinderConfig
@@ -3,7 +3,7 @@ verbosity 0
 UseLEDWaveforms 0
 
 PulseFindingApproach threshold
-PulseWindowType Fixed_2023_Gains
+PulseWindowType NoDoubleHits
 DefaultADCThreshold 7
 DefaultThresholdType relative
 
diff --git a/configfiles/PMTWaveformSim/PhaseIIADCHitFinderConfig b/configfiles/PMTWaveformSim/PhaseIIADCHitFinderConfig
index d7df3353e..bfb8a97da 100644
--- a/configfiles/PMTWaveformSim/PhaseIIADCHitFinderConfig
+++ b/configfiles/PMTWaveformSim/PhaseIIADCHitFinderConfig
@@ -3,7 +3,7 @@ verbosity 0
 UseLEDWaveforms 0
 
 PulseFindingApproach threshold
-PulseWindowType Fixed_2023_Gains
+PulseWindowType NoDoubleHits
 DefaultADCThreshold 7
 DefaultThresholdType relative