diff --git a/files/data.yml b/files/data.yml
index f462523..aa3b8ed 100644
--- a/files/data.yml
+++ b/files/data.yml
@@ -18,8 +18,8 @@ data:
     port: '15000'
   name: alice
 - voms:
-    DN: /C=IT/O=INFN/OU=Host/L=Padova/CN=voms-02.pd.infn.it
-    CA_DN: /C=IT/O=INFN/CN=INFN Certification Authority
+    DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms-02.pd.infn.it
+    CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms-02.pd.infn.it
     port: '15008'
   name: ams02.cern.ch
@@ -132,8 +132,8 @@ data:
     port: '15025'
   name: camont
 - voms:
-    DN: /C=IT/O=INFN/OU=Host/L=Padova/CN=voms-01.pd.infn.it
-    CA_DN: /C=IT/O=INFN/CN=INFN Certification Authority
+    DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms-01.pd.infn.it
+    CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms-01.pd.infn.it
     port: '15001'
   name: cdf
@@ -169,8 +169,8 @@ data:
     port: '15002'
   name: cms
 - voms:
-    DN: /C=IT/O=INFN/OU=Host/L=Padova/CN=voms-01.pd.infn.it
-    CA_DN: /C=IT/O=INFN/CN=INFN Certification Authority
+    DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms-01.pd.infn.it
+    CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms-01.pd.infn.it
     port: '15003'
   name: compchem
@@ -181,8 +181,8 @@ data:
     port: '15003'
   name: compchem
 - voms:
-    DN: /C=IT/O=INFN/OU=Host/L=Padova/CN=voms-02.pd.infn.it
-    CA_DN: /C=IT/O=INFN/CN=INFN Certification Authority
+    DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms-02.pd.infn.it
+    CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms-02.pd.infn.it
     port: '15007'
   name: comput-er.it
@@ -223,8 +223,8 @@ data:
     port: '15001'
   name: egeode
 - voms:
-    DN: /C=IT/O=INFN/OU=Host/L=Padova/CN=voms-01.pd.infn.it
-    CA_DN: /C=IT/O=INFN/CN=INFN Certification Authority
+    DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms-01.pd.infn.it
+    CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms-01.pd.infn.it
     port: '15005'
   name: enea
@@ -235,8 +235,8 @@ data:
     port: '15005'
   name: enea
 - voms:
-    DN: /C=IT/O=INFN/OU=Host/L=Padova/CN=voms-02.pd.infn.it
-    CA_DN: /C=IT/O=INFN/CN=INFN Certification Authority
+    DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms-02.pd.infn.it
+    CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms-02.pd.infn.it
     port: '15014'
   name: enmr.eu
@@ -265,8 +265,8 @@ data:
     port: '15017'
   name: euchina
 - voms:
-    DN: /C=IT/O=INFN/OU=Host/L=Padova/CN=voms-02.pd.infn.it
-    CA_DN: /C=IT/O=INFN/CN=INFN Certification Authority
+    DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms-02.pd.infn.it
+    CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms-02.pd.infn.it
     port: '15010'
   name: euindia
@@ -277,8 +277,8 @@ data:
     port: '15010'
   name: euindia
 - voms:
-    DN: /C=IT/O=INFN/OU=Host/L=Padova/CN=voms-02.pd.infn.it
-    CA_DN: /C=IT/O=INFN/CN=INFN Certification Authority
+    DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms-02.pd.infn.it
+    CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms-02.pd.infn.it
     port: '15016'
   name: eumed
@@ -319,8 +319,8 @@ data:
     port: '15001'
   name: gilda
 - voms:
-    DN: /C=IT/O=INFN/OU=Host/L=Padova/CN=voms-02.pd.infn.it
-    CA_DN: /C=IT/O=INFN/CN=INFN Certification Authority
+    DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms-02.pd.infn.it
+    CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms-02.pd.infn.it
     port: '15018'
   name: glast.org
@@ -331,8 +331,8 @@ data:
     port: '15018'
   name: glast.org
 - voms:
-    DN: /C=IT/O=INFN/OU=Host/L=Padova/CN=voms-01.pd.infn.it
-    CA_DN: /C=IT/O=INFN/CN=INFN Certification Authority
+    DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms-01.pd.infn.it
+    CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms-01.pd.infn.it
     port: '15008'
   name: gridit
@@ -417,14 +417,14 @@ data:
     port: '15100'
   name: imath.cesga.es
 - voms:
