diff --git a/playbooks/roles/statusbot/defaults/main.yaml b/playbooks/roles/statusbot/defaults/main.yaml
index 61fcb851a3..8f8ba9c4b0 100644
--- a/playbooks/roles/statusbot/defaults/main.yaml
+++ b/playbooks/roles/statusbot/defaults/main.yaml
@@ -16,3 +16,6 @@ statusbot_wiki_thankspageid: '37700'
 statusbot_wiki_thankspageurl: 'https://wiki.openstack.org/wiki/Thanks'
 statusbot_irclogs_url  : 'http://eavesdrop.openstack.org/irclogs/%(chan)s/%(chan)s.%(date)s.log.html'
 statusbot_twitter: True
+
+statusbot_mastodon: True
+statusbot_mastodon_host: 'https://fosstodon.org'
diff --git a/playbooks/roles/statusbot/templates/statusbot.config.j2 b/playbooks/roles/statusbot/templates/statusbot.config.j2
index 047293413a..22cfd30e84 100644
--- a/playbooks/roles/statusbot/templates/statusbot.config.j2
+++ b/playbooks/roles/statusbot/templates/statusbot.config.j2
@@ -44,3 +44,9 @@ consumer_secret={{ statusbot_twitter_secret }}
 access_token_key={{ statusbot_twitter_token_key }}
 access_token_secret={{ statusbot_twitter_token_secret }}
 {% endif %}
+
+{% if statusbot_mastodon %}
+[mastodon]
+host={{ statusbot_mastodon_host }}
+token={{ statusbot_mastodon_token }}
+{% endif %}
diff --git a/playbooks/zuul/templates/group_vars/eavesdrop.yaml.j2 b/playbooks/zuul/templates/group_vars/eavesdrop.yaml.j2
index 1a86d1be70..618e0e4068 100644
--- a/playbooks/zuul/templates/group_vars/eavesdrop.yaml.j2
+++ b/playbooks/zuul/templates/group_vars/eavesdrop.yaml.j2
@@ -1,4 +1,5 @@
 openstack_meetbot_password: password
+statusbot_mastodon_token: token
 statusbot_nick_password: password
 statusbot_wiki_user: username
 statusbot_wiki_password: password