diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4c9843953aedfea314e7996b98c26f44531b52e1..77c6f8da06e2ebec97015907135231a53e91585e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ build_image:
     - mkdir build
     - cd build
     - set +e && source ${ATLAS_LOCAL_ROOT_BASE}/user/atlasLocalSetup.sh; set -e
-    - set +e && asetup --input=../../calypso/asetup.faser master,latest,Athena; set -e
+    - set +e && asetup --input=../../calypso/asetup.faser Athena,22.0.18; set -e
     - cmake ../../calypso
     - make -j 3
   artifacts:
diff --git a/Control/CalypsoExample/SimHitExample/src/SimHitAlg.cxx b/Control/CalypsoExample/SimHitExample/src/SimHitAlg.cxx
index 9a7180228e31e5fd4b424b1b08d6fa228aa56b75..b36f7a61da7f946aa783aa7a2fa6ed4ce39d7e68 100644
--- a/Control/CalypsoExample/SimHitExample/src/SimHitAlg.cxx
+++ b/Control/CalypsoExample/SimHitExample/src/SimHitAlg.cxx
@@ -18,8 +18,12 @@ StatusCode SimHitAlg::initialize()
     ATH_CHECK(histSvc()->regHist("/HIST/modulesSide1", m_moduleSide1));
     ATH_CHECK(histSvc()->regHist("/HIST/modulesSide2", m_moduleSide2));
 
-    m_plate = new TH2D("plate", "Scint Hit Plate", 3, -1, 1, 4, 0, 1 );
-    ATH_CHECK(histSvc()->regHist("/HIST/plates", m_plate));
+    m_plate_preshower = new TH2D("plate", "Scint Hit Plate", 3, -1, 1, 4, 0, 1 );
+    m_plate_trigger = new TH2D("plate", "Scint Hit Plate", 3, -1, 1, 4, 0, 1 );
+    m_plate_veto = new TH2D("plate", "Scint Hit Plate", 3, -1, 1, 4, 0, 1 );
+    ATH_CHECK(histSvc()->regHist("/HIST/plate_preshower", m_plate_preshower));
+    ATH_CHECK(histSvc()->regHist("/HIST/plate_trigger", m_plate_trigger));
+    ATH_CHECK(histSvc()->regHist("/HIST/plate_veto", m_plate_veto));
 
     // initialize data handle keys
     ATH_CHECK( m_mcEventKey.initialize() );
@@ -97,7 +101,7 @@ StatusCode SimHitAlg::execute()
         {
             hit.print();
             m_hist->Fill(hit.energyLoss());
-            m_plate->Fill(hit.getStation(),hit.getPlate());
+            m_plate_preshower->Fill(hit.getStation(),hit.getPlate(),hit.energyLoss());
 
         }
     }
@@ -107,7 +111,7 @@ StatusCode SimHitAlg::execute()
         {
             hit.print();
             m_hist->Fill(hit.energyLoss());
-            m_plate->Fill(hit.getStation(),hit.getPlate());
+            m_plate_trigger->Fill(hit.getStation(),hit.getPlate(),hit.energyLoss());
 
         }
     }
@@ -117,7 +121,7 @@ StatusCode SimHitAlg::execute()
         {
             hit.print();
             m_hist->Fill(hit.energyLoss());
-            m_plate->Fill(hit.getStation(),hit.getPlate());
+            m_plate_veto->Fill(hit.getStation(),hit.getPlate(),hit.energyLoss());
 
         }
     }
diff --git a/Control/CalypsoExample/SimHitExample/src/SimHitAlg.h b/Control/CalypsoExample/SimHitExample/src/SimHitAlg.h
index 2683ec99e1b4e3bdb56001d93d6067899bd88fd6..773fc3171f7821193b3d18186401939206194743 100644
--- a/Control/CalypsoExample/SimHitExample/src/SimHitAlg.h
+++ b/Control/CalypsoExample/SimHitExample/src/SimHitAlg.h
@@ -25,7 +25,9 @@ class SimHitAlg : public AthHistogramAlgorithm
     TH2* m_moduleSide2;
 
     //ScintHit Histograms
-    TH2* m_plate;
+    TH2* m_plate_preshower;
+    TH2* m_plate_trigger;
+    TH2* m_plate_veto;
 
     // Read handle keys for data containers
     // Any other event data can be accessed identically