diff --git a/doc/source/_templates/indexcontent.html b/doc/source/_templates/indexcontent.html
index 5f36c73807..71fd2d869d 100644
--- a/doc/source/_templates/indexcontent.html
+++ b/doc/source/_templates/indexcontent.html
@@ -1,10 +1,10 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
+{% extends "layout.html" %}
+{# Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 
@@ -12,9 +12,7 @@
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
-  limitations under the License.
--->
-{% extends "layout.html" %}
+  limitations under the License. #}
 {%- block htmltitle -%}
 <title>{{ html_title }}</title>
 {%- endblock -%}
diff --git a/doc/source/_theme/cassandra_theme/defindex.html b/doc/source/_theme/cassandra_theme/defindex.html
index a7bd5b8728..3310c7bf26 100644
--- a/doc/source/_theme/cassandra_theme/defindex.html
+++ b/doc/source/_theme/cassandra_theme/defindex.html
@@ -1,4 +1,5 @@
-<!--
+---
+{#
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
   this work for additional information regarding copyright ownership.
@@ -12,9 +13,7 @@
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
-  limitatins under the License.
--->
----
+  limitatins under the License. #}
 layout: doclandingpage
 title: "Documentation"
 is_homepage: false
diff --git a/doc/source/_theme/cassandra_theme/layout.html b/doc/source/_theme/cassandra_theme/layout.html
index 69363cc185..e53c53797d 100644
--- a/doc/source/_theme/cassandra_theme/layout.html
+++ b/doc/source/_theme/cassandra_theme/layout.html
@@ -1,4 +1,5 @@
-<!--
+---
+{#
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
   this work for additional information regarding copyright ownership.
@@ -12,9 +13,7 @@
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
-  limitations under the License.
--->
----
+  limitations under the License. #}
 layout: docpage
 {% block title %}
 title: "Documentation"
diff --git a/doc/source/_theme/cassandra_theme/search.html b/doc/source/_theme/cassandra_theme/search.html
index 1a4bff5d14..d379a70536 100644
--- a/doc/source/_theme/cassandra_theme/search.html
+++ b/doc/source/_theme/cassandra_theme/search.html
@@ -1,5 +1,4 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
+{# Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
   this work for additional information regarding copyright ownership.
   The ASF licenses this file to You under the Apache License, Version 2.0
@@ -12,8 +11,7 @@
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
-  limitations under the License.
--->
+  limitations under the License. #}
 {%- extends "layout.html" %}
 {% block title %}
 title: "{{_('Search')}}"