diff --git a/Workbench/grouper_ui/Dockerfile b/Workbench/grouper_ui/Dockerfile
index 1ec8034..4aae88d 100644
--- a/Workbench/grouper_ui/Dockerfile
+++ b/Workbench/grouper_ui/Dockerfile
@@ -1,4 +1,5 @@
 FROM i2incommon/grouper:2.5.57
+
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>"
 
 ARG CSPHOSTNAME=localhost
diff --git a/Workbench/idp/shibboleth-idp/metadata/idpui-sp.xml b/Workbench/idp/shibboleth-idp/metadata/idpui-sp.xml
index 824bd24..5d1bf47 100644
--- a/Workbench/idp/shibboleth-idp/metadata/idpui-sp.xml
+++ b/Workbench/idp/shibboleth-idp/metadata/idpui-sp.xml
@@ -13,15 +13,15 @@
     </md:Extensions>
     <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
         <md:Extensions>
-            <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://__CSPHOSTNAME__/idpui/callback?client_name=Saml2Client"/>
+            <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://__CSPHOSTNAME__/idpui/callback?client_name=shibUIAuthClient"/>
         </md:Extensions>
         <md:KeyDescriptor use="signing" />
         <md:KeyDescriptor use="encryption" />
-        <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://__CSPHOSTNAME__/idpui/callback?client_name=Saml2Client&amp;idplogoutrequest=true"/>
+        <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://__CSPHOSTNAME__/idpui/callback?client_name=shibUIAuthClient&amp;idplogoutrequest=true"/>
         <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
         <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
         <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
         <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-        <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://__CSPHOSTNAME__/idpui/callback?client_name=Saml2Client" index="0"/>
+        <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://__CSPHOSTNAME__/idpui/callback?client_name=shibUIAuthClient" index="0"/>
     </md:SPSSODescriptor>
-</md:EntityDescriptor>
\ No newline at end of file
+</md:EntityDescriptor>
diff --git a/Workbench/idp_ui/Dockerfile b/Workbench/idp_ui/Dockerfile
index f5452b4..2f449e3 100644
--- a/Workbench/idp_ui/Dockerfile
+++ b/Workbench/idp_ui/Dockerfile
@@ -1,4 +1,4 @@
-FROM i2incommon/shib-idp-ui:1.9.0
+FROM i2incommon/shib-idp-ui:1.9.2
 
 ARG CSPHOSTNAME=localhost
 ENV CSPHOSTNAME=$CSPHOSTNAME
diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/orgs/700-org-wordpress-admin.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/orgs/700-org-wordpress-admin.xml
deleted file mode 100644
index 5d9984b..0000000
--- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/orgs/700-org-wordpress-admin.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<objects xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-	xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-	xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3">
-	<org xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3" xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3" xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3" xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3" xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3" oid="d0b2135a-f6bb-412b-bbef-5b76a1b32e52" version="6">
-    <name>generic_app:wordpress:admins</name>
-    <extension xmlns:gen376="http://grouper-demo.tier.internet2.edu">
-        <gen376:grouperName xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xsd:string">app:wordpress:admins</gen376:grouperName>
-        <gen376:ldapDn xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xsd:string">cn=app:wordpress:admins,ou=generic,ou=Groups,dc=internet2,dc=edu</gen376:ldapDn>
-    </extension>
-    <parentOrgRef oid="1f339075-5b2f-4a18-9c98-451f3eb0d28d" relation="org:default" type="c:OrgType">
-        <!-- generic-groups -->
-    </parentOrgRef>
-    <metadata>
-        <requestTimestamp>2020-12-31T16:22:32.989Z</requestTimestamp>
-        <requestorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType">
-            <!-- administrator -->
-        </requestorRef>
-        <createTimestamp>2020-12-31T16:22:33.049Z</createTimestamp>
-        <creatorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType">
-            <!-- administrator -->
-        </creatorRef>
-        <createChannel>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#reconciliation</createChannel>
-        <createTaskRef oid="605a0127-a313-442a-9d5e-151eac8b0745" relation="org:default" type="c:TaskType">
-            <!-- Grouper reconciliation (groups) -->
-        </createTaskRef>
-        <modifyTimestamp>2020-12-31T19:08:17.662Z</modifyTimestamp>
-        <modifierRef oid="e897468f-20bd-419c-8fc5-1fe60e2600de" relation="org:default" type="c:UserType">
-            <!-- banderson -->
-        </modifierRef>
-        <modifyChannel>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#user</modifyChannel>
-        <lastProvisioningTimestamp>2020-12-31T16:22:33.048Z</lastProvisioningTimestamp>
-    </metadata>
-    <lifecycleState>active</lifecycleState>
-    <operationExecution id="4">
-        <timestamp>2020-12-31T18:40:43.115Z</timestamp>
-        <status>success</status>
-        <initiatorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType">
-            <!-- administrator -->
-        </initiatorRef>
-        <taskRef oid="605a0127-a313-442a-9d5e-151eac8b0745" relation="org:default" type="c:TaskType">
-            <!-- Grouper reconciliation (groups) -->
-        </taskRef>
-        <channel>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#reconciliation</channel>
-    </operationExecution>
-    <assignment id="1">
-        <metadata>
-            <requestTimestamp>2020-12-31T16:22:32.989Z</requestTimestamp>
-            <requestorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType">
-                <!-- administrator -->
-            </requestorRef>
-            <createTimestamp>2020-12-31T16:22:33.049Z</createTimestamp>
-            <creatorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType">
-                <!-- administrator -->
-            </creatorRef>
-            <createChannel>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#reconciliation</createChannel>
-            <createTaskRef oid="605a0127-a313-442a-9d5e-151eac8b0745" relation="org:default" type="c:TaskType">
-                <!-- Grouper reconciliation (groups) -->
-            </createTaskRef>
-        </metadata>
-        <targetRef oid="5f2b96d2-49b5-4a8a-9601-14457309a69b" relation="org:default" type="c:ArchetypeType">
-            <!-- generic-grouper-group -->
-        </targetRef>
-        <activation>
-            <effectiveStatus>enabled</effectiveStatus>
-        </activation>
-    </assignment>
-    <iteration>0</iteration>
-    <iterationToken/>
-    <archetypeRef oid="5f2b96d2-49b5-4a8a-9601-14457309a69b" relation="org:default" type="c:ArchetypeType">
-        <!-- generic-grouper-group -->
-    </archetypeRef>
-    <roleMembershipRef oid="5f2b96d2-49b5-4a8a-9601-14457309a69b" relation="org:default" type="c:ArchetypeType">
-        <!-- generic-grouper-group -->
-    </roleMembershipRef>
-    <roleMembershipRef oid="1f339075-5b2f-4a18-9c98-451f3eb0d28d" relation="org:default" type="c:OrgType">
-        <!-- generic-groups -->
-    </roleMembershipRef>
-    <linkRef oid="ee269e22-a60d-473b-8f2c-00aa3d76d696" relation="org:default" type="c:ShadowType">
-        <!-- app:wordpress:admins -->
-    </linkRef>
-    <linkRef oid="58092e7d-2ed4-475a-b0e7-7bf68e7fa3c8" relation="org:default" type="c:ShadowType">
-        <!-- cn=app:wordpress:admins,ou=Generic,ou=Groups,dc=internet2,dc=edu -->
-    </linkRef>
-    <activation>
-        <effectiveStatus>enabled</effectiveStatus>
-        <enableTimestamp>2020-12-31T16:22:32.989Z</enableTimestamp>
-    </activation>
-    <displayName>app:wordpress:admins</displayName>
-    <identifier>app:wordpress:admins</identifier>
-    <inducement id="5">
-        <targetRef oid="9e5a82fc-7969-4fd8-9f74-e0857969cdbb" relation="org:default" type="c:RoleType">
-            <!-- Metarole Wordpress Admin -->
-        </targetRef>
-    </inducement>
-</org>
-
-</objects>
\ No newline at end of file
diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/orgs/700-org-wordpress-editor.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/orgs/700-org-wordpress-editor.xml
deleted file mode 100644
index 19e245e..0000000
--- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/orgs/700-org-wordpress-editor.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<objects xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-	xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-	xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3">
-	<org xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3" xmlns:org="http://midpoint.evolveum.com/xml/ns/public/common/org-3" xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3" xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3" xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3" oid="6ab6209f-af8f-4949-9d69-c1f6ae94d08e" version="6">
-    <name>generic_app:wordpress:editors</name>
-    <extension xmlns:gen376="http://grouper-demo.tier.internet2.edu">
-        <gen376:grouperName xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xsd:string">app:wordpress:editors</gen376:grouperName>
-        <gen376:ldapDn xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xsd:string">cn=app:wordpress:editors,ou=generic,ou=Groups,dc=internet2,dc=edu</gen376:ldapDn>
-    </extension>
-    <parentOrgRef oid="1f339075-5b2f-4a18-9c98-451f3eb0d28d" relation="org:default" type="c:OrgType">
-        <!-- generic-groups -->
-    </parentOrgRef>
-    <metadata>
-        <requestTimestamp>2020-12-31T16:22:33.522Z</requestTimestamp>
-        <requestorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType">
-            <!-- administrator -->
-        </requestorRef>
-        <createTimestamp>2020-12-31T16:22:33.571Z</createTimestamp>
-        <creatorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType">
-            <!-- administrator -->
-        </creatorRef>
-        <createChannel>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#reconciliation</createChannel>
-        <createTaskRef oid="605a0127-a313-442a-9d5e-151eac8b0745" relation="org:default" type="c:TaskType">
-            <!-- Grouper reconciliation (groups) -->
-        </createTaskRef>
-        <modifyTimestamp>2020-12-31T19:49:09.090Z</modifyTimestamp>
-        <modifierRef oid="e897468f-20bd-419c-8fc5-1fe60e2600de" relation="org:default" type="c:UserType">
-            <!-- banderson -->
-        </modifierRef>
-        <modifyChannel>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#user</modifyChannel>
-        <lastProvisioningTimestamp>2020-12-31T16:22:33.570Z</lastProvisioningTimestamp>
-    </metadata>
-    <lifecycleState>active</lifecycleState>
-    <operationExecution id="4">
-        <timestamp>2020-12-31T18:40:43.183Z</timestamp>
-        <status>success</status>
-        <initiatorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType">
-            <!-- administrator -->
-        </initiatorRef>
-        <taskRef oid="605a0127-a313-442a-9d5e-151eac8b0745" relation="org:default" type="c:TaskType">
-            <!-- Grouper reconciliation (groups) -->
-        </taskRef>
-        <channel>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#reconciliation</channel>
-    </operationExecution>
-    <assignment id="1">
-        <metadata>
-            <requestTimestamp>2020-12-31T16:22:33.522Z</requestTimestamp>
-            <requestorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType">
-                <!-- administrator -->
-            </requestorRef>
-            <createTimestamp>2020-12-31T16:22:33.571Z</createTimestamp>
-            <creatorRef oid="00000000-0000-0000-0000-000000000002" relation="org:default" type="c:UserType">
-                <!-- administrator -->
-            </creatorRef>
-            <createChannel>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#reconciliation</createChannel>
-            <createTaskRef oid="605a0127-a313-442a-9d5e-151eac8b0745" relation="org:default" type="c:TaskType">
-                <!-- Grouper reconciliation (groups) -->
-            </createTaskRef>
-        </metadata>
-        <targetRef oid="5f2b96d2-49b5-4a8a-9601-14457309a69b" relation="org:default" type="c:ArchetypeType">
-            <!-- generic-grouper-group -->
-        </targetRef>
-        <activation>
-            <effectiveStatus>enabled</effectiveStatus>
-        </activation>
-    </assignment>
-    <iteration>0</iteration>
-    <iterationToken/>
-    <archetypeRef oid="5f2b96d2-49b5-4a8a-9601-14457309a69b" relation="org:default" type="c:ArchetypeType">
-        <!-- generic-grouper-group -->
-    </archetypeRef>
-    <roleMembershipRef oid="5f2b96d2-49b5-4a8a-9601-14457309a69b" relation="org:default" type="c:ArchetypeType">
-        <!-- generic-grouper-group -->
-    </roleMembershipRef>
-    <roleMembershipRef oid="1f339075-5b2f-4a18-9c98-451f3eb0d28d" relation="org:default" type="c:OrgType">
-        <!-- generic-groups -->
-    </roleMembershipRef>
-    <linkRef oid="9ac441d5-1832-4f4e-a536-d5b2dba35cb5" relation="org:default" type="c:ShadowType">
-        <!-- app:wordpress:editors -->
-    </linkRef>
-    <linkRef oid="bfd8c935-28b8-431b-88a0-4842027dc483" relation="org:default" type="c:ShadowType">
-        <!-- cn=app:wordpress:editors,ou=Generic,ou=Groups,dc=internet2,dc=edu -->
-    </linkRef>
-    <activation>
-        <effectiveStatus>enabled</effectiveStatus>
-        <enableTimestamp>2020-12-31T16:22:33.523Z</enableTimestamp>
-    </activation>
-    <displayName>app:wordpress:editors</displayName>
-    <identifier>app:wordpress:editors</identifier>
-    <inducement id="5">
-        <targetRef oid="30082d24-0bea-4f22-b558-d0ee2a399c38" relation="org:default" type="c:RoleType">
-            <!-- Metarole Wordpress Editor -->
-        </targetRef>
-    </inducement>
-</org>
-
-</objects>
\ No newline at end of file
diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-grouper.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-grouper.xml
index 92ab570..3871d52 100644
--- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-grouper.xml
+++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/resources/100-grouper.xml
@@ -131,6 +131,50 @@
                         </set>
                     </target>
                 </inbound>
