diff --git a/os-jdg7-launch/added/launch/infinispan-config.sh b/os-jdg7-launch/added/launch/infinispan-config.sh
index 7716e1ca..04d7905f 100644
--- a/os-jdg7-launch/added/launch/infinispan-config.sh
+++ b/os-jdg7-launch/added/launch/infinispan-config.sh
@@ -490,8 +490,9 @@ function configure_container_security() {
       if [ -n "$CONTAINER_SECURITY_CUSTOM_ROLE_MAPPER_CLASS" ] && [ "$CONTAINER_SECURITY_ROLE_MAPPER" == "custom-role-mapper" ]; then
         local CONTAINER_SECURITY_CUSTOM_ROLE_MAPPER_CLASS="class=\"$CONTAINER_SECURITY_CUSTOM_ROLE_MAPPER_CLASS\""
       fi
-      local rolemapper="\
-                        <$CONTAINER_SECURITY_ROLE_MAPPER $CONTAINER_SECURITY_CUSTOM_ROLE_MAPPER_CLASS/>"
+      if [ "$CONTAINER_SECURITY_ROLE_MAPPER" == "identity-role-mapper" -o "$CONTAINER_SECURITY_ROLE_MAPPER" == "common-name-role-mapper" -o "$CONTAINER_SECURITY_ROLE_MAPPER" == "cluster-role-mapper" -o "$CONTAINER_SECURITY_ROLE_MAPPER" == "custom-role-mapper" ]; then
+        local rolemapper="<$CONTAINER_SECURITY_ROLE_MAPPER/>"
+      fi
     fi
 
     if [ -n "$CONTAINER_SECURITY_ROLES" ]; then