diff --git a/Simulation/SimuJobTransforms/python/simTrfArgs.py b/Simulation/SimuJobTransforms/python/simTrfArgs.py
index eb6d7d30ef652b67bc387cdf4db03500ecfac6df..a6aa6cc872d23f0f07dd760978055b92219bf826 100644
--- a/Simulation/SimuJobTransforms/python/simTrfArgs.py
+++ b/Simulation/SimuJobTransforms/python/simTrfArgs.py
@@ -200,6 +200,9 @@ def addCommonSimDigTrfArgs(parser):
     parser.add_argument('--jobNumber',
                         type=argFactory(argInt),
                         help='The number of this job in the current RunDependentSimulation task.', group='SimDigi')
+    parser.add_argument('--eventService',
+                        type=argFactory(argBool),
+                        help='Switch AthenaMP to the Event Service configuration', group='SimDigi')
 
 def addHITSMergeArgs(parser):
     # Use arggroup to get these arguments in their own sub-section (of --help)
diff --git a/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_ISF.py b/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_ISF.py
index a117c58a341d9b40106dc49473519e6113a141ca..11e99cb71551baacd579b47a8169119033f5f525 100644
--- a/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_ISF.py
+++ b/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_ISF.py
@@ -115,6 +115,10 @@ if hasattr(runArgs, "inputEVNT_CAVERNFile"):
 if hasattr(runArgs, "outputEVNT_CAVERNTRFile"):
     include('SimulationJobOptions/preInclude.G4WriteCavern.py')
 
+# Avoid command line preInclude for event service
+if hasattr(runArgs, "eventService") and runArgs.eventService:
+    include('AthenaMP/AthenaMP_EventService.py')
+
 from ISF_Config.ISF_jobProperties import ISF_Flags
 if jobproperties.Beam.beamType.get_Value() == 'cosmics':
     ISF_Flags.Simulator.set_Value_and_Lock('CosmicsG4')
diff --git a/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_MC12.py b/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_MC12.py
index 85952836c6ab9578a4b60ecfc9a345607539895c..2380799e4a6375ed744b42302a9b722e1c9ac730 100644
--- a/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_MC12.py
+++ b/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT_MC12.py
@@ -112,6 +112,10 @@ if hasattr(runArgs, "inputEVNT_CAVERNFile"):
     include('SimulationJobOptions/preInclude.G4ReadCavern.py')
 if hasattr(runArgs, "outputEVNT_CAVERNTRFile"):
     include('SimulationJobOptions/preInclude.G4WriteCavern.py')
+    
+# Avoid command line preInclude for event service
+if hasattr(runArgs, "eventService") and runArgs.eventService:
+    include('AthenaMP/AthenaMP_EventService.py')
 
 if jobproperties.Beam.beamType.get_Value() == 'cosmics':
     include('SimulationJobOptions/preInclude.Cosmics.py')
diff --git a/Simulation/SimuJobTransforms/share/skeleton.HITtoRDO.py b/Simulation/SimuJobTransforms/share/skeleton.HITtoRDO.py
index 72aebf9c6f51f839926cce5d3e8b93f757c4aee2..d9406d810f381bf70424daa3cf7b6317deb32d2b 100644
--- a/Simulation/SimuJobTransforms/share/skeleton.HITtoRDO.py
+++ b/Simulation/SimuJobTransforms/share/skeleton.HITtoRDO.py
@@ -342,7 +342,7 @@ if hasattr(runArgs,"doAllNoise"):
             digitizationFlags.doCaloNoise=False
             digitizationFlags.doMuonNoise=False
 
-if hasattr(runArgs,"LucidOn") or hasattr(runArgs,"ALFAOn") or hasattr(runArgs,"ZDCOn") or hasattr(runArgs,"AFPOn") or hasattr(runArgs,"FwdRegionOn"):
+if hasattr(runArgs,"LucidOn") or hasattr(runArgs,"ALFAOn") or hasattr(runArgs,"ZDCOn") or hasattr(runArgs,"AFPOn") or hasattr(runArgs,"FwdRegionOn") or hasattr(runArgs,"HGTDOn"):
     if not 'DetFlags' in dir():
         #if you configure one detflag, you're responsible for configuring them all!
         from AthenaCommon.DetFlags import DetFlags
