diff --git a/xt_and_gdt_config_template.txt b/xt_and_gdt_config_template.txt
index bb986c9d2989b4cd549385d14a38627cf7ced34d..9351f7e7ca1244ff2805231f747936e4fdef5beb 100644
--- a/xt_and_gdt_config_template.txt
+++ b/xt_and_gdt_config_template.txt
@@ -130,7 +130,7 @@ lint:
     variables:
         CI_IMAGE: {{ image }}
         TESTS_MODULE_SUBDIR: {{ subdir }}
-    {%- if 'cpp' in kind %}
+    {%- if 'cpp' in kind or 'gdt' in subdir %}
     tags:
         - dustin
     {%- endif %}
@@ -149,7 +149,12 @@ lint:
     variables:
         CI_IMAGE: {{ image }}
     tags:
+    {%- if 'gdt' in subdir and 'clang' in image %}
+        - amm-only
+    {%- else %}
         - dustin
+    {%- endif %}
+
     stage: python
     needs: ["{{image}}"]
     script: