diff --git a/_config.yml b/_config.yml
index 9d6121f90..8758dfa3f 100644
--- a/_config.yml
+++ b/_config.yml
@@ -15,9 +15,7 @@ github_editme_path: /edit/gh-pages/
 # if you're using Github, provide the basepath to the branch you've created for reviews, following the sample here. if not, leave this value blank.
 
 #disqus: true
-
 disqus_shortname: nhsconnect
-# if you're using disqus for comments, add the shortname here. if not, leave this value blank.
 
 gitter: true
 gitter_room: gpconnect/Lobby
@@ -25,6 +23,10 @@ gitter_room: gpconnect/Lobby
 tiny_letter: true
 tiny_letter_username: nhsconnectapi
 
+twitter: true
+twitter_username: nhsconnectapi
+twitter_site_hashtags: GPConnect
+
 host: 127.0.0.1
 # the preview server used. Leave as is.
 
diff --git a/_includes/twittercards.html b/_includes/twittercards.html
index 2a28699f3..1cf4e89af 100644
--- a/_includes/twittercards.html
+++ b/_includes/twittercards.html
@@ -1,6 +1,7 @@
+{% if site.twitter %}
 <meta name="twitter:card" content="summary">
-<meta name="twitter:site" content="@nhsconnectapi">
-<meta name="twitter:creator" content="@nhsconnectapi">
+<meta name="twitter:site" content="@{{site.twitter_username}}">
+<meta name="twitter:creator" content="@{{site.twitter_username}}">
 {% if page.title %}<meta name="twitter:title" content="{{ page.title }}">
 {% else %}<meta name="twitter:title" content="{{ site.title }}">
 {% endif %}{% if page.url %}<meta name="twitter:url" content="{{ site.url }}{{ page.url }}">
@@ -8,3 +9,4 @@
 {% else %}<meta name="twitter:description" content="{{ site.description }}">
 {% endif %}{% if page.thumbnail %}<meta name="twitter:image:src" content="{{ site.url }}/images/{{ page.thumbnail }}">
 {% else %}<meta name="twitter:image:src" content="{{ site.url }}/images/logo.png">{% endif %}
+{% endif %}
\ No newline at end of file
diff --git a/_includes/twitterfollow.html b/_includes/twitterfollow.html
index f2c45b5fc..6a2bda13c 100644
--- a/_includes/twitterfollow.html
+++ b/_includes/twitterfollow.html
@@ -1 +1,4 @@
-<a href="https://twitter.com/nhsconnectapi" class="twitter-follow-button" data-size="large" data-show-count="false">Follow @nhsconnectapi</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
\ No newline at end of file
+{% if site.twitter %}
+<p>Follow us on Twitter for all the latest news and announcements:</p>
+<a href="https://twitter.com/{{site.twitter_username}}" class="twitter-follow-button" data-size="large" data-show-count="false">Follow @{{site.twitter_username}}</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
+{% endif %}
\ No newline at end of file
diff --git a/_includes/twittershare.html b/_includes/twittershare.html
index 77036a3f1..600bfa01c 100644
--- a/_includes/twittershare.html
+++ b/_includes/twittershare.html
@@ -1 +1,3 @@
-<a href="http://twitter.com/share?url={{page.url}}&text={{page.title}}&via=nhsconnectapi&hashtags=GPConnect" class="twitter-share-button" data-size="large" data-show-count="true">Tweet Me</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
\ No newline at end of file
+{% if site.twitter %}
+<a href="http://twitter.com/share?url={{page.url}}&text={{page.title}}&via={{site.twitter_username}}&hashtags={{site.twitter_site_hashtags}}" class="twitter-share-button" data-size="large" data-show-count="true">Tweet Me</a><script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
+{% endif %}
\ No newline at end of file
diff --git a/_includes/twittertimeline.html b/_includes/twittertimeline.html
index 8d45c7570..4385ee0d1 100644
--- a/_includes/twittertimeline.html
+++ b/_includes/twittertimeline.html
@@ -1 +1,3 @@
-<a class="twitter-timeline" data-height="600" href="https://twitter.com/nhsconnectapi">Tweets by @nhsconnectapi</a> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
\ No newline at end of file
+{% if site.twitter %}
+<a class="twitter-timeline" data-height="600" href="https://twitter.com/{{site.twitter_username}}">Tweets by @{{site.twitter_username}}</a> <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
+{% endif %}
\ No newline at end of file
diff --git a/index.md b/index.md
index 167cf7d6c..1df8cc9e7 100644
--- a/index.md
+++ b/index.md
@@ -22,8 +22,6 @@ GP Connect aims to support better clinical care by opening up information and da
 
 Find out more on the [NHS Digital GP Connect homepage](http://systems.digital.nhs.uk/gpsoc/interface/gpconnect).
 
-Follow us on Twitter for all the latest news and announcements:
-
 {% include twitterfollow.html %}
 
 Or join the developer chat on Gitter: