diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py
index 3b5a0460b8b42311ffee5a7de7195f76181dcee3..bc67fe4c250096f45ade36f66bdd43823aa940cf 100644
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py
+++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py
@@ -678,6 +678,7 @@ augStream = MSMgr.GetStream( streamName )
 evtStream = augStream.GetEventStream()
 
 excludedAuxData = "-caloExtension.-cellAssociation.-clusterAssociation.-trackParameterCovarianceMatrices.-parameterX.-parameterY.-parameterZ.-parameterPX.-parameterPY.-parameterPZ.-parameterPosition"
+excludedVtxAuxData = "-vxTrackAtVertex.-MvfFitInfo.-isInitialized.-VTAV"
 
 # Add generic event information
 IDTRKVALIDStream.AddItem("xAOD::EventInfo#*")
@@ -696,7 +697,7 @@ if makeSplitTracks:
 
 # Add vertices
 IDTRKVALIDStream.AddItem("xAOD::VertexContainer#PrimaryVertices")
-IDTRKVALIDStream.AddItem("xAOD::VertexAuxContainer#PrimaryVerticesAux.-vxTrackAtVertex")
+IDTRKVALIDStream.AddItem("xAOD::VertexAuxContainer#PrimaryVerticesAux."+excludedVtxAuxData)
 
 # Add links and measurements
 IDTRKVALIDStream.AddItem("xAOD::TrackStateValidationContainer#*")
diff --git a/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py b/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
index 4039b59ef23aa74c65e2c16735f78689945cb932..b652dd5b3104963ecc6996b065562993c4f2b78d 100644
--- a/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
@@ -621,7 +621,7 @@ class primaryVertexSetup(InDetFlagsJobProperty):
     statusOn     = True
     allowedTypes = ['str']
     allowedValues= [ 'AdaptiveMultiFinding', 'IterativeFinding', 'AdaptiveFinding', 'DefaultFastFinding', 'DefaultFullFinding', 'DefaultKalmanFinding', 'DefaultAdaptiveFinding', 'DefaultVKalVrtFinding', 'DummyVxFinder', 'MedImgMultiFinding', 'GaussIterativeFinding', 'GaussAdaptiveMultiFinding' ]
-    StoredValue  = 'IterativeFinding'
+    StoredValue  = 'GaussAdaptiveMultiFinding'
 
 class primaryVertexCutSetup(InDetFlagsJobProperty):
     """ string to store the type of cuts to be used in PV reconstruction: 'Offline', 'IBL', 'SLHC' 'HeavyIon' """
@@ -1648,7 +1648,7 @@ class InDetJobProperties(JobPropertyContainer):
           self.checkThenSet(self.priVtxCutLevel         , 1    )
        else:
           # --- vertexing setup is the pileup one now (if not set already above)
-          self.checkThenSet(self.primaryVertexSetup   , "IterativeFinding")
+          self.checkThenSet(self.primaryVertexSetup   , "GaussAdaptiveMultiFinding")
           self.checkThenSet(self.primaryVertexCutSetup, "Offline")
 
     # --- turn off brem reco for non collision reconstruction