diff --git a/Simulation/SimuJobTransforms/test/test_diffmerged b/Simulation/SimuJobTransforms/test/test_diffmerged
index 37e1b2a67aa982e3658472db087ba669d311904a..018dc325905145e7b85b3d6cc2aaf1b7e7ed0c4c 100755
--- a/Simulation/SimuJobTransforms/test/test_diffmerged
+++ b/Simulation/SimuJobTransforms/test/test_diffmerged
@@ -7,6 +7,6 @@
 ## Diff the output files from test_digi_mergeHIT and test_digi_unmergeHIT
 ## TODO: Reinstate with new input files
 
-diffPoolFiles.py mu_E50_eta0-25_${GEOMETRY}.merged.rdo.pool.root mu_E50_eta0-25_${GEOMETRY}.unmerged.rdo.pool.root | \
+skip_if_AthSimulation.sh diffPoolFiles.py mu_E50_eta0-25_${GEOMETRY}.merged.rdo.pool.root mu_E50_eta0-25_${GEOMETRY}.unmerged.rdo.pool.root | \
     sed 's/\[ERR\]\(.*\)POOLContainer_DataHeaderForm$/\[WARN\]\1POOLContainer_DataHeaderForm/g' | \
     sed 's/## Comparison : \[ERR\]/## Comparison : \[WARN\]/g'
diff --git a/Simulation/SimuJobTransforms/test/test_digi_mergeHIT b/Simulation/SimuJobTransforms/test/test_digi_mergeHIT
index 46b151bfa55252c935a16d75e0f23c3436d1f23c..2c0b754677ddfcf557e4de2066ab172b9ca3eb85 100755
--- a/Simulation/SimuJobTransforms/test/test_digi_mergeHIT
+++ b/Simulation/SimuJobTransforms/test/test_digi_mergeHIT
@@ -29,6 +29,6 @@ if [[ $? -ne 0 ]]; then
   echo "ERROR: $TRF not found"
   exit 2
 fi
-cmd="$TRF --inputHITSFile=$INPUTFILE --outputRDOFile=$RDOFILE --maxEvents=2 --skipEvents=11 --geometryVersion=$GEOMETRY --digiSeedOffset1=$DIGIOFFSET1 --digiSeedOffset2=$DIGIOFFSET2 --conditionsTag=$IOVDBGLOBALTAG --DataRunNumber $DATARUNNUMBER $ARGS"
+cmd="skip_if_AthSimulation.sh $TRF --inputHITSFile=$INPUTFILE --outputRDOFile=$RDOFILE --maxEvents=2 --skipEvents=11 --geometryVersion=$GEOMETRY --digiSeedOffset1=$DIGIOFFSET1 --digiSeedOffset2=$DIGIOFFSET2 --conditionsTag=$IOVDBGLOBALTAG --DataRunNumber $DATARUNNUMBER $ARGS"
 echo $cmd
 $cmd
diff --git a/Simulation/SimuJobTransforms/test/test_digi_mu b/Simulation/SimuJobTransforms/test/test_digi_mu
index a61eecd1708a23f9fa0c20af7cb526f3fc9cc8ff..a0516c6960ddb4b9336b6df18b8e491f92af2145 100755
--- a/Simulation/SimuJobTransforms/test/test_digi_mu
+++ b/Simulation/SimuJobTransforms/test/test_digi_mu
@@ -29,6 +29,6 @@ if [[ $? -ne 0 ]]; then
   echo "ERROR: $TRF not found"
   exit 2
 fi
-cmd="$TRF --inputHITSFile=$INPUTFILE --outputRDOFile=$RDOFILE --maxEvents=5 --skipEvents=0 --geometryVersion=$GEOMETRY --digiSeedOffset1=$DIGIOFFSET1 --digiSeedOffset2=$DIGIOFFSET2 --conditionsTag=$IOVDBGLOBALTAG --DataRunNumber $DATARUNNUMBER $@"
+cmd="skip_if_AthSimulation.sh $TRF --inputHITSFile=$INPUTFILE --outputRDOFile=$RDOFILE --maxEvents=5 --skipEvents=0 --geometryVersion=$GEOMETRY --digiSeedOffset1=$DIGIOFFSET1 --digiSeedOffset2=$DIGIOFFSET2 --conditionsTag=$IOVDBGLOBALTAG --DataRunNumber $DATARUNNUMBER $@"
 echo $cmd
 $cmd
