diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index 2754a85bfda..1f7e9d1db04 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -177,6 +177,7 @@
 		<migration class="PKP\migration\upgrade\v3_6_0\I4860_MigratePublicationAddCreatedAt"/>
 		<migration class="PKP\migration\upgrade\v3_6_0\I4860_MigratePublicationVersionSourcePublicationId"/>
 		<migration class="PKP\migration\upgrade\v3_6_0\I11326_UserComments"/>
+		<migration class="PKP\migration\upgrade\v3_6_0\I857_CreditRoles"/>
 		<note file="docs/release-notes/README-3.6.0" />
 	</upgrade>
 
diff --git a/lib/pkp b/lib/pkp
index 787b1997546..036af20d176 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 787b1997546d6d7a1f2dd13118a56ca4c59cb02b
+Subproject commit 036af20d176c3dc32d5b36b59c7b41bf5688bcef
diff --git a/lib/ui-library b/lib/ui-library
index 54b86d7b2c1..5b237adfb14 160000
--- a/lib/ui-library
+++ b/lib/ui-library
@@ -1 +1 @@
-Subproject commit 54b86d7b2c100a85e74c005c9fcc264122ea2f77
+Subproject commit 5b237adfb145dfa4ec0991bab83ddca01977d22e
diff --git a/pages/catalog/CatalogBookHandler.php b/pages/catalog/CatalogBookHandler.php
index 858f522ac53..c154ec2740f 100755
--- a/pages/catalog/CatalogBookHandler.php
+++ b/pages/catalog/CatalogBookHandler.php
@@ -297,6 +297,11 @@ public function book($args, $request)
         $rorIdIcon = file_exists($rorIconPath) ? file_get_contents($rorIconPath) : '';
         $templateMgr->assign('rorIdIcon', $rorIdIcon);
 
+        // Credit Role Terms
+        $templateMgr->assign([
+            'creditRoleTerms' => Repo::CreditRole()->getTerms(),
+        ]);
+
         // Ask robots not to index outdated versions and point to the canonical url for the latest version
         if ($this->publication->getId() != $submission->getData('currentPublicationId')) {
             $templateMgr->addHeader('noindex', '<meta name="robots" content="noindex">');
diff --git a/plugins/themes/default/styles/objects/monograph_full.less b/plugins/themes/default/styles/objects/monograph_full.less
index 6b049282b05..11a79ba9d7e 100644
--- a/plugins/themes/default/styles/objects/monograph_full.less
+++ b/plugins/themes/default/styles/objects/monograph_full.less
@@ -66,6 +66,12 @@
 				vertical-align: middle;
 			}
 		}
+
+		.credit_roles {
+			display: block;
+			font-size: @font-sml;
+			line-height: @double;
+		}
 	}
 
 	.entry_details {
diff --git a/templates/frontend/components/authors.tpl b/templates/frontend/components/authors.tpl
index 3cea04ee03f..982fe217c62 100644
--- a/templates/frontend/components/authors.tpl
+++ b/templates/frontend/components/authors.tpl
@@ -12,6 +12,7 @@
  * @uses $editors Array List of editors for this monograph if this is an edited
  *       volume. Otherwise empty.
  * @uses $isChapterRequest bool Is true, if a chapter landing page is requested and not a monograph landing page
+ * @uses $creditRoleTerms Array of translated credit role terms: roles and degrees
  *}
 
 <div class="item authors">
@@ -57,6 +58,21 @@
 						</a>
 					</span>
 				{/if}
+				{if $author->getData('creditRoles')}
+					<span class="credit_roles">
+					{strip}
+					{foreach $author->getData('creditRoles') as $credit}
+						<span class="value">
+							{$creditRoleTerms.roles[$credit.role]|escape}
+							{if $creditRoleTerms.degrees[$credit.degree]}
+								&nbsp;({$creditRoleTerms.degrees[$credit.degree]|escape})
+							{/if}
+						</span>
+						{if !$credit@last}{translate key="common.commaListSeparator"}{/if}
+					{/foreach}
+					{/strip}
+					</span>
+				{/if}
 			</div>
 		{/foreach}