diff --git a/salt/kratos/init.sls b/salt/kratos/init.sls
index 664408f15..e44c09b63 100644
--- a/salt/kratos/init.sls
+++ b/salt/kratos/init.sls
@@ -62,6 +62,7 @@ so-kratos:
     - port_bindings:
       - 0.0.0.0:4433:4433
       - 0.0.0.0:4434:4434
+    - restart_policy: unless-stopped
     - watch:
       - file: /opt/so/conf/kratos
     - require:
@@ -75,6 +76,22 @@ append_so-kratos_so-status.conf:
     - name: /opt/so/conf/so-status/so-status.conf
     - text: so-kratos
 
+wait_for_kratos:
+  http.wait_for_successful_query:
+    - name: 'http://{{ MANAGER }}:4434/'
+    - ssl: True
+    - verify_ssl: False
+    - status:
+      - 200
+      - 301
+      - 302
+      - 404
+    - status_type: list
+    - wait_for: 300
+    - request_interval: 10
+    - require:
+      -  docker_container: so-kratos
+
 {% else %}
 
 {{sls}}_state_not_allowed:
diff --git a/salt/manager/init.sls b/salt/manager/init.sls
index 50c204630..990eda3d3 100644
--- a/salt/manager/init.sls
+++ b/salt/manager/init.sls
@@ -130,7 +130,8 @@ syncesusers:
       - /opt/so/conf/soc/soc_users_roles
     - show_changes: False
     - require:
-      -  docker_container: so-kratos
+      - docker_container: so-kratos
+      - http: wait_for_kratos
 
 {% else %}