-    DN: /C=IT/O=INFN/OU=Host/L=Padova/CN=voms-01.pd.infn.it
-    CA_DN: /C=IT/O=INFN/CN=INFN Certification Authority
+    DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms-01.pd.infn.it
+    CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms-01.pd.infn.it
     port: '15002'
   name: inaf
 - voms:
-    DN: /C=IT/O=INFN/OU=Host/L=Padova/CN=voms-01.pd.infn.it
-    CA_DN: /C=IT/O=INFN/CN=INFN Certification Authority
+    DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms-01.pd.infn.it
+    CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms-01.pd.infn.it
     port: '15000'
   name: infngrid
@@ -508,8 +508,8 @@ data:
     port: '15010'
   name: ops.ndgf.org
 - voms:
-    DN: /C=IT/O=INFN/OU=Host/L=Padova/CN=voms-01.pd.infn.it
-    CA_DN: /C=IT/O=INFN/CN=INFN Certification Authority
+    DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms-01.pd.infn.it
+    CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms-01.pd.infn.it
     port: '15013'
   name: pamela
@@ -593,8 +593,8 @@ data:
     port: '15503'
   name: snoplus.snolab.ca
 - voms:
-    DN: /C=IT/O=INFN/OU=Host/L=Padova/CN=voms-02.pd.infn.it
-    CA_DN: /C=IT/O=INFN/CN=INFN Certification Authority
+    DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms-02.pd.infn.it
+    CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms-02.pd.infn.it
     port: '15009'
   name: superbvo.org
@@ -635,8 +635,8 @@ data:
     port: '15003'
   name: t2k.org
 - voms:
-    DN: /C=IT/O=INFN/OU=Host/L=Padova/CN=voms-01.pd.infn.it
-    CA_DN: /C=IT/O=INFN/CN=INFN Certification Authority
+    DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms-01.pd.infn.it
+    CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms-01.pd.infn.it
     port: '15002'
   name: theophys
@@ -666,8 +666,8 @@ data:
     port: '15002'
   name: ukqcd
 - voms:
-    DN: /C=IT/O=INFN/OU=Host/L=Padova/CN=voms-01.pd.infn.it
-    CA_DN: /C=IT/O=INFN/CN=INFN Certification Authority
+    DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms-01.pd.infn.it
+    CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms-01.pd.infn.it
     port: '15009'
   name: virgo
@@ -1713,173 +1713,173 @@ data:
     DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms.recas.ba.infn.it
     CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms.recas.ba.infn.it
-    port: '15005'
+    port: '15006'
   name: dih-voucher02.eosc-hub.eu
 - voms:
     DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms.recas.ba.infn.it
     CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms.recas.ba.infn.it
-    port: '15005'
+    port: '15007'
   name: dih-voucher03.eosc-hub.eu
 - voms:
     DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms.recas.ba.infn.it
     CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms.recas.ba.infn.it
-    port: '15005'
+    port: '15008'
   name: dih-voucher04.eosc-hub.eu
 - voms:
     DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms.recas.ba.infn.it
     CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms.recas.ba.infn.it
-    port: '15005'
+    port: '15009'
   name: dih-voucher05.eosc-hub.eu
 - voms:
     DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms.recas.ba.infn.it
     CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms.recas.ba.infn.it
-    port: '15005'
+    port: '15010'
   name: dih-voucher06.eosc-hub.eu
 - voms:
     DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms.recas.ba.infn.it
     CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms.recas.ba.infn.it
-    port: '15005'
+    port: '15011'
   name: dih-voucher07.eosc-hub.eu
 - voms:
     DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms.recas.ba.infn.it
     CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms.recas.ba.infn.it
-    port: '15005'
+    port: '15012'
   name: dih-voucher08.eosc-hub.eu
 - voms:
     DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms.recas.ba.infn.it
     CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms.recas.ba.infn.it
-    port: '15005'
+    port: '15013'
   name: dih-voucher09.eosc-hub.eu
 - voms:
     DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms.recas.ba.infn.it
     CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms.recas.ba.infn.it
-    port: '15005'
+    port: '15014'
   name: dih-voucher10.eosc-hub.eu
 - voms:
     DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms.recas.ba.infn.it
     CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms.recas.ba.infn.it
-    port: '15005'
+    port: '15015'
   name: dih-voucher11.eosc-hub.eu
 - voms:
     DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms.recas.ba.infn.it
     CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms.recas.ba.infn.it
