diff --git a/doc/source/static.rst b/doc/source/static.rst
index 571a7a9f7a..3d43e221fe 100644
--- a/doc/source/static.rst
+++ b/doc/source/static.rst
@@ -13,7 +13,6 @@ At a Glance
 
 :Hosts:
   * http://logs.openstack.org
-  * http://docs-draft.openstack.org
   * http://status.openstack.org
   * http://mirror.openstack.org
   * http://specs.openstack.org
diff --git a/manifests/site.pp b/manifests/site.pp
index 7db639b60a..d7a5f7fa5f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -755,11 +755,11 @@ node 'storyboard.openstack.org' {
     hostname                => $::fqdn,
     valid_oauth_clients     => [
       $::fqdn,
-      'docs-draft.openstack.org',
+      'logs.openstack.org',
     ],
     cors_allowed_origins     => [
       "https://${::fqdn}",
-      'http://docs-draft.openstack.org',
+      'http://logs.openstack.org',
     ],
     sender_email_address => 'storyboard@storyboard.openstack.org',
   }
@@ -779,11 +779,11 @@ node 'storyboard-dev.openstack.org' {
     hostname                => $::fqdn,
     valid_oauth_clients     => [
       $::fqdn,
-      'docs-draft.openstack.org',
+      'logs.openstack.org',
     ],
     cors_allowed_origins     => [
       "https://${::fqdn}",
-      'http://docs-draft.openstack.org',
+      'http://logs.openstack.org',
     ],
     sender_email_address => 'storyboard-dev@storyboard-dev.openstack.org',
   }
diff --git a/modules/openstack_project/manifests/static.pp b/modules/openstack_project/manifests/static.pp
index dc051985a8..bceeccf0e6 100644
--- a/modules/openstack_project/manifests/static.pp
+++ b/modules/openstack_project/manifests/static.pp
@@ -261,39 +261,6 @@ class openstack_project::static (
     require => [File['/srv/static/logs/help'], Vcsrepo['/opt/tripleo-ci']],
   }
 
-  ###########################################################
-  # Docs-draft
-
-  ::httpd::vhost { 'docs-draft.openstack.org':
-    port       => 443, # Is required despite not being used.
-    docroot    => '/srv/static/docs-draft',
-    priority   => '50',
-    ssl        => true,
-    template   => 'openstack_project/static-http-and-https.vhost.erb',
-    vhost_name => 'docs-draft.openstack.org',
-    require    => [
-      File['/srv/static/docs-draft'],
-      File[$cert_file],
-      File[$key_file],
-    ],
-  }
-
-  file { '/srv/static/docs-draft':
-    ensure  => directory,
-    owner   => 'jenkins',
-    group   => 'jenkins',
-    require => User['jenkins'],
-  }
-
-  file { '/srv/static/docs-draft/robots.txt':
-    ensure  => present,
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0444',
-    source  => 'puppet:///modules/openstack_project/disallow_robots.txt',
-    require => File['/srv/static/docs-draft'],
-  }
-
   ###########################################################
   # Security