diff --git a/src/SOL012/APIVersion/APIVersion.yaml b/src/SOL012/APIVersion/APIVersion.yaml
index 3fe6bdd7ee6079dc6482b82d2877fcbc1b71993f..4b12a1764f300c2db880458cd7f3aa1ee5227de8 100644
--- a/src/SOL012/APIVersion/APIVersion.yaml
+++ b/src/SOL012/APIVersion/APIVersion.yaml
@@ -12,8 +12,8 @@ info:
     be not aligned to the current version of the ETSI Group Specification it
     refers to and has not been approved by the ETSI NFV ISG. In case of
     discrepancies the published ETSI Group Specification takes precedence.
-    Please report bugs to
-    https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis
+
+    Please report bugs to https://forge.etsi.org/rep/nfv/SOL012/issues
 
   license:
     name: ETSI Forge copyright notice
@@ -23,7 +23,7 @@ info:
     name: NFV-SOL WG
 
 externalDocs:
-  description: ETSI GS NFV-SOL 012 V0.1.0
+  description: ETSI GS NFV-SOL 012 v3.3.1
   url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL012ed331_Protocol_Spec_for_Policy_Mgmt_Intface/NFV-SOL012ed331v010.zip
 
 paths:
diff --git a/src/SOL012/PolicyManagement/PolicyManagement.yaml b/src/SOL012/PolicyManagement/PolicyManagement.yaml
index 1deb88d8758e09cdc39426c2c6ca1806bcc2f9a9..314ce93a2e6a58d8bdf39fa62ba51bd017cd542b 100644
--- a/src/SOL012/PolicyManagement/PolicyManagement.yaml
+++ b/src/SOL012/PolicyManagement/PolicyManagement.yaml
@@ -8,12 +8,12 @@ info:
     IMPORTANT: Please note that this file might be not aligned to the current version of the ETSI Group Specification
     it refers to. In case of discrepancies the published ETSI Group Specification takes precedence.
 
-    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=
+    Please report bugs to https://forge.etsi.org/rep/nfv/SOL012/issues
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
 externalDocs:
-  description: ETSI GS NFV-SOL 012 V3.3.1
+  description: ETSI GS NFV-SOL 012 v3.3.1
   url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL012ed331_Protocol_Spec_for_Policy_Mgmt_Intface/NFV-SOL012ed331v010.zip
 
 security:
diff --git a/src/SOL012/PolicyManagementNotification/PolicyManagementNotification.yaml b/src/SOL012/PolicyManagementNotification/PolicyManagementNotification.yaml
index 528928fa3a5f259f5df75c5dac7efc7fdabd6bcb..d60f432eb67cdb06ec7aa9d4605e2edc78689d74 100644
--- a/src/SOL012/PolicyManagementNotification/PolicyManagementNotification.yaml
+++ b/src/SOL012/PolicyManagementNotification/PolicyManagementNotification.yaml
@@ -3,17 +3,17 @@ info:
   version: 1.0.0-impl:etsi.org:ETSI_NFV_OpenAPI:1
   title: SOL012 - Policy Management Notification Interface
   description: >
-    SOL012 - Policy Management Notification Interface
+    SOL012 - Policy Management Interface
 
     IMPORTANT: Please note that this file might be not aligned to the current version of the ETSI Group Specification
     it refers to. In case of discrepancies the published ETSI Group Specification takes precedence.
 
-    Please report bugs to https://forge.etsi.org/bugzilla/buglist.cgi?component=Nfv-Openapis&list_id=61&product=NFV&resolution=
+    Please report bugs to https://forge.etsi.org/rep/nfv/SOL012/issues
   license:
     name: ETSI Forge copyright notice
     url: https://forge.etsi.org/etsi-forge-copyright-notice.txt
 externalDocs:
-  description: ETSI GS NFV-SOL 012 V3.3.1
+  description: ETSI GS NFV-SOL 012 v3.3.1
   url: https://docbox.etsi.org/ISG/NFV/Open/Drafts/SOL012ed331_Protocol_Spec_for_Policy_Mgmt_Intface/NFV-SOL012ed331v010.zip
 
 security:
@@ -24,9 +24,9 @@ servers:
   - url: https://127.0.0.1/callback/v1
 
 paths:
-  /URI_is_provided_by_the_API_consumer_when_creating_the_subscription_PolicyManagementNotification::
+  /URI_is_provided_by_the_API_consumer_when_creating_the_subscription_PolicyManagementNotification:
     description: >-
-      TThis resource represents a notification endpoint for policy management. 
+      This resource represents a notification endpoint for policy management.
       The API producer can use this resource to send notifications related to policy management events to 
       a subscribed API consumer, which has provided the URI of this resource during the subscription process.
     parameters: