diff --git a/modules/openstack_project/files/gerrit/system-cla.html b/modules/openstack_project/files/gerrit/system-cla.html
index b6c0f3b050..e970a56a77 100644
--- a/modules/openstack_project/files/gerrit/system-cla.html
+++ b/modules/openstack_project/files/gerrit/system-cla.html
@@ -6,7 +6,7 @@ Gerrit System Role Accounts Proxy CLA
 
 <p>
 This is not a real CLA and cannot be signed. See <a
-href="http://docs.openstack.org/infra/manual/developers.html#account-setup">the
+href="https://docs.openstack.org/infra/manual/developers.html#account-setup">the
 account setup instructions</a> for more information on OpenStack Contributor
 License Agreements.
 </p>
diff --git a/modules/openstack_project/files/gerrit/usg-cla.html b/modules/openstack_project/files/gerrit/usg-cla.html
index f5f4ddf29e..832fe152c9 100644
--- a/modules/openstack_project/files/gerrit/usg-cla.html
+++ b/modules/openstack_project/files/gerrit/usg-cla.html
@@ -8,7 +8,7 @@ OpenStack Project U.S. Government Contributor License Agreement
 This agreement is not managed through Gerrit. If you need to sign the U.S.
 Government Contributor License Agreement, please contact the OpenStack
 Foundation to initiate the process. See <a
-href="http://docs.openstack.org/infra/manual/developers.html#account-setup">the
+href="https://docs.openstack.org/infra/manual/developers.html#account-setup">the
 account setup instructions</a> for more information on OpenStack Contributor
 License Agreements.
 </p>
diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp
index 91174d864b..c9c9f48313 100644
--- a/modules/openstack_project/manifests/gerrit.pp
+++ b/modules/openstack_project/manifests/gerrit.pp
@@ -74,7 +74,7 @@ class openstack_project::gerrit (
   $web_repo_url_encode = false,
   $secondary_index = true,
   $report_bug_text = 'Get Help',
-  $report_bug_url = 'http://docs.openstack.org/infra/system-config/project.html#contributing',
+  $report_bug_url = 'https://docs.openstack.org/infra/system-config/project.html#contributing',
   $index_threads = 1,
   $download = {},
   $receive_max_object_size_limit = '100 m',
diff --git a/modules/openstack_project/templates/ci.vhost.erb b/modules/openstack_project/templates/ci.vhost.erb
index e5010025b5..c33675ebce 100644
--- a/modules/openstack_project/templates/ci.vhost.erb
+++ b/modules/openstack_project/templates/ci.vhost.erb
@@ -7,13 +7,13 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
   ServerName <%= @srvname %>
 
   RewriteEngine On
-RewriteRule ^/jenkins-job-builder(/.*|$) http://docs.openstack.org/infra/jenkins-job-builder$1 [last,redirect=permanent]
-  RewriteRule ^/nodepool(/.*|$) http://docs.openstack.org/infra/nodepool$1 [last,redirect=permanent]
-  RewriteRule ^/openstackid(/.*|$) http://docs.openstack.org/infra/openstackid$1 [last,redirect=permanent]
-  RewriteRule ^/shade(/.*|$) http://docs.openstack.org/infra/shade$1 [last,redirect=permanent]
-  RewriteRule ^/storyboard(/.*|$) http://docs.openstack.org/infra/storyboard$1 [last,redirect=permanent]
-  RewriteRule ^/zuul(/.*|$) http://docs.openstack.org/infra/zuul$1 [last,redirect=permanent]
-  RewriteRule ^/(.*) http://docs.openstack.org/infra/system-config/$1 [last,redirect=permanent]
+RewriteRule ^/jenkins-job-builder(/.*|$) https://docs.openstack.org/infra/jenkins-job-builder$1 [last,redirect=permanent]
+  RewriteRule ^/nodepool(/.*|$) https://docs.openstack.org/infra/nodepool$1 [last,redirect=permanent]
+  RewriteRule ^/openstackid(/.*|$) https://docs.openstack.org/infra/openstackid$1 [last,redirect=permanent]
+  RewriteRule ^/shade(/.*|$) https://docs.openstack.org/infra/shade$1 [last,redirect=permanent]
+  RewriteRule ^/storyboard(/.*|$) https://docs.openstack.org/infra/storyboard$1 [last,redirect=permanent]
+  RewriteRule ^/zuul(/.*|$) https://docs.openstack.org/infra/zuul$1 [last,redirect=permanent]
+  RewriteRule ^/(.*) https://docs.openstack.org/infra/system-config/$1 [last,redirect=permanent]
 
   ErrorLog /var/log/apache2/<%= @name %>_error.log
   LogLevel warn
diff --git a/modules/openstack_project/templates/legacy.vhost.erb b/modules/openstack_project/templates/legacy.vhost.erb
index f969aeb3c8..352a795501 100644
--- a/modules/openstack_project/templates/legacy.vhost.erb
+++ b/modules/openstack_project/templates/legacy.vhost.erb
@@ -12,7 +12,7 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
 <% end -%>
 
   RewriteEngine On
-  RewriteRule ^/(.*) http://docs.openstack.org/developer/<%= @name.split('.')[0] %>/$1 [last,redirect=permanent]
+  RewriteRule ^/(.*) https://docs.openstack.org/developer/<%= @name.split('.')[0] %>/$1 [last,redirect=permanent]
 
   ErrorLog /var/log/apache2/<%= @name %>_error.log
   LogLevel warn