diff --git a/eidas-test-connector/overlay/etc/Chrystoki.conf.d/50-ha-slot.conf b/eidas-test-connector/overlay/etc/Chrystoki.conf.d/50-ha-slot.conf
index 688df340..431894e3 100644
--- a/eidas-test-connector/overlay/etc/Chrystoki.conf.d/50-ha-slot.conf
+++ b/eidas-test-connector/overlay/etc/Chrystoki.conf.d/50-ha-slot.conf
@@ -2,7 +2,7 @@ VirtualToken = {
    VirtualTokenActiveRecovery = activeEnhanced;
    VirtualToken00Label = sc_ha;
    VirtualToken00SN = 11429933786539;
-   VirtualToken00Members = 1429933786539,1428350538484,1429929129938;
+   VirtualToken00Members = 1428432029165;
 }
 HASynchronize = {
    sc_ha = 1;
diff --git a/eidas-test-connector/overlay/etc/eidas-connector/credentials/pkcs11.cfg b/eidas-test-connector/overlay/etc/eidas-connector/credentials/pkcs11.cfg
index 8b5c002d..6c7adf90 100644
--- a/eidas-test-connector/overlay/etc/eidas-connector/credentials/pkcs11.cfg
+++ b/eidas-test-connector/overlay/etc/eidas-connector/credentials/pkcs11.cfg
@@ -2,7 +2,7 @@
 name = Luna
 library = /usr/safenet/lunaclient/lib/libCryptoki2_64.so
 description = Luna config
-slot = 6
+slot = 3
 attributes(*,*,*) = {
 CKA_TOKEN = true
 }
diff --git a/eidas-test-connector/overlay/etc/luna/cert/server/lla-hsm2.sunet.seCert.pem b/eidas-test-connector/overlay/etc/luna/cert/server/lla-hsm2.sunet.seCert.pem
deleted file mode 100644
index ef3c6632..00000000
--- a/eidas-test-connector/overlay/etc/luna/cert/server/lla-hsm2.sunet.seCert.pem
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDLzCCAhegAwIBAgIBADANBgkqhkiG9w0BAQsFADBbMQswCQYDVQQGEwJDQTEQ
-MA4GA1UECAwHT250YXJpbzEPMA0GA1UEBwwGT3R0YXdhMRYwFAYDVQQKDA1DaHJ5
-c2FsaXMtSVRTMREwDwYDVQQDDAhsbGEtaHNtMjAeFw0yMDAzMzAxMTI1MzNaFw0z
-MDA0MDExMTI1MzNaMFsxCzAJBgNVBAYTAkNBMRAwDgYDVQQIDAdPbnRhcmlvMQ8w
-DQYDVQQHDAZPdHRhd2ExFjAUBgNVBAoMDUNocnlzYWxpcy1JVFMxETAPBgNVBAMM
-CGxsYS1oc20yMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw8UKBj61
-aja8nrXkMt7k5dFVAK5uufEyZ0JFeL3P7/9kVtoonh5VV8qTcwRPGjPK2pK4ZkwW
-YrwQwYU9I7XjnVjYRyEUKxyoGkBGmSUVccNKIHZI5CC6j/vA1e+eV3Pm7zBpD1Xn
-CBNS5s/bO4VU9/7G0VMRubjwhjjssVs68fH25Au3Vw0p8IeiacFzON6SZr+6j0BN
-jQ6p2q43phwOhUWYSdhufI1Yfn8jel4jGJjc97jDdFJqCCScRpyyARjxjgPJlS5v
-Pp2n8LmCNt4tnjbLGqV9Vf/2mUnyfskEx2xqnfuQTVLoAKE5c9kaanWbesEx1C1Y
-Oj2tHgpujrdtzQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCkWHw+RIwtT7OfmFOJ
-YlJBKOgI0BgIo0dXMsm9+mEBuLyNIo5QL3Nw87/vke5Yn27J1/Q+ihW4JAj4JnQ6
-rBhm6Ns/6aqr2YWovRXo4R/N537qk9jhi5gff7L4NQrgiTUEgQ2kAQGAgzaSmD/+
-GSs9qY5gICCik5evthyeJhTDnp5eBaozjcIEEDTxtTg+xBm/gPraMQGl3hNC+p3E
-KFCf+AlIDSxIV3CjT/MDUYklsBFR2g2DVI49VKxoRU1Iloer0p2NvmtPUXn9bMXt
-X6GatvYxwNsiWVVYrNyIYUPQ59lihjQNibSIl5yqdXlhVY8pg5Xq9X1TOEMqUQ3l
-gQn2
------END CERTIFICATE-----
diff --git a/eidas-test-connector/overlay/etc/luna/cert/server/sthb-hsm2.sunet.seCert.pem b/eidas-test-connector/overlay/etc/luna/cert/server/sthb-hsm2.sunet.seCert.pem
deleted file mode 100644
index c1535970..00000000
--- a/eidas-test-connector/overlay/etc/luna/cert/server/sthb-hsm2.sunet.seCert.pem
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDMTCCAhmgAwIBAgIBADANBgkqhkiG9w0BAQsFADBcMQswCQYDVQQGEwJDQTEQ
-MA4GA1UECAwHT250YXJpbzEPMA0GA1UEBwwGT3R0YXdhMRYwFAYDVQQKDA1DaHJ5
-c2FsaXMtSVRTMRIwEAYDVQQDDAlzdGhiLWhzbTIwHhcNMjAwMzMwMTE1ODI3WhcN
-MzAwNDAxMTE1ODI3WjBcMQswCQYDVQQGEwJDQTEQMA4GA1UECAwHT250YXJpbzEP
-MA0GA1UEBwwGT3R0YXdhMRYwFAYDVQQKDA1DaHJ5c2FsaXMtSVRTMRIwEAYDVQQD
-DAlzdGhiLWhzbTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDgdBdk
-uZy+YbKhwwHkFlJispF7wxMChFuuhpGDtDogYYEgGAR9j5aMGuz8t07pNbAX+Oex
-SYENEJYvLKCHXMgitZiDioKcdXCNlOGBJV4Y5dubrS1+ocOmJnr0mJPtm6RzAsIU
-UeqhIcw/JllHYnHHyHQeQprGn2v6l0J9PRwAc12Xja2p/eSvGR3bC4VyMQl9PB1r
-KrPCdGrXfUFpBSdrU2308RvBLNl4tjnaXHcSD7/s26QGHPJSQDqmXYZDl0MiCZi2
-eLm1hP3TAvXbHjE1kYv81zUVYNnANLFZLUHgFZhfMqOM+91sHcOaaeGx1ZtAZZO5
-GFVeAhg7u4PlqLapAgMBAAEwDQYJKoZIhvcNAQELBQADggEBACsHjivOVHSFlKgN
-zHG0CyaKY13YyLRi8PtbDKB5qiJuD7LGjveVal+SD+AIYtG60o9bF3X1xCkNDcLt
-imlfq1L39OawDbEvJZGOLGIqJDfMbEqWIUGiFureQ+4zWBD81iIHUuQ+BPDUU9zu
-xfdkchy9S2wzqP1q7of3wN0HbHj2UdwIIMipyO81bqfwCyW4xjDDRY+L9zMTGOAe
-hoqgjC/ZLYkgfkWp3THWzQ6ZBeYedU97nEaZkXJDsOwseWol9mrL5wuzDCAZjm9J
-LyjLbTDcNn7Gy74sF7nHiRsiW+Kb1zkOisFCE457+0sQFdK/0XhrCug66sBCC673
-z/6pegM=
------END CERTIFICATE-----
diff --git a/eidas-test-connector/overlay/etc/luna/cert/server/tug-hsm-lab2.sunet.seCert.pem b/eidas-test-connector/overlay/etc/luna/cert/server/tug-hsm-lab2.sunet.seCert.pem
new file mode 100644
index 00000000..0dfe8f9c
--- /dev/null
+++ b/eidas-test-connector/overlay/etc/luna/cert/server/tug-hsm-lab2.sunet.seCert.pem
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDKzCCAhOgAwIBAgIBADANBgkqhkiG9w0BAQsFADBZMQswCQYDVQQGEwJDQTEQ
+MA4GA1UECAwHT250YXJpbzEPMA0GA1UEBwwGT3R0YXdhMRYwFAYDVQQKDA1DaHJ5
+c2FsaXMtSVRTMQ8wDQYDVQQDDAY2MTM1MDcwHhcNMTkxMDIxMTczMTA1WhcNMjkx
+MDIyMTczMTA1WjBZMQswCQYDVQQGEwJDQTEQMA4GA1UECAwHT250YXJpbzEPMA0G
+A1UEBwwGT3R0YXdhMRYwFAYDVQQKDA1DaHJ5c2FsaXMtSVRTMQ8wDQYDVQQDDAY2
+MTM1MDcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3VUSTKMlzIYUW
+JUPTxSsAHj0BJOAOIAWmbr11yBhAKC3EERyEJqb+1bPoPHK82j2le1P0ETapnNs7
+rdMuhewXUHdtmnIRNBKrGEvmY62tJjD+uNvvJ0DX5e44hRBzIndcQGoSsaDUeSPW
+//fSAFGOROAfAioN0oxyLMlsqEjgd/RnE66h7WwV/89NzpftuEfK8addTmSMBLpD
+pnWQgmSyYtAC1zXN2i0RtXfur0bK72GApz9e9ilTlfmETOVTis3KZtv0yANUW9AW
+9j0TlBQ3BDdf/iEkvz0vN5MfTM30vLvH2gK0OuTnyD57q1fTUBgb93Da5DOzLwua
+Kd6Wra6bAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAIhvHvNc4SoI5vY35qYtjkMu
+sJCmjLU82LOZdxIjBjwm0WOv4w1s5xQQZnOlfoPoIZuo41rpegtaw37epJ73RoeP
+7NY9KsG3ut2jOwATRjo2LweVszCClPw6sk2cwFzgvd+LQnsIGhTbkqSA28tKFrl0
+XMZqx4z99saZc9YTi2UfyZV2EyYQH8hSlZEMj7jZQtHFAJPjWKoDG0J0x+v6xdBZ
+5axvpRHYOh6lqpHbe6sPPwS4IpbEDeqeV3nsBUTpl6tgXtXD5ZUFmIDJbqRZ1Vkc
+pHfGECwBz8i9ylA8NIdVCbmwOI+bcqnAFbld6+oA9kbdqTUpdd9uh2D8/XnrQSw=
+-----END CERTIFICATE-----
diff --git a/eidas-test-connector/overlay/etc/luna/cert/server/tug-hsm2.sunet.seCert.pem b/eidas-test-connector/overlay/etc/luna/cert/server/tug-hsm2.sunet.seCert.pem
deleted file mode 100644
index 3d9d72b7..00000000
--- a/eidas-test-connector/overlay/etc/luna/cert/server/tug-hsm2.sunet.seCert.pem
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDLzCCAhegAwIBAgIBADANBgkqhkiG9w0BAQsFADBbMQswCQYDVQQGEwJDQTEQ
-MA4GA1UECAwHT250YXJpbzEPMA0GA1UEBwwGT3R0YXdhMRYwFAYDVQQKDA1DaHJ5
-c2FsaXMtSVRTMREwDwYDVQQDDAh0dWctaHNtMjAeFw0yMDAzMzAxMjEyNTZaFw0z
-MDA0MDExMjEyNTZaMFsxCzAJBgNVBAYTAkNBMRAwDgYDVQQIDAdPbnRhcmlvMQ8w
-DQYDVQQHDAZPdHRhd2ExFjAUBgNVBAoMDUNocnlzYWxpcy1JVFMxETAPBgNVBAMM
-CHR1Zy1oc20yMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv13NhdzT
-8gnTZ5Gfxp10CFJjxbG+wXsrFtnzqA0o6GRpNiuqPMEoTsUiE5AaqxhLz0N+y618
-YXGQ2wSX0FkjRHVih1e9vmEy1mlNc6x8VRAMaaHotXq58OI1NrotS/nVdVqZDc44
-C74FNhckS4cy4vAamG6j27H+IhnpJEbPI2vzS6ADY7Bdas6/CBwjUrvX8IlxnSpJ
-4LYZ+mEL4DS+SOwo2QGX/wMwi3wXX/4ZwUj5N491me5lCJMB48ixulXu6bpa9yp3
-iFMPPa+886to1AbY1lv86m64daaBlkZSJtSFEjRNCNxqwV0e6DkqZnDfKHRBNNVu
-ggRpD/5MFNanfwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQC4yhQjdluy9Uq04IKS
-1O4VsC3gJTwJFxkdn9FoyYOBnpBeWVD0cgC/lnWSoqDV7d/EYDaIWhTxYKVZFq1I
-OQ5+66gScfYAPtbNz5QfYtxzXa16HvI8b3SEQDruEsrwDmA+gmC++HFP4L6YLrIB
-5BptWDPvWJO/TLrv44Oc9Ymjdb4RDHgUrWSZ1VznNQl7ILzNJkYbxOwxEuqVu3h8
-yujRM4TYolv6Ipx5/w6pKTOBofuGdcS6WsQJeGR4THy4sh+IfGwCcBSucXkhNvMy
-/sQhcwPWc3sf5SSJzqfkpw53Ay+vPVLbhZVYGojvq7/JaTep8aRnGo/vELm7sUSL
-HZHt
------END CERTIFICATE-----