diff --git a/templates/base.html b/templates/base.html
index 187de93d1..276c3d428 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html ng-app="quay" class="{% if onprem %}onprem{% else %}hosted{% endif %}">
   <head>
-  {% if feature_set.get('FEATURE_UI_V2') and config_set['SERVER_HOSTNAME'] == 'stage.quay.io' %}
+  {% if config_set['SERVER_HOSTNAME'] == 'stage.quay.io' %}
       <script id="trustarc" src="//static.redhat.com/libs/redhat/marketing/latest/trustarc/trustarc.stage.js"></script>
       <script id="dpal" src="https://www.redhat.com/ma/dpal-staging.js" type="text/javascript"></script>
   {% endif %}
 
-  {% if feature_set.get('FEATURE_UI_V2') and config_set['SERVER_HOSTNAME'] == 'quay.io' %}
+  {% if config_set['SERVER_HOSTNAME'] == 'quay.io' %}
       <script id="trustarc" src="//static.redhat.com/libs/redhat/marketing/latest/trustarc/trustarc.js"></script>
       <script id="dpal" src="https://www.redhat.com/ma/dpal.js" type="text/javascript"></script>
   {% endif %}
@@ -149,7 +149,7 @@ mixpanel.init("{{ mixpanel_key }}", { track_pageview : false, debug: {{ is_debug
           <li quay-require="['BILLING']">
             <span class="quay-service-status"></span>
           </li>
-          {% if feature_set.get('FEATURE_UI_V2') and config_set['SERVER_HOSTNAME'] == ('quay.io') or config_set['SERVER_HOSTNAME'] == ('stage.quay.io') %}
+          {% if config_set['SERVER_HOSTNAME'] == ('quay.io') or config_set['SERVER_HOSTNAME'] == ('stage.quay.io') %}
           <li>
             <span id="teconsent" style="line-height: 1.1;"></span>
           </li>
@@ -159,7 +159,7 @@ mixpanel.init("{{ mixpanel_key }}", { track_pageview : false, debug: {{ is_debug
       </div>
     </nav>
 
-    {% if feature_set.get('FEATURE_UI_V2') and config_set['SERVER_HOSTNAME'] == ('quay.io') or config_set['SERVER_HOSTNAME'] == ('stage.quay.io') %}
+    {% if config_set['SERVER_HOSTNAME'] == ('quay.io') or config_set['SERVER_HOSTNAME'] == ('stage.quay.io') %}
     <div id="consent_blackbar" style="position: fixed;bottom: 0;width: 100%;z-index: 5;padding: 10px;"></div>
     {% endif %}
 
@@ -192,7 +192,7 @@ mixpanel.init("{{ mixpanel_key }}", { track_pageview : false, debug: {{ is_debug
 
     <div class="angular-tour-ui" inline="false" tour="angular_tour_current"></div>
 
-   {% if feature_set.get('FEATURE_UI_V2') and config_set['SERVER_HOSTNAME'].endswith('quay.io') %}
+   {% if config_set['SERVER_HOSTNAME'].endswith('quay.io') %}
        <script type="text/javascript">
             if (("undefined" !== typeof _satellite) && ("function" === typeof _satellite.pageBottom)) {
                 _satellite.pageBottom();
