diff --git a/app/components/teams/team/member.hbs b/app/components/teams/team/member.hbs
index ed8cd6a5d..79aac8a37 100644
--- a/app/components/teams/team/member.hbs
+++ b/app/components/teams/team/member.hbs
@@ -40,5 +40,31 @@
{{~! ~}}{{svg-jar "twitter"}}{{~! ~}}
{{/if}}
+
+ {{#if @member.mastodon}}
+
+ {{~! ~}}{{svg-jar "mastodon"}}{{~! ~}}
+
+ {{/if}}
+
+ {{#if @member.bluesky}}
+
+ {{~! ~}}{{svg-jar "bluesky"}}{{~! ~}}
+
+ {{/if}}
diff --git a/app/models/team-member.js b/app/models/team-member.js
index 1c526a7d3..a6836ceb8 100644
--- a/app/models/team-member.js
+++ b/app/models/team-member.js
@@ -2,10 +2,12 @@ import Model, { attr } from '@ember-data/model';
export default class TeamMemberModel extends Model {
@attr('date') added;
+ @attr bluesky;
@attr first;
@attr github;
@attr image;
@attr last;
+ @attr mastodon;
@attr name;
@attr teams;
@attr twitter;
diff --git a/blueprints/team-member/files/data/team-member/__name__.md b/blueprints/team-member/files/data/team-member/__name__.md
index f71339eb5..5a8aa411c 100644
--- a/blueprints/team-member/files/data/team-member/__name__.md
+++ b/blueprints/team-member/files/data/team-member/__name__.md
@@ -2,7 +2,9 @@
name: <%= dasherizedModuleName %>
first:
last:
+bluesky:
github:
+mastodon:
twitter:
image:
added: <%= date %>
diff --git a/lib/content-data-generator/index.js b/lib/content-data-generator/index.js
index 64b0f6e73..aa1d3861b 100644
--- a/lib/content-data-generator/index.js
+++ b/lib/content-data-generator/index.js
@@ -27,7 +27,9 @@ const teamTree = new StaticSiteJson(`data/team-member`, {
'name',
'first',
'last',
+ 'bluesky',
'github',
+ 'mastodon',
'twitter',
'image',
'teams',
diff --git a/public/images/icons/bluesky.svg b/public/images/icons/bluesky.svg
new file mode 100644
index 000000000..c5d59f1d3
--- /dev/null
+++ b/public/images/icons/bluesky.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/public/images/icons/mastodon.svg b/public/images/icons/mastodon.svg
new file mode 100644
index 000000000..3d41e9aec
--- /dev/null
+++ b/public/images/icons/mastodon.svg
@@ -0,0 +1,3 @@
+