Yes .. I think you should not need to do anything there. In general if you e.g. get a DataSource object in the PersistenceUnitInfo then how should you be able to track the respective service. So the only important thing is that you do not keep any additional references that would outlive the EntityManagerFactory.