+                <inbound>
+                    <strength>strong</strength>
+                    <expression>
+                        <assignmentTargetSearch xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="c:AssignmentTargetSearchExpressionEvaluatorType">
+                            <targetType>RoleType</targetType>
+                            <oid>30082d24-0bea-4f22-b558-d0ee2a399c38</oid>
+                        </assignmentTargetSearch>
+                    </expression>
+                    <target>
+                        <path>assignment</path>
+                        <set>
+                            <predefined>all</predefined>
+                        </set>
+                    </target>
+                    <condition>
+                        <script xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="c:ScriptExpressionEvaluatorType">
+                            <code>
+                             input.startsWith('app:wordpress:editors')
+                          </code>
+                        </script>
+                    </condition>
+                </inbound>
+                <inbound>
+                    <strength>strong</strength>
+                    <expression>
+                        <assignmentTargetSearch xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="c:AssignmentTargetSearchExpressionEvaluatorType">
+                            <targetType>RoleType</targetType>
+                            <oid>9e5a82fc-7969-4fd8-9f74-e0857969cdbb</oid>
+                        </assignmentTargetSearch>
+                    </expression>
+                    <target>
+                        <path>assignment</path>
+                        <set>
+                            <predefined>all</predefined>
+                        </set>
+                    </target>
+                    <condition>
+                        <script xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="c:ScriptExpressionEvaluatorType">
+                            <code>
+                             input.startsWith('app:wordpress:admins')
+                          </code>
+                        </script>
+                    </condition>
+                </inbound>
             </attribute>
             <attribute>
                 <ref>ri:member</ref>