diff --git a/Simulation/SimuJobTransforms/test/test_digi_unmergeHIT b/Simulation/SimuJobTransforms/test/test_digi_unmergeHIT
index 63aed65cca7c3dbdb379da07a41f89a784dfd493..fd62f5efcf2bcb0373ac57f06bb753462f807ed1 100755
--- a/Simulation/SimuJobTransforms/test/test_digi_unmergeHIT
+++ b/Simulation/SimuJobTransforms/test/test_digi_unmergeHIT
@@ -31,6 +31,6 @@ if [[ $? -ne 0 ]]; then
   echo "ERROR: $TRF not found"
   exit 2
 fi
-cmd="$TRF --inputHITSFile=$INPUTLIST --outputRDOFile=$RDOFILE --maxEvents=2 --skipEvents=11 --geometryVersion=$GEOMETRY --digiSeedOffset1=$DIGIOFFSET1 --digiSeedOffset2=$DIGIOFFSET2 --conditionsTag=$IOVDBGLOBALTAG --DataRunNumber $DATARUNNUMBER $ARGS"
+cmd="skip_if_AthSimulation.sh $TRF --inputHITSFile=$INPUTLIST --outputRDOFile=$RDOFILE --maxEvents=2 --skipEvents=11 --geometryVersion=$GEOMETRY --digiSeedOffset1=$DIGIOFFSET1 --digiSeedOffset2=$DIGIOFFSET2 --conditionsTag=$IOVDBGLOBALTAG --DataRunNumber $DATARUNNUMBER $ARGS"
 echo $cmd
 $cmd
diff --git a/Simulation/SimuJobTransforms/test/test_pileup b/Simulation/SimuJobTransforms/test/test_pileup
index e299965f29afaa8a9b56d9b6a26a9d01ca639f8c..36ebf396d33e6f1ede8e743f5b5fe580d1c63436 100755
--- a/Simulation/SimuJobTransforms/test/test_pileup
+++ b/Simulation/SimuJobTransforms/test/test_pileup
@@ -21,7 +21,7 @@ LUMI=Test
 DBRELEASETARBALL=NONE
 
 MINBIASFILE=$TESTDATA/minbias_Inelastic-pythia8-7000_${GEOMETRY}.hits.pool.root
-CAVERNFILE=$TESTDATA/cavernbg-pythia8-7000_${GEOMETRY}.hits.pool.root
+#CAVERNFILE=$TESTDATA/cavernbg-pythia8-7000_${GEOMETRY}.hits.pool.root
 
 TRF=Digi_tf.py
 which $TRF
@@ -29,6 +29,6 @@ if [[ $? -ne 0 ]]; then
   echo "ERROR: $TRF not found"
   exit 2
 fi
-cmd="$TRF --inputHITSFile $INPUTFILE --outputRDOFile $RDOFILE --maxEvents 10 --skipEvents 0 --geometryVersion $GEOMETRY --digiSeedOffset1 $DIGIOFFSET1 --digiSeedOffset2 $DIGIOFFSET2 --inputLowPtMinbiasHitsFile $MINBIASFILE --inputCavernHitsFile $CAVERNFILE --numberOfCavernBkg 1 --numberOfLowPtMinBias 1.0 --bunchSpacing 450 --pileupInitialBunch -1 --pileupFinalBunch 1 --conditionsTag $IOVDBGLOBALTAG --DataRunNumber $DATARUNNUMBER $ARGS"
+cmd="skip_if_AthSimulation.sh $TRF --inputHITSFile $INPUTFILE --outputRDOFile $RDOFILE --maxEvents 10 --skipEvents 0 --geometryVersion $GEOMETRY --digiSeedOffset1 $DIGIOFFSET1 --digiSeedOffset2 $DIGIOFFSET2 --inputLowPtMinbiasHitsFile $MINBIASFILE --numberOfLowPtMinBias 1.0 --bunchSpacing 450 --pileupInitialBunch -1 --pileupFinalBunch 1 --conditionsTag $IOVDBGLOBALTAG --DataRunNumber $DATARUNNUMBER $ARGS"
 echo $cmd
 $cmd