diff --git a/salt/repos/client_tools.sls b/salt/repos/client_tools.sls
index ee042bcfb..fa366851c 100644
--- a/salt/repos/client_tools.sls
+++ b/salt/repos/client_tools.sls
@@ -1,8 +1,6 @@
 {# These states set up client tools repositories for all supported OSes #}
 
-{% if not grains.get('roles') or ('server' not in grains.get('roles') and 'proxy' not in grains.get('roles') and 'server_containerized' not in grains.get('roles') and 'proxy_containerized' not in grains.get('roles')) %}
-{# no client tools on server, proxy, server_containerized, or proxy_containerized #}
-
+{% if not grains.get('roles') or ('server' not in grains.get('roles') and 'proxy' not in grains.get('roles')) %} {# no client tools on server or proxy #}
 
 {% if grains['os'] == 'SUSE' %}
 {% if grains['osfullname'] == 'Leap' %}
diff --git a/salt/repos/disable_local.sls b/salt/repos/disable_local.sls
index 7ad7e08d1..f40fbd054 100644
--- a/salt/repos/disable_local.sls
+++ b/salt/repos/disable_local.sls
@@ -1,6 +1,4 @@
-{% if 'paygo' not in grains.get('product_version') | default('', true) %}
 disable_all_local_repos:
   cmd.run:
     - name: zypper mr -d --all
     - onlyif: test -x /usr/bin/zypper
-{% endif %}
\ No newline at end of file