diff --git a/content/documentation/ssp/4-ssp-template-to-oscal-mapping.md b/content/documentation/ssp/4-ssp-template-to-oscal-mapping.md
index 208906d..d12a447 100644
--- a/content/documentation/ssp/4-ssp-template-to-oscal-mapping.md
+++ b/content/documentation/ssp/4-ssp-template-to-oscal-mapping.md
@@ -470,7 +470,7 @@ The system functionality in the FedRAMP SSP template document is specified in th
---
## Information System Owner
-A role with an ID value of \"system-owner\" is required. Use the responsible-party assembly to associate this role with the party assembly containing the System Owner's information.
+A `role` with an ID value of "system-owner" is required. Use the `responsible-party` assembly to associate this `role` with the `party` assembly containing the System Owner's information. The `responsible-party` for a "system-owner" must be a `party` of type "person".
{{< figure src="/img/ssp-figure-12.png" title="FedRAMP SSP template information system owner." alt="Screenshot of the system owner information in the FedRAMP SSP template." >}}
@@ -537,9 +537,7 @@ If no country is provided, FedRAMP tools will assume a US address.
---
## Federal Authorizing Officials
-A role with an ID value of "authorizing-official" is required. Use the responsible-party assembly to associate this role with the party assembly containing the Authorizing Official's information.
-
-{{< figure src="/img/ssp-figure-13.png" title="FedRAMP SSP template federal authorizing officials." alt="Screenshot of the federal authorizing official information in the FedRAMP SSP template." >}}
+A `role` with an ID value of "authorizing-official" is required. Use the `responsible-party` assembly to associate this role with the `party` assembly containing the Authorizing Official's information.
##### Federal Agency Authorization Representation
{{< highlight xml "linenos=table" >}}
@@ -549,16 +547,16 @@ A role with an ID value of "authorizing-official" is required. Use the responsib
Agency Name
-
-
- [SAMPLE]Person Name 6
-
- name@example.com
- 202-000-0000
- uuid-of-agency
+
+ Address Line
+ City
+ ST
+ 00000
+ US
+
- uuid-of-person-6
+ uuid-of-agency
@@ -575,81 +573,14 @@ A role with an ID value of "authorizing-official" is required. Use the responsib
{{< highlight xml "linenos=table" >}}
FedRAMP Authorization Type:
/*/system-characteristics/prop[@name="authorization-type"][@ns="https://fedramp.gov/ns/oscal"]/@value
- Authorizing Official’s Name:
- /*/metadata/party[@uuid=[/*/metadata/responsible-party [@role-id="authorizing-official"]/party-uuid]]/name
- NOTE: Replace "name" with "email-address" or "telephone-number" above as needed.
- Authorizing Official’s Title:
- /*/metadata/party[@uuid=[/*/metadata/responsible-party [@role-id="authorizing-official"]/party-uuid]]/prop[@name='job-title']
- Authorizing Official's Agency:
- /*/metadata/party[@uuid=/*/metadata/party[@uuid=[/*/metadata/responsible-party [@role-id="authorizing-official"]/party-uuid]]/member-of-organization]/name
-{{}}
-
-**NOTE:**
-
-If the authorization-type field is "fedramp-jab", the responsible-party/party-uuid field must be the uuid value for the FedRAMP JAB.
-
----
-#### Federal JAB P-ATO Authorization Representation
-{{< highlight xml "linenos=table" >}}
-
-
-
- Authorizing Official
- The government executive(s) who authorize this system.
-
-
-
- FedRAMP: Joint Authorization Board
- FedRAMP JAB
-
-
-
- uuid-of-fedramp-jab
-
-
-
-
-
- fedramp-jab
-
-
+ Authorizing Official:
+ /*/metadata/party[@uuid=[/*/metadata/responsible-party[@role-id="authorizing-official"]/party-uuid]]/name
{{}}
-#### XPath Queries
-{{< highlight xml "linenos=table" >}}
- Authorizing Official’s Name:
- //metadata/party[@uuid=[//metadata/responsible-party[@role-id="authorizing-official"]/party-uuid]]/name
-{{}}
-
-
-{{}}
-
-**FedRAMP Extension:**
-
-prop (ns="https://fedramp.gov/ns/oscal")
-- name="authorization-type"
-
-**FedRAMP Allowed Values**
-- fedramp-jab
-- fedramp-agency
-- fedramp-li-saas
-
-**OSCAL Allowed Value**
-
-Required Role ID:
-- authorizing-official
-
-{{}}
-
-
---
-
## Assignment of Security Responsibilities
-A role with an ID value of "information-system-security-officer" is
-required. Use the responsible-party assembly to associate this role with the party assembly containing the Information
-System Security Officer's information.
+A `role` with an ID value of "information-system-security-officer" is required. Use the `responsible-party` assembly to associate this `role` with the `party` assembly containing the Information System Security Officer's information. The `responsible-party` for a "information-system-security-officer" must be a `party` of type "person".
{{< figure src="/img/ssp-figure-14.png" title="FedRAMP SSP template security point of contact." alt="Screenshot of the security point of contact information (e.g., ISSO) in the FedRAMP SSP template." >}}
@@ -694,9 +625,8 @@ A tool developer may elect to always create a location assembly, even when only
uuid-of-hq-location
uuid-of-csp
-
-
- uuid-of-person-7
+
+ uuid-of-person-10
{{}}
@@ -727,6 +657,21 @@ Required Role ID:
---
+## Summary of SSP Roles Requirements
+
+A FedRAMP OSCAL SSP must have "system-owner" `role` defined, an "authorizing-official" `role`, and an "information-system-security-officer" `role` defined. The "system-owner" and "information-system-security-officer" roles must use the `responsible-party` assembly to associate the role to a `party` of type "person". For details, see the [System Owner](#information-system-owner) and [Assignment of Security Responsibilities](#assignment-of-security-responsibilities) sections.
+
+The roles listed below are no longer required by FedRAMP:
+- "authorizing-official-poc"
+- "system-poc"
+- "system-poc-management"
+- "system-poc-technical"
+- "system-poc-other"
+
+If SSP authors include these optional roles in the SSP, they should give consideration to which `responsible-party` and corresponding `party` to associate with the role. Generally, "poc" roles should be associated with a `party` of type "person".
+
+---
+
## Data Centers
Each system must define at least two data centers. There must be exactly one primary data center, and there must be at least one alternate data center. Additionally, the country specified in the data center's address must be the United States. It must be in [ISO 3166 Alpha-2 format](https://pages.nist.gov/OSCAL-Reference/models/v1.1.2/system-security-plan/xml-reference/#/system-security-plan/metadata/location/address/country) two-letter country code format (i.e., "US" in all upper case).