diff --git a/apcd-cms/Dockerfile b/apcd-cms/Dockerfile
index bfaf254f..d593fe6e 100644
--- a/apcd-cms/Dockerfile
+++ b/apcd-cms/Dockerfile
@@ -1,5 +1,5 @@
-# TACC/Core-CMS#v3.11.6
-FROM taccwma/core-cms:c5bea4c
+# TACC/Core-CMS#v3.12.0-beta.4 candidate
+FROM taccwma/core-cms:4086324
 
 WORKDIR /code
 
diff --git a/apcd-cms/src/taccsite_custom/apcd-cms/templates/assets_custom.html b/apcd-cms/src/taccsite_custom/apcd-cms/templates/assets_custom.html
index f15a38fb..7cb99fac 100644
--- a/apcd-cms/src/taccsite_custom/apcd-cms/templates/assets_custom.html
+++ b/apcd-cms/src/taccsite_custom/apcd-cms/templates/assets_custom.html
@@ -1,24 +1,5 @@
-{# This template overwrites the original from TACC/Core-CMS #}
-{# NOTE: This should extend taccsite_cms via taccsite_custom, not overwrite #}
-{# FAQ: To extend, via app template inheritance, see TACC/Core-CMS#492 #}
-
-
-
-{# COPIED FROM CORE #}
-{# https://github.com/TACC/Core-CMS/blob/64a72e2/taccsite_cms/templates/assets_custom.html #}
-
 {% load staticfiles %}
 
-<!-- Custom Site Assets: Favicon. -->
-{% with settings.FAVICON as favicon %}
-<link rel="icon" href="{% static favicon.img_file_src %}" type="image/x-icon" />
-{% endwith %}
-
-
-
-{# NEW CODE #}
-
-<!-- TUP CMS UI Styles -->
 <style>
   @import url("{% static 'apcd-cms/css/site.cms.css' %}");
 </style>
diff --git a/demdata_cms/src/taccsite_custom/demdata_cms/templates/nav_search.raw.html b/demdata_cms/src/taccsite_custom/demdata_cms/templates/nav_search.raw.html
deleted file mode 100644
index 7c4aec3f..00000000
--- a/demdata_cms/src/taccsite_custom/demdata_cms/templates/nav_search.raw.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{# To change tacc-search-bar styles to match theme #}
-{# WARNING: File never loaded, so search bar is black even on light header #}
-{# FAQ: TACC/Core-CMS-Resources sites cannot override templates #}
-{# SEE: https://github.com/TACC/Core-CMS/pull/492 #}
-<!-- <link rel="stylesheet" href="{% static 'site_cms/css/build/site.tacc-search-bar.css' %}"> -->
diff --git a/ecep_cms/src/taccsite_cms/templates/assets_custom.html b/ecep_cms/src/taccsite_cms/templates/assets_custom.html
index 32eebb1a..9be21415 100644
--- a/ecep_cms/src/taccsite_cms/templates/assets_custom.html
+++ b/ecep_cms/src/taccsite_cms/templates/assets_custom.html
@@ -1,22 +1,4 @@
-{# This template overwrites the original from TACC/Core-CMS #}
-{# NOTE: This should extend taccsite_cms via taccsite_custom, not overwrite #}
-{# FAQ: To extend, via app template inheritance, see TACC/Core-CMS#492 #}
-
-
-
-{# COPIED FROM CORE #}
-{# https://github.com/TACC/Core-CMS/blob/c8844e1/taccsite_cms/templates/assets_custom.html #}
-
 {% load static %}
 
-<!-- Custom Site Assets: Favicon. -->
-{% with settings.FAVICON as favicon %}
-<link rel="icon" href="{% static favicon.img_file_src %}" type="image/x-icon" />
-{% endwith %}
-
-
-
-{# NEW CODE #}
-
 <!-- To style old CMS content on new CMS -->
 <link rel="stylesheet" href="{% static 'ecep_cms/css/site.css' %}">
diff --git a/tapisproject_cms/Dockerfile b/tapisproject_cms/Dockerfile
index 2adb5fc8..af0c298c 100644
--- a/tapisproject_cms/Dockerfile
+++ b/tapisproject_cms/Dockerfile
@@ -1,5 +1,5 @@
-# TACC/Core-CMS#v3.11.6
-FROM taccwma/core-cms:c5bea4c
+# TACC/Core-CMS#v3.12.0-beta.4 candidate
+FROM taccwma/core-cms:4086324
 
 WORKDIR /code
 
diff --git a/tapisproject_cms/src/taccsite_cms/templates/assets_custom.html b/tapisproject_cms/src/taccsite_cms/templates/assets_custom.html
index 2ccaacb6..3fe312ad 100644
--- a/tapisproject_cms/src/taccsite_cms/templates/assets_custom.html
+++ b/tapisproject_cms/src/taccsite_cms/templates/assets_custom.html
@@ -1,22 +1,4 @@
-{# This template overwrites the original from TACC/Core-CMS #}
-{# NOTE: This should extend taccsite_cms via taccsite_custom, not overwrite #}
-{# FAQ: To extend, via app template inheritance, see TACC/Core-CMS#492 #}
-
-
-
-{# COPIED FROM CORE #}
-{# https://github.com/TACC/Core-CMS/blob/c8844e1/taccsite_cms/templates/assets_custom.html #}
-
 {% load static %}
 
-<!-- Custom Site Assets: Favicon. -->
-{% with settings.FAVICON as favicon %}
-<link rel="icon" href="{% static favicon.img_file_src %}" type="image/x-icon" />
-{% endwith %}
-
-
-
-{# NEW CODE #}
-
 <!-- To style old CMS content on new CMS -->
 <link rel="stylesheet" href="{% static 'tapisproject_cms/css/migrate.to-v3.css' %}">