diff --git a/manifests/site.pp b/manifests/site.pp
index fe88f2fa90..f17204fb14 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -424,7 +424,11 @@ node 'storyboard.openstack.org' {
     rabbitmq_password       => hiera('storyboard_rabbit_password', 'XXX'),
     ssl_cert_file_contents  => hiera('storyboard_ssl_cert_file_contents', 'XXX'),
     ssl_key_file_contents   => hiera('storyboard_ssl_key_file_contents', 'XXX'),
-    ssl_chain_file_contents => hiera('storyboard_ssl_chain_file_contents', 'XXX')
+    ssl_chain_file_contents => hiera('storyboard_ssl_chain_file_contents', 'XXX'),
+    valid_oauth_clients     => [
+      $::fqdn,
+      'docs-draft.openstack.org',
+    ],
   }
 }
 
diff --git a/modules/openstack_project/manifests/storyboard.pp b/modules/openstack_project/manifests/storyboard.pp
index 45ab947093..51c434987b 100644
--- a/modules/openstack_project/manifests/storyboard.pp
+++ b/modules/openstack_project/manifests/storyboard.pp
@@ -12,6 +12,7 @@ class openstack_project::storyboard(
   $ssl_chain_file_contents = undef,
   $openid_url = 'https://login.launchpad.net/+openid',
   $project_config_repo = '',
+  $valid_oauth_clients = [],
 ) {
 
   class { 'project_config':
@@ -44,6 +45,7 @@ class openstack_project::storyboard(
       'https://storyboard.openstack.org',
       'http://docs-draft.openstack.org',
     ],
+    valid_oauth_clients    => $valid_oauth_clients,
     cors_max_age           => 3600,
     openid_url             => $openid_url,
     mysql_host             => $mysql_host,