diff --git a/salt/allowed_states.map.jinja b/salt/allowed_states.map.jinja
index 665fdbe3d..26a3ee84b 100644
--- a/salt/allowed_states.map.jinja
+++ b/salt/allowed_states.map.jinja
@@ -237,7 +237,7 @@
     {% do allowed_states.append('kibana') %}
   {% endif %}
 
-  {% if CURATOR and grains.role in ['so-eval', 'so-standalone', 'so-node', 'so-managersearch', 'so-heavynode'] %}
+  {% if CURATOR and grains.role in ['so-eval', 'so-standalone', 'so-node', 'so-managersearch', 'so-heavynode', 'so-manager'] %}
     {% do allowed_states.append('curator') %}
   {% endif %}
 
@@ -296,4 +296,4 @@
 {% endif %}
 
 {# all nodes can always run salt.minion state #}
-{% do allowed_states.append('salt.minion') %}
\ No newline at end of file
+{% do allowed_states.append('salt.minion') %}
diff --git a/salt/curator/init.sls b/salt/curator/init.sls
index 24d9f8c0d..fe3204105 100644
--- a/salt/curator/init.sls
+++ b/salt/curator/init.sls
@@ -4,7 +4,7 @@
 {% set VERSION = salt['pillar.get']('global:soversion', 'HH1.2.2') %}
 {% set IMAGEREPO = salt['pillar.get']('global:imagerepo') %}
 {% set MANAGER = salt['grains.get']('master') %}
-{% if grains['role'] in ['so-eval', 'so-node', 'so-managersearch', 'so-heavynode', 'so-standalone'] %}
+{% if grains['role'] in ['so-eval', 'so-node', 'so-managersearch', 'so-heavynode', 'so-standalone', 'so-manager'] %}
   {% from 'elasticsearch/auth.map.jinja' import ELASTICAUTH with context %}
   {% from "curator/map.jinja" import CURATOROPTIONS with context %}
 # Curator
diff --git a/salt/curator/map.jinja b/salt/curator/map.jinja
index 2dc2c7311..e67587cae 100644
--- a/salt/curator/map.jinja
+++ b/salt/curator/map.jinja
@@ -2,8 +2,8 @@
 {% set ENABLED = salt['pillar.get']('curator:enabled', True) %}
 {% set TRUECLUSTER = salt['pillar.get']('elasticsearch:true_cluster', False) %}
 
-# don't start the docker container if searchnode and true clustering is enabled or disabled via pillar
-{% if (grains.id.split('_')|last == 'searchnode' and TRUECLUSTER) or not ENABLED %}
+# don't start the docker container if searchnode and true clustering is enabled or curator disabled via pillar or true cluster not enabled and manager
+{% if not ENABLED or (TRUECLUSTER and grains.id.split('_')|last == 'searchnode') or (not TRUECLUSTER and grains.id.split('_')|last == 'manager') %}
   {% do CURATOROPTIONS.update({'start': False}) %}
   {% do CURATOROPTIONS.update({'status': 'absent'}) %}
 {% else %}
diff --git a/salt/top.sls b/salt/top.sls
index 86a2f19c1..0b5322bcc 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -188,6 +188,7 @@ base:
     {%- if KIBANA %}
     - kibana
     {%- endif %}
+    - curator
     {%- if ELASTALERT %}
     - elastalert
     {%- endif %}