diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dcd48fa8..f3197089 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,8 +14,8 @@ defaults:
     shell: bash
 
 env:
-  ebeam_en: 18
-  pbeam_en: 275
+  ebeam_en: 10
+  pbeam_en: 100
   root: root -b -q
   root_no_delphes: root -b -q macro/ci/define_exclude_delphes.C 
 
@@ -139,10 +139,10 @@ jobs:
       matrix:
         include:
           # ePIC
-          - { id: epic_arches,             options: --version epic.22.11.3 --limit 20 --detector arches      } # max limit=150
-          - { id: epic_brycecanyon,        options: --version epic.22.11.3 --limit 4  --detector brycecanyon } # max limit=35
-          - { id: epic_arches_radcor,      options: --version epic.22.11.3 --limit 20 --detector arches      --radcor } # max limit=150
-          - { id: epic_brycecanyon_radcor, options: --version epic.22.11.3 --limit 4  --detector brycecanyon --radcor } # max limit=35
+          - { id: epic_arches,             options: --version epic.unstable --limit 20 --detector arches      } # max limit=150
+          - { id: epic_brycecanyon,        options: --version epic.unstable --limit 4  --detector brycecanyon } # max limit=35
+          - { id: epic_arches_radcor,      options: --version epic.unstable --limit 20 --detector arches      --radcor } # max limit=150
+          - { id: epic_brycecanyon_radcor, options: --version epic.unstable --limit 4  --detector brycecanyon --radcor } # max limit=35
           # ECCE / ATHENA
           - { id: ecce,   options: --version ecce.22.1               --limit 40 } # max limit=375
           - { id: athena, options: --version athena.deathvalley-v1.0 --limit 20 } # max limit=500
diff --git a/macro/ci/analysis_p_eta.C b/macro/ci/analysis_p_eta.C
index ed46ca77..5276a70b 100644
--- a/macro/ci/analysis_p_eta.C
+++ b/macro/ci/analysis_p_eta.C
@@ -13,7 +13,7 @@ void analysis_p_eta(
 
   // setup analysis ========================================
   Analysis *A;
-  if   (outfilePrefix.Contains("epic"))     A = new AnalysisEpic(   configFile, outfilePrefix );
+  if   (outfilePrefix.Contains("epic"))     A = new AnalysisEpicPodio(   configFile, outfilePrefix );
   else if(outfilePrefix.Contains("athena")) A = new AnalysisAthena( configFile, outfilePrefix );
   else if(outfilePrefix.Contains("ecce"))   A = new AnalysisEcce(   configFile, outfilePrefix );
 #ifndef EXCLUDE_DELPHES
diff --git a/macro/ci/analysis_single_bin.C b/macro/ci/analysis_single_bin.C
index 82740f61..5fa75320 100644
--- a/macro/ci/analysis_single_bin.C
+++ b/macro/ci/analysis_single_bin.C
@@ -13,7 +13,7 @@ void analysis_single_bin(
 
   // setup analysis ========================================
   Analysis *A;
-  if   (outfilePrefix.Contains("epic"))     A = new AnalysisEpic(   configFile, outfilePrefix );
+  if   (outfilePrefix.Contains("epic"))     A = new AnalysisEpicPodio(   configFile, outfilePrefix );
   else if(outfilePrefix.Contains("athena")) A = new AnalysisAthena( configFile, outfilePrefix );
   else if(outfilePrefix.Contains("ecce"))   A = new AnalysisEcce(   configFile, outfilePrefix );
 #ifndef EXCLUDE_DELPHES
diff --git a/macro/ci/analysis_x_q2.C b/macro/ci/analysis_x_q2.C
index 0cad1bd7..5838543f 100644
--- a/macro/ci/analysis_x_q2.C
+++ b/macro/ci/analysis_x_q2.C
@@ -13,7 +13,7 @@ void analysis_x_q2(
 
   // setup analysis ========================================
   Analysis *A;
-  if   (outfilePrefix.Contains("epic"))     A = new AnalysisEpic(   configFile, outfilePrefix );
+  if   (outfilePrefix.Contains("epic"))     A = new AnalysisEpicPodio(   configFile, outfilePrefix );
   else if(outfilePrefix.Contains("athena")) A = new AnalysisAthena( configFile, outfilePrefix );
   else if(outfilePrefix.Contains("ecce"))   A = new AnalysisEcce(   configFile, outfilePrefix );
 #ifndef EXCLUDE_DELPHES
diff --git a/macro/ci/analysis_yRatio.C b/macro/ci/analysis_yRatio.C
index c96774fb..54c4ceaf 100644
--- a/macro/ci/analysis_yRatio.C
+++ b/macro/ci/analysis_yRatio.C
@@ -13,7 +13,7 @@ void analysis_yRatio(
 
   // setup analysis ========================================
   Analysis *A;
-  if   (outfilePrefix.Contains("epic"))     A = new AnalysisEpic(   configFile, outfilePrefix );
+  if   (outfilePrefix.Contains("epic"))     A = new AnalysisEpicPodio(   configFile, outfilePrefix );
   else if(outfilePrefix.Contains("athena")) A = new AnalysisAthena( configFile, outfilePrefix );
   else if(outfilePrefix.Contains("ecce"))   A = new AnalysisEcce(   configFile, outfilePrefix );
 #ifndef EXCLUDE_DELPHES