diff --git a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/roles/200-metarole-role-wordpress-admin.xml b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/roles/200-metarole-role-wordpress-admin.xml
index f3a099d..be8be36 100644
--- a/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/roles/200-metarole-role-wordpress-admin.xml
+++ b/Workbench/midpoint_server/container_files/mp-home/post-initial-objects/roles/200-metarole-role-wordpress-admin.xml
@@ -55,7 +55,7 @@
                         <c:path>$containingObject/name</c:path>
                     </source>
                     <expression>
-                        <value>admin</value>
+                        <value>administrator</value>
                     </expression>
                 </outbound>
             </attribute>
diff --git a/Workbench/webproxy/container_files/httpd/index.html b/Workbench/webproxy/container_files/httpd/index.html
index d14d4f3..82e26ca 100644
--- a/Workbench/webproxy/container_files/httpd/index.html
+++ b/Workbench/webproxy/container_files/httpd/index.html
@@ -8,10 +8,12 @@ <h3>Welcome to the InCommon TAP Workbench!</h3>
 <br /><br />
 The system contains the following TAP components (click the links to access each component in its own tab):
 <ul>
-<li><a href="https://__CSPHOSTNAME__/grouper" target="TAP-WB-GROUPER">Grouper (2.5.57)</a></li>
+
+ <li><a href="https://__CSPHOSTNAME__/grouper" target="TAP-WB-GROUPER">Grouper (2.5.57)</a></li>
  <li><a href="https://__CSPHOSTNAME__/midpoint" target="TAP-WB-MIDPOINT">midPoint (4.3.2)</a></li>
  <li><a href="https://__CSPHOSTNAME__/registry" target="TAP-WB-COMANAGE">COmanage Registry (3.3.2)</a></li>
-<li><a href="https://__CSPHOSTNAME__/idpui/" target="TAP-WB-IDPUI">Shibboleth IdP UI (1.9.0)</a></li>
+<li><a href="https://__CSPHOSTNAME__/idpui/" target="TAP-WB-IDPUI">Shibboleth IdP UI (1.9.2)</a></li>
+
 </ul>
 <br />
 The system also contains the following downstream/target applications: