diff --git a/assets/themes/glutenfree/glutenfree.json b/assets/themes/glutenfree/glutenfree.json
index 16732f48b2..bb2fa25506 100644
--- a/assets/themes/glutenfree/glutenfree.json
+++ b/assets/themes/glutenfree/glutenfree.json
@@ -10,6 +10,7 @@
   "layers": [
     {
       "builtin": "food",
+      "hideTagRenderingsWithLabels": ["gluten_free","images","reviews"],
       "override": {
         "source": {
           "osmTags": {
@@ -26,9 +27,11 @@
     },
     {
       "builtin": "food",
+      "hideTagRenderingsWithLabels": ["gluten_free","images","reviews"],
       "override": {
         "name": null,
         "minzoom": 17,
+
         "isCounted": false,
         "filter": {
           "sameAs": "food_glutenfree"
@@ -37,6 +40,7 @@
     },
     {
       "builtin": "ice_cream",
+      "hideTagRenderingsWithLabels": ["gluten_free","images","reviews"],
       "override": {
         "source": {
           "osmTags": {
@@ -53,6 +57,7 @@
     },
     {
       "builtin": "ice_cream",
+      "hideTagRenderingsWithLabels": ["gluten_free","images","reviews"],
       "override": {
         "name": null,
         "minzoom": 17,
@@ -64,6 +69,7 @@
     },
     {
       "builtin": "shops",
+      "hideTagRenderingsWithLabels": ["gluten_free","images","reviews"],
       "override": {
         "source": {
           "osmTags": {
@@ -80,6 +86,7 @@
     },
     {
       "builtin": "shops",
+      "hideTagRenderingsWithLabels": ["gluten_free","images","reviews"],
       "override": {
         "name": null,
         "minzoom": 17,
@@ -89,5 +96,12 @@
         }
       }
     }
-  ]
+  ],
+  "overrideAll": {
+    "+tagRenderings": [
+      "images",
+      "reviews",
+      "gluten_free"
+    ]
+  }
 }