diff --git a/manifests/oidf_service.pp b/manifests/oidf_service.pp
index b12067d..98a5051 100644
--- a/manifests/oidf_service.pp
+++ b/manifests/oidf_service.pp
@@ -25,5 +25,9 @@ class eidas::oidf_service(
         key_file  => "/opt/oidf_service/oidf_service.key",
         cert_file => "/opt/oidf_service/oidf_service.pem"
       }
+      exec { "build_oidf_service_key.p12":
+        command => "openssl pkcs12 -export -in '/opt/oidf_service/oidf_service.pem' -inkey '/opt/oidf_service/oidf_service.key' -name '1' -out '/opt/oidf_service/oidf_service.p12' -passin pass:'${keystore_password}' -passout pass:'${keystore_password}'",
+        onlyif  => "test ! -f /opt/oidf_service/oidf_service.p12"
+      }
     }
 }