diff --git a/app/Services/EDocument/Gateway/Storecove/Storecove.php b/app/Services/EDocument/Gateway/Storecove/Storecove.php
index 3986bf1b29..a16035ae85 100644
--- a/app/Services/EDocument/Gateway/Storecove/Storecove.php
+++ b/app/Services/EDocument/Gateway/Storecove/Storecove.php
@@ -386,6 +386,7 @@ class Storecove
     {
         $uri = "legal_entities/{$legal_entity_id}/peppol_identifiers";
 
+        $identifier = str_ireplace('BE', '', $identifier);
         $data = [
             "identifier" => $identifier,
             "scheme" => $scheme,
diff --git a/openapi/api-docs.yaml b/openapi/api-docs.yaml
index 24fe337b27..0d34fad69d 100644
--- a/openapi/api-docs.yaml
+++ b/openapi/api-docs.yaml
@@ -3148,20 +3148,20 @@ paths:
                   description: "The template required"
                   type: string
                   enum:
-                    - invoice
-                    - quote
-                    - credit
-                    - payment
-                    - payment_partial
-                    - statement
-                    - reminder1
-                    - reminder2
-                    - reminder3
-                    - reminder_endless
-                    - custom1
-                    - custom2
-                    - custom3
-                    - purchase_order
+                    - email_template_invoice
+                    - email_template_quote
+                    - email_template_credit
+                    - email_template_payment
+                    - email_template_payment_partial
+                    - email_template_statement
+                    - email_template_reminder1
+                    - email_template_reminder2
+                    - email_template_reminder3
+                    - email_template_reminder_endless
+                    - email_template_custom1
+                    - email_template_custom2
+                    - email_template_custom3
+                    - email_template_purchase_order
                     - email_quote_template_reminder1
                   example: invoice
               type: object
@@ -11086,6 +11086,25 @@ paths:
             schema:
               type: object
               properties:
+                email_type:
+                  type: enum
+                  description: "The email type to be sent, when bulk emailing invoices"
+                  enum:
+                    - invoice
+                    - quote
+                    - credit
+                    - payment
+                    - payment_partial
+                    - statement
+                    - reminder1
+                    - reminder2
+                    - reminder3
+                    - reminder_endless
+                    - custom1
+                    - custom2
+                    - custom3
+                    - purchase_order
+                    - email_quote_template_reminder1
                 action:
                   type: string
                   description: |
diff --git a/openapi/paths.yaml b/openapi/paths.yaml
index a903b3c308..b127ec9b92 100644
--- a/openapi/paths.yaml
+++ b/openapi/paths.yaml
@@ -3065,20 +3065,20 @@ paths:
                   description: "The template required"
                   type: string
                   enum:
-                    - invoice
-                    - quote
-                    - credit
-                    - payment
-                    - payment_partial
-                    - statement
-                    - reminder1
-                    - reminder2
-                    - reminder3
-                    - reminder_endless
-                    - custom1
-                    - custom2
-                    - custom3
-                    - purchase_order
+                    - email_template_invoice
+                    - email_template_quote
+                    - email_template_credit
+                    - email_template_payment
+                    - email_template_payment_partial
+                    - email_template_statement
+                    - email_template_reminder1
+                    - email_template_reminder2
+                    - email_template_reminder3
+                    - email_template_reminder_endless
+                    - email_template_custom1
+                    - email_template_custom2
+                    - email_template_custom3
+                    - email_template_purchase_order
                     - email_quote_template_reminder1
                   example: invoice
               type: object
diff --git a/openapi/paths/invoices.yaml b/openapi/paths/invoices.yaml
index d16a69ccc8..c775c11747 100644
--- a/openapi/paths/invoices.yaml
+++ b/openapi/paths/invoices.yaml
@@ -436,6 +436,25 @@
             schema:
               type: object
               properties:
+                email_type:
+                  type: enum
+                  description: "The email type to be sent, when bulk emailing invoices"
+                  enum:
+                    - invoice
+                    - quote
+                    - credit
+                    - payment
+                    - payment_partial
+                    - statement
+                    - reminder1
+                    - reminder2
+                    - reminder3
+                    - reminder_endless
+                    - custom1
+                    - custom2
+                    - custom3
+                    - purchase_order
+                    - email_quote_template_reminder1
                 action:
                   type: string
                   description: |