diff --git a/salt/fixes/lxc-inotify.conf b/salt/fixes/lxc-inotify.conf
new file mode 100644
index 000000000..f2375c0
--- /dev/null
+++ b/salt/fixes/lxc-inotify.conf
@@ -0,0 +1 @@
+fs.inotify.max_user_instances=512
diff --git a/salt/fixes/lxc-inotify.sls b/salt/fixes/lxc-inotify.sls
new file mode 100644
index 000000000..ef6277c
--- /dev/null
+++ b/salt/fixes/lxc-inotify.sls
@@ -0,0 +1,10 @@
+/etc/sysctl.d/20-lxc-inotify.conf:
+  file.managed:
+    - source: "salt://fixes/lxc-inotify.conf"
+
+apply-lxc-inotify:
+  cmd.run:
+    - name: sysctl -p /etc/sysctl.d/20-lxc-inotify.conf
+      require:
+        - file: /etc/sysctl.d/20-lxc-inotify.conf
+        - pkg: procps
diff --git a/salt/top.sls b/salt/top.sls
index 1ed9ebe..46ee7fb 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -7,6 +7,7 @@ base:
     - switches
     - cpe
     - collectd
+    - 'fixes.lxc-inotify'
   'priv*-gw':
     - no-ssh
     - forwarding