diff --git a/config.toml b/config.toml
index 2cf129c85531f5871e52b94dc70d6dc858cdee6d..432a2fd0afd982347e0d784bef8f098f604291e4 100644
--- a/config.toml
+++ b/config.toml
@@ -184,18 +184,19 @@ pluralizeListTitles = false
url = "/security"
weight = 1
-[[menu.sidebar]]
- parent = "security"
- name = "Known Vulnerabilities"
- url = "/security/known"
- weight = 1
-
[[menu.sidebar]]
identifier = "security"
name = "Security"
url = "/security"
weight = 1
+[[menu.sidebar]]
+ parent = "security"
+ name = "Known Vulnerabilities"
+ url = "/security/known"
+ pre = "<i class=\"fa fa-caret-right fa-fw\"></i>"
+ weight = 1
+
[[menu.sidebar]]
parent = "security"
name = "Mail the Security Team"
diff --git a/content/security/team/_index.md b/content/security/team/_index.md
index f93814e681b6731cfdce81b892336701677de78b..f8721dc6df0aa14a76da9db8204f4a53b98483ba 100644
--- a/content/security/team/_index.md
+++ b/content/security/team/_index.md
@@ -5,9 +5,18 @@ seo_title: Security Team | Security | Eclipse Foundation
## Staff Members
+The Eclipse Staff Team is part of the Foundation’s effort to improve security posture both on projects and our own services. The main goal of the team is to increase security and compliance with international laws and regulations, providing members and contributors with the tools and guidelines best suited for the current landscape. \
+As part of the strategy to improve security, the team may approach Eclipse Foundation project committers through the official and commonly used channels, using only the accounts appointed below.
+
+If you notice permissions given to security personnel on any repository or shared space, be sure to check this page for updated accounts, keys and names. The team will use those permissions only when necessary and will use pull requests (or equivalent) in project repositories every time it is possible. \
+You may notice the aforementioned permissions in security relevant spaces such as your project repository or the _.eclipsefdn_ repository on a GitHub organization.
+
+No one in the security team will ever ask for your private credentials.
+
{{< pages/security/team type="staff" >}}
-## Community Members
+## Other Members
+The individuals listed below are part of the security@eclipse-foundation.org mailing list in addition to above staff members. They consist of volunteer security experts who come from both the community and EMO (Eclipse Management Organization).
-{{< pages/security/team type="community" >}}
+{{< pages/security/team type="other" >}}
diff --git a/data/security/team.yml b/data/security/team.yml
index 8663150d46b5945adb6ea5a36afc1c4a6c93aa35..c3d9deff0f8a49c79039935eb6d869666caf2a5c 100644
--- a/data/security/team.yml
+++ b/data/security/team.yml
@@ -23,7 +23,7 @@ link_types:
twitter:
icon: fa fa-twitter
mastodon:
- icon: fa fa-square-share-o
+ icon: fa fa-share-alt
website:
icon: fa fa-safari
email:
@@ -133,5 +133,107 @@ staff:
type: email
url: mailto:marta.rybczynska@eclipse-foundation.org
-# Community members
-community: []
+# Other members on the ML
+other:
+ - name: Stewart Addison
+ image: https://accounts.eclipse.org/sites/default/files/styles/site_login_profile_thumbnail/public/profile_pictures/picture-443079-1592562874.jpg
+ links:
+ - text: saddisonxls
+ type: eclipse
+ url: https://accounts.eclipse.org/users/saddisonxls
+ - text: saddisonxls
+ type: eclipse_gitlab
+ url: https://gitlab.eclipse.org/saddisonxls
+ - text: sxa
+ type: github
+ url: https://github.com/sxa
+ - text: "@sxaTech"
+ type: twitter
+ url: https://www.twitter.com/sxaTech
+ - name: Wayne Beaton
+ image: https://www.eclipse.org/org/foundation/images_staff/wayne-beaton.jpg
+ links:
+ - text: wbeaton
+ type: eclipse
+ url: https://accounts.eclipse.org/users/wbeaton
+ - text: wbeaton
+ type: eclipse_gitlab
+ url: https://gitlab.eclipse.org/wbeaton
+ - text: waynebeaton
+ type: github
+ url: https://github.com/waynebeaton
+ - text: "@waynebeaton"
+ type: twitter
+ url: https://www.twitter.com/waynebeaton
+ - text: waynebeaton.wordpress.com
+ type: website
+ url: https://waynebeaton.wordpress.com/
+ - name: Christopher Guindon
+ image: https://www.eclipse.org/org/foundation/images_staff/chris.jpg
+ links:
+ - text: cguindon
+ type: eclipse
+ url: https://accounts.eclipse.org/users/cguindon
+ - text: cguindon
+ type: eclipse_gitlab
+ url: https://gitlab.eclipse.org/cguindon
+ - text: chrisguindon
+ type: github
+ url: https://github.com/chrisguindon
+ - text: "@chrisguindon"
+ type: twitter
+ url: https://www.twitter.com/chrisguindon
+ - text: chrisguindon.com
+ type: website
+ url: https://www.chrisguindon.com/
+ - name: Alexander Kurtakov
+ image: https://secure.gravatar.com/avatar/37ef89170bcdf23407f99586cb32343d.jpg
+ links:
+ - text: akurtakov
+ type: eclipse
+ url: https://accounts.eclipse.org/users/akurtakov
+ - text: akurtakov
+ type: eclipse_gitlab
+ url: https://gitlab.eclipse.org/akurtakov
+ - text: akurtakov
+ type: github
+ url: https://github.com/akurtakov
+ - text: "@akurtakov"
+ type: twitter
+ url: https://www.twitter.com/akurtakov
+ - text: akurtakov.blogspot.bg
+ type: website
+ url: https://akurtakov.blogspot.com/
+ - name: Jesse McConnell
+ image: https://secure.gravatar.com/avatar/5a3d9f0dcb7b133e92d2cd76e748702d.jpg
+ links:
+ - text: jmcconnell
+ type: eclipse
+ url: https://accounts.eclipse.org/users/jmcconnell
+ - text: jmcconnell
+ type: eclipse_gitlab
+ url: https://gitlab.eclipse.org/jmcconnell
+ - text: jmcc0nn3ll
+ type: github
+ url: https://github.com/jmcc0nn3ll
+ - text: webtide.com
+ type: website
+ url: https://webtide.com/
+ - name: Jens Reimann
+ image: https://accounts.eclipse.org/sites/default/files/styles/site_login_profile_thumbnail/public/profile_pictures/picture-3834-1596011678.jpg
+ links:
+ - text: jreimann
+ type: eclipse
+ url: https://accounts.eclipse.org/users/jreimann
+ - text: jreimann
+ type: eclipse_gitlab
+ url: https://gitlab.eclipse.org/jreimann
+ - text: ctron
+ type: github
+ url: https://github.com/ctron
+ - text: "@ctron"
+ type: twitter
+ url: https://www.twitter.com/ctron
+ - text: dentrassi.de
+ type: website
+ url: https://dentrassi.de/
diff --git a/layouts/shortcodes/pages/security/team.html b/layouts/shortcodes/pages/security/team.html
index 3b90dcff2a533f5ddef1868c5e9ee0f1e2568103..7f36fe651abd0975b8334afbf840ae40b5481bd0 100644
--- a/layouts/shortcodes/pages/security/team.html
+++ b/layouts/shortcodes/pages/security/team.html
@@ -53,7 +53,7 @@
<dt>
<a href="{{ .url }}">
<i class="{{ $type.icon }}" aria-hidden="true"></i>
- {{ .text }}{{ $type.postfix }}
+ {{ .text }} {{ $type.postfix }}
</a>
</dt>
{{ end }}