-    port: '15005'
+    port: '15016'
   name: dih-voucher12.eosc-hub.eu
 - voms:
     DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms.recas.ba.infn.it
     CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms.recas.ba.infn.it
-    port: '15005'
+    port: '15017'
   name: dih-voucher13.eosc-hub.eu
 - voms:
     DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms.recas.ba.infn.it
     CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms.recas.ba.infn.it
-    port: '15005'
+    port: '15018'
   name: dih-voucher14.eosc-hub.eu
 - voms:
     DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms.recas.ba.infn.it
     CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms.recas.ba.infn.it
-    port: '15005'
+    port: '15019'
   name: dih-voucher15.eosc-hub.eu
 - voms:
     DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms.recas.ba.infn.it
     CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms.recas.ba.infn.it
-    port: '15005'
+    port: '15020'
   name: dih-voucher16.eosc-hub.eu
 - voms:
     DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms.recas.ba.infn.it
     CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms.recas.ba.infn.it
-    port: '15005'
+    port: '15021'
   name: dih-voucher17.eosc-hub.eu
 - voms:
     DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms.recas.ba.infn.it
     CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms.recas.ba.infn.it
-    port: '15005'
+    port: '15022'
   name: dih-voucher18.eosc-hub.eu
 - voms:
     DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms.recas.ba.infn.it
     CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms.recas.ba.infn.it
-    port: '15005'
+    port: '15023'
   name: dih-voucher19.eosc-hub.eu
 - voms:
     DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms.recas.ba.infn.it
     CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms.recas.ba.infn.it
-    port: '15005'
+    port: '15024'
   name: dih-voucher20.eosc-hub.eu
 - voms:
     DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms.recas.ba.infn.it
     CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms.recas.ba.infn.it
-    port: '15005'
+    port: '15025'
   name: dih-voucher21.eosc-hub.eu
 - voms:
     DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms.recas.ba.infn.it
     CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms.recas.ba.infn.it
-    port: '15005'
+    port: '15026'
   name: dih-voucher22.eosc-hub.eu
 - voms:
     DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms.recas.ba.infn.it
     CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms.recas.ba.infn.it
-    port: '15005'
+    port: '15027'
   name: dih-voucher23.eosc-hub.eu
 - voms:
     DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms.recas.ba.infn.it
     CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms.recas.ba.infn.it
-    port: '15005'
+    port: '15028'
   name: dih-voucher24.eosc-hub.eu
 - voms:
     DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms.recas.ba.infn.it
     CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms.recas.ba.infn.it
-    port: '15005'
+    port: '15029'
   name: dih-voucher25.eosc-hub.eu
 - voms:
     DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms.recas.ba.infn.it
     CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms.recas.ba.infn.it
-    port: '15005'
+    port: '15030'
   name: dih-voucher26.eosc-hub.eu
 - voms:
     DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms.recas.ba.infn.it
     CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms.recas.ba.infn.it
-    port: '15005'
+    port: '15031'
   name: dih-voucher27.eosc-hub.eu
 - voms:
     DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms.recas.ba.infn.it
     CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms.recas.ba.infn.it
-    port: '15005'
+    port: '15032'
   name: dih-voucher28.eosc-hub.eu
 - voms:
     DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms.recas.ba.infn.it
     CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms.recas.ba.infn.it
-    port: '15005'
+    port: '15033'
   name: dih-voucher29.eosc-hub.eu
 - voms:
     DN: /DC=org/DC=terena/DC=tcs/C=IT/L=Frascati/O=Istituto Nazionale di Fisica Nucleare/CN=voms.recas.ba.infn.it
     CA_DN: /C=NL/ST=Noord-Holland/L=Amsterdam/O=TERENA/CN=TERENA eScience SSL CA 3
     hostname: voms.recas.ba.infn.it
-    port: '15005'
+    port: '15034'
   name: dih-voucher30.eosc-hub.eu
diff --git a/molecule/default/playbook.yml b/molecule/default/playbook.yml
index 52e40ec..1340160 100644
--- a/molecule/default/playbook.yml
+++ b/molecule/default/playbook.yml
@@ -1,6 +1,7 @@
 ---
 - name: Converge
   hosts: all
+  strategy: free
   roles:
     - { role: EGI-Foundation.umd, release: 4, crl_deploy: true, tags: umd }
     - { role: ansible-role-VOMS-client }