diff --git a/modules/openstack_project/files/gerrit/system-cla.html b/modules/openstack_project/files/gerrit/system-cla.html
new file mode 100644
index 0000000000..1c2737f6ae
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/system-cla.html
@@ -0,0 +1,13 @@
+<html><body><div>
+
+<h1>
+Gerrit System Role Accounts Proxy CLA
+</h1>
+
+<p>
+This is not a real CLA and cannot be signed. See <a
+href="https://wiki.openstack.org/wiki/HowToContribute">https://wiki.openstack.org/wiki/HowToContribute</a>
+for more information on OpenStack Contributor License Agreements.
+</p>
+
+</div></body></html>
diff --git a/modules/openstack_project/files/gerrit/usg-cla.html b/modules/openstack_project/files/gerrit/usg-cla.html
new file mode 100644
index 0000000000..362b91efe1
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/usg-cla.html
@@ -0,0 +1,15 @@
+<html><body><div>
+
+<h1>
+OpenStack Project U.S. Government Contributor License Agreement
+</h1>
+
+<p>
+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="https://wiki.openstack.org/wiki/HowToContribute">https://wiki.openstack.org/wiki/HowToContribute</a>
+for more information.
+</p>
+
+</div></body></html>
diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp
index 954a5a229d..ce25f1b686 100644
--- a/modules/openstack_project/manifests/gerrit.pp
+++ b/modules/openstack_project/manifests/gerrit.pp
@@ -158,6 +158,26 @@ class openstack_project::gerrit (
     require => Class['::gerrit'],
   }
 
+  file { '/home/gerrit2/review_site/static/usg-cla.html':
+    ensure  => present,
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0444',
+    source  => 'puppet:///modules/openstack_project/gerrit/usg-cla.html',
+    replace => true,
+    require => Class['::gerrit'],
+  }
+
+  file { '/home/gerrit2/review_site/static/system-cla.html':
+    ensure  => present,
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0444',
+    source  => 'puppet:///modules/openstack_project/gerrit/system-cla.html',
+    replace => true,
+    require => Class['::gerrit'],
+  }
+
   file { '/home/gerrit2/review_site/static/title.png':
     ensure  => present,
     source  => 'puppet:///modules/openstack_project/openstack.png',
