diff --git a/bluepyemodel/efeatures_extraction/auto_targets.py b/bluepyemodel/efeatures_extraction/auto_targets.py
index a7c3d706..acc6ef68 100644
--- a/bluepyemodel/efeatures_extraction/auto_targets.py
+++ b/bluepyemodel/efeatures_extraction/auto_targets.py
@@ -36,29 +36,32 @@
         ],
         "amplitudes": [200, 150, 250, 300],
         "efeatures": [
+            "Spikecount",
+            "depol_block_bool",
             "voltage_base",
-            "adaptation_index2",
+            "voltage_after_stim",
             "mean_frequency",
             "time_to_first_spike",
             "time_to_last_spike",
+            "inv_time_to_first_spike",
             "inv_first_ISI",
             "inv_second_ISI",
             "inv_third_ISI",
-            "inv_fourth_ISI",
-            "inv_fifth_ISI",
             "inv_last_ISI",
             "ISI_CV",
             "ISI_log_slope",
             "doublet_ISI",
-            "AP_amplitude",
-            "AP1_amp",
-            "APlast_amp",
             "AHP_depth",
             "AHP_time_from_peak",
+            "strict_burst_number",
+            "strict_burst_mean_freq",
+            "number_initial_spikes",
+            "irregularity_index",
+            "adaptation_index",
         ],
         "min_recordings_per_amplitude": 1,
         "preferred_number_protocols": 2,
-        "tolerance": 25.0,
+        "tolerance": 20.0,
     },
     "ap_waveform": {
         "protocols": [
@@ -78,39 +81,36 @@
         "efeatures": [
             "AP_amplitude",
             "AP1_amp",
-            "AP2_amp",
-            "AP_width",
             "AP_duration_half_width",
-            "AP_rise_time",
-            "AP_fall_time",
-            "AHP_depth_abs",
-            "AHP_time_from_peak",
             "AHP_depth",
         ],
         "min_recordings_per_amplitude": 1,
         "preferred_number_protocols": 1,
-        "tolerance": 25.0,
+        "tolerance": 20.0,
     },
     "iv": {
         "protocols": ["IV", "Step"],
         "amplitudes": [0, -40, -100],
         "efeatures": [
             "voltage_base",
-            "steady_state_voltage_stimend",
             "ohmic_input_resistance_vb_ssse",
-            "voltage_deflection",
-            "voltage_deflection_begin",
-            "decay_time_constant_after_stim",
-            "Spikecount",
-            "sag_ratio1",
-            "sag_ratio2",
-            "sag_amplitude",
-            "sag_time_constant",
         ],
         "min_recordings_per_amplitude": 1,
         "preferred_number_protocols": 2,
         "tolerance": 10.0,
     },
+    "validation": {
+        "protocols": ["IDhyperpol", "IDHyperpol"],
+        "amplitudes": [150, 200],
+        "efeatures": [
+            "mean_frequency",
+            "voltage_base",
+            "depol_block_bool",
+        ],
+        "min_recordings_per_amplitude": 1,
+        "preferred_number_protocols": 2,
+        "tolerance": 20.0,
+    }
 }