diff --git a/checkmk/debian/check_mk.xinetd b/checkmk/debian/check_mk.xinetd
deleted file mode 100644
index 66dd42fdcb49de4b14e895e5a267da2ff554d3ef..0000000000000000000000000000000000000000
--- a/checkmk/debian/check_mk.xinetd
+++ /dev/null
@@ -1,13 +0,0 @@
-service check_mk
-{
-	type		= UNLISTED
-	port		= 6556
-	socket_type	= stream
-	protocol	= tcp
-	wait		= no
-	user		= root
-	server		= /usr/bin/check_mk_agent
-	only_from	= 141.71.3.61 141.71.3.159
-	disable		= no
-}
-
diff --git a/checkmk/debian/init.sls b/checkmk/debian/init.sls
index 419426b8cada96a76822563a051fc365c50595f2..1877d7488a106a8b49cb6339ab33b6089f310a3a 100644
--- a/checkmk/debian/init.sls
+++ b/checkmk/debian/init.sls
@@ -1,5 +1,5 @@
-hsh_checkmk_install_xinetd:
-  pkg.installed:
+hsh_checkmk_purge_xinetd:
+  pkg.purged:
     - name: xinetd
 
 hsh_checkmk_fetch_package:
@@ -17,23 +17,21 @@ hsh_checkmk_install_package:
     - group: root
     - cwd: /tmp
     - require:
-      - pkg: hsh_checkmk_install_xinetd
+      - pkg: hsh_checkmk_purge_xinetd
       - file: hsh_checkmk_fetch_package
 
-hsh_checkmk_set_config:
-  file.managed:
-    - name: /etc/xinetd.d/check_mk
-    - source: salt://checkmk/debian/check_mk.xinetd
-    - mode: 644
-    - user: root
-    - group: root
+hsh_checkmk_enable_socket:
+  service.running:
+    - name: check_mk.socket
+    - enable: True
+    - reload: True
     - require:
-      - cmd: hsh_checkmk_install_package
+      - pkg: hsh_checkmk_install_package
 
-hsh_checkmk_reload_xinetd:
+hsh_checkmk_enable_async_service:
   service.running:
-    - name: xinetd
+    - name: check_mk-async.service
     - enable: True
     - reload: True
-    - watch:
-      - file: hsh_checkmk_set_config
+    - require:
+      - pkg: hsh_checkmk_install_package