diff --git a/peppol-icd/src/main/java/network/oxalis/vefa/peppol/icd/code/PeppolIcd.java b/peppol-icd/src/main/java/network/oxalis/vefa/peppol/icd/code/PeppolIcd.java
index 4c8eab24..299f69d6 100644
--- a/peppol-icd/src/main/java/network/oxalis/vefa/peppol/icd/code/PeppolIcd.java
+++ b/peppol-icd/src/main/java/network/oxalis/vefa/peppol/icd/code/PeppolIcd.java
@@ -28,14 +28,13 @@
 @Getter
 public enum PeppolIcd implements Icd {
 
-    // The latest code list release v8.8 dated 2024-04-22: https://docs.peppol.eu/edelivery/codelists/v8.8/Peppol%20Code%20Lists%20-%20Participant%20identifier%20schemes%20v8.8.html
+    // The latest code list release v8.9 dated 2024-07-08: https://docs.peppol.eu/edelivery/codelists/v8.9/Peppol%20Code%20Lists%20-%20Participant%20identifier%20schemes%20v8.9.html
     // Original Source : http://iso6523.info/icd_list.pdf
 
     // Internationally approved ICDs
     FR_SIRENE("FR:SIRENE", "0002", "Institut National de la Statistique et des Etudes Economiques, (I.N.S.E.E.)"),
     SE_ORGNR("SE:ORGNR", "0007", "The National Tax Board"),
     FR_SIRET("FR:SIRET", "0009", "DU PONT DE NEMOURS"),
-    FI_OVT("FI:OVT", "0037", "National Board of Taxes, (Verohallitus)"),
     DUNS("DUNS", "0060", "Dun and Bradstreet Ltd"),
     GLN("GLN", "0088", "GS1 GLN"),
     DK_P("DK:P", "0096", "The Danish Business Authority"),
@@ -64,9 +63,6 @@ public enum PeppolIcd implements Icd {
     GS1("GS1", "0209", "GS1"),
     IT_CFI("IT:CFI", "0210", "Agenzia delle Entrate"),
     IT_IVA("IT:IVA", "0211", "PARTITA IVA"),
-    FI_ORG("FI:ORG", "0212", "State Treasury of Finland / Valtiokonttori"),
-    FI_VAT("FI:VAT", "0213", "State Treasury of Finland / Valtiokonttori"),
-    FI_NSI("FI:NSI", "0215", "Tieto Finland Oy"),
     FI_OVT2("FI:OVT2", "0216", "TIEKE- Tietoyhteiskunnan kehittamiskeskus ry"),
     LV_URN("LV:URN", "0218", "The Register of Enterprises of the Republic of Latvia"),
     JP_IIN("JP:IIN", "0221", "National Tax Agency Japan"),
diff --git a/peppol-security/src/test/resources/ap-test.cer b/peppol-security/src/test/resources/ap-test.cer
index 962a710f..40135781 100644
--- a/peppol-security/src/test/resources/ap-test.cer
+++ b/peppol-security/src/test/resources/ap-test.cer
@@ -1,33 +1,34 @@
 -----BEGIN CERTIFICATE-----
-MIIFvzCCA6egAwIBAgIQS2oH4Rg7dPfIXOnRW9T1tDANBgkqhkiG9w0BAQsFADBr
+MIIFvzCCA6egAwIBAgIQWd+YpUNgpRbU0EW3hC/uETANBgkqhkiG9w0BAQsFADBr
 MQswCQYDVQQGEwJCRTEZMBcGA1UEChMQT3BlblBFUFBPTCBBSVNCTDEWMBQGA1UE
 CxMNRk9SIFRFU1QgT05MWTEpMCcGA1UEAxMgUEVQUE9MIEFDQ0VTUyBQT0lOVCBU
-RVNUIENBIC0gRzIwHhcNMjIwNzEwMDAwMDAwWhcNMjQwNjI5MjM1OTU5WjBMMQsw
+RVNUIENBIC0gRzIwHhcNMjQwMjE3MDAwMDAwWhcNMjYwMjA2MjM1OTU5WjBMMQsw
 CQYDVQQGEwJGSTEQMA4GA1UECgwHQmFzd2FyZTEXMBUGA1UECwwOUEVQUE9MIFRF
 U1QgQVAxEjAQBgNVBAMMCVBPUDAwMDAxMDCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAL7LsC4kU4b1qnk0IGSt/u42A9TBPusTiCgKN5xh8XUyNDSI0RBZ
-3+w5g8aWaDVceqh3zXdytmsEqLmQqKAvQY3GETJe9BT14PC3mGURY1Vv5GzHaNmo
-wBUnDnWZNNifi0+eqSUm7gRYX+RkoqF5lSR6tYL/uk2/ZrfGlzu/RawNvmM+jfhy
-ZVc/e/Hr4iATUUwxxCWTwCkWN0tqGmv9Kx4e+NO7+4otROK544QFx4Dtm77WWETx
-GkdLxpFFnYnnlhq3B2DjYxEpTZ+bM8gtQJsWnkQYJQ0Sb6vSTwQqtpNGTrw6cK1S
-0by7S3u4XVtHydkgzEGaivMQI6fcXOWV7SsCAwEAAaOCAXwwggF4MAwGA1UdEwEB
+ADCCAQoCggEBAK7QxNco8xypV2QiIXFpqz6HX+B0w4Srpk8mEPt7HlNBCSHgbt5S
+V0z7wfjv6NI+ONx2mmh6LW0N/dJZ8Jcio3PtzGU45pyxNvKYi+y516OOKOBFGjhK
+6XiMADCzPteLisM7VpTq8UhzfPLOetLExk9asAXSVMkXN0qTG26Qn/9xhQo4ltm3
+fCFBRhd395rDw6QXJscaXqv6y949L0jZMTTVQnnhp1o6CjNlu9X/93F1+KBS3TOz
+BPb4pO/PlhBUDdXDVmhpqlC3K9tf7Cx8cLMItANHXWTcVMzO0SxlNqNliPVTxXJ6
+EFzJNIp2JNmv7xiRI3+taXwAMn+LBB7Coj8CAwEAAaOCAXwwggF4MAwGA1UdEwEB
 /wQCMAAwDgYDVR0PAQH/BAQDAgOoMBYGA1UdJQEB/wQMMAoGCCsGAQUFBwMCMB0G
-A1UdDgQWBBTxQNqgX16XqGFsAwPBs4boMemrEzBdBgNVHR8EVjBUMFKgUKBOhkxo
+A1UdDgQWBBTeJvhvskx5uqIgZLY+DeUlia6+TzBdBgNVHR8EVjBUMFKgUKBOhkxo
 dHRwOi8vcGtpLWNybC5zeW1hdXRoLmNvbS9jYV82YTkzNzczNGEzOTNhMDgwNWJm
 MzNjZGE4YjMzMTA5My9MYXRlc3RDUkwuY3JsMDcGCCsGAQUFBwEBBCswKTAnBggr
 BgEFBQcwAYYbaHR0cDovL3BraS1vY3NwLnN5bWF1dGguY29tMB8GA1UdIwQYMBaA
 FGtvS7bxN7orPH8Yzborsrl8KjfrMC0GCmCGSAGG+EUBEAMEHzAdBhNghkgBhvhF
 ARABAgMBAYGpkOEDFgY5NTc2MDgwOQYKYIZIAYb4RQEQBQQrMCkCAQAWJGFIUjBj
 SE02THk5d2Eya3RjbUV1YzNsdFlYVjBhQzVqYjIwPTANBgkqhkiG9w0BAQsFAAOC
-AgEApAiedwRZcW449knUO29vPphS1obosPrd7PdKJm3f/Ktd635FK1bppQm3yug1
-JXlZ/DIH6n9Hugotwz8TXUT1UbcIBh/oETCypFj5c3TfUmMbj6K87iuMeG+beZZw
-hSZsIT9Gqo9G3bb5kPIBdJaxNSkAkDWdC50tF67vCVRqVrIEfnkVTTrYsQ6Nh9C1
-mJwQ5cKCDbzbNtTyghHvyfP/MiLM5TJih8KEeuxv28MjTtUYmYIcNIUgdFDeNkqF
-AxPXiHHuXMkacpI2N+O4bfOPiuJrsHLnLmFnQs9o+uHshoiwDMYdelJBEo/ehmsD
-LpPj6nBlbfU/yiwq2ymSkith1voytKbGM4BCbolStHTVdY5souAXztcuabmmstqs
-tincm50Bwwdb7eRm9UojQo8x5vMJcyLKaFRghsDwHNjR8iRIdokhZ5JEGlix3EQr
-mRrgy4rMXCgC6Of8RbCeTwGAqPT2y73uRVA90FURVfw43L/jqiTXpGcY0WWS2YOB
-0q9xGkv9iZ+vQ/N9FY5d0sk3udpmJZstZsn3Sh5HQCLq4hgnJI3chKXuAMFdlqxN
-pun1ShsjcMMctliXiIlQOrM0cjBXHDRmdkjPHl6/jHY+7JeFuTWoDERhJzNuLWue
-oN6vPARXI0UkRoNeqh1SxfraMURSqN59GbQFYkv92O2Obb4=
+AgEAko4EEbqOYeZnA8Afr3lRO91i/+Am+GRqG9huUn2tEFdNp2a0xVsOFi6ZvcCh
+lqBMddBQ2xUVznZ7CDz4GGKMHfrLeJzy83pjOrywPWRuhgFK3ct13o0QkFqUvfX9
+AweLq/J0+IIArW0Rf3vAFZmPXy8UiiSq1yjAf8mG1GUBuPtOIcxjGyg2ySBJRZtn
+sPQ5lJk0IbIlGK883jNCVy299DG2WdekYfg4eAENTLYhsABVjWmkkvHfWjEdQrEk
+PgM8A4GlaV+MqeAAX0jKODTrcWq0KS9gvOF2rD9w36DR9AbMZSXh9CVQN7Vwz5Gn
+Mu0WhVYYJ2Ax5qR9ZG7Gks8piXnu8i6M5oW9xoGb+kkwu7y3afP8a8enEknEvzVk
++hj6lP6NIN2x5iLL5L+8UizVSMzaJWXPwE08NyxTw5XwHM9pVFVLT7GJdMUqXMGY
+rbgRq0CYjzA8SkEa3RQVUNsmX24qh9O3za9natt3+eVXkw3mfM5ulaL2Kt3hvBGN
+S9uMdeakhl9fjisVAZV4iqjtQW3FnrazmyuHN5MpAeN92iQu68B/B3GDykY3GP43
+TonVPZFIqoZEkMVCWDd80RGwAI9ky27+VQjScFa+/BC7bkahQub+NNijY56Pat/9
+XIUWeGL2olqYchldYmEz5+6QWWeBCLYoob+5ZW0xWV/oY+U=
 -----END CERTIFICATE-----
+