diff --git a/overlay-lakitu/app-admin/node-problem-detector/Manifest b/overlay-lakitu/app-admin/node-problem-detector/Manifest
index c8b3c41..9fe344e 100644
--- a/overlay-lakitu/app-admin/node-problem-detector/Manifest
+++ b/overlay-lakitu/app-admin/node-problem-detector/Manifest
@@ -1 +1 @@
-DIST node-problem-detector-0.8.1.tar.gz 6975098 BLAKE2B b52a094e84e9c1064d3c113d9ba7fa549ad6fc1aa14cb5e7ef6b223aa5600d65ec73fda682d79dcc5390c9e64f876f99deb017ee3d8a578b67bd8313479ea1a9 SHA512 c5dbb43aa93260c79e6c142ed4f92d0414ca3bcc7a4c7f38f8ec977507c5c0bb47f1bd9f5dcd0db19404045e2e3da499cc18f7ebdba8b1068019cdcd53847ef4
+DIST node-problem-detector-0.8.4.tar.gz 6981270 BLAKE2B 0f315a099d5257b0698435c3b20e6c8952c6bdc1fbc6e92aacbc3c09c77b5f63d2fb3ece3df37fe3b9182521ece5530cc17354762ad7e2206fbda383c0989a76 SHA512 f46fef29d9fe5de52dc28f889bc87a1b6ead011550062ee3be39afeea693487bf3ea8061da3c031ad6a627473f93711211a69cb6d5cd23ddf41b6ba0290161ed
diff --git a/overlay-lakitu/app-admin/node-problem-detector/files/docker-monitor.json b/overlay-lakitu/app-admin/node-problem-detector/files/docker-monitor.json
index 15cc950..27435be 100644
--- a/overlay-lakitu/app-admin/node-problem-detector/files/docker-monitor.json
+++ b/overlay-lakitu/app-admin/node-problem-detector/files/docker-monitor.json
@@ -8,12 +8,29 @@
 	"bufferSize": 10,
 	"source": "docker-monitor",
 	"metricsReporting": true,
-	"conditions": [],
+	"conditions": [
+		{
+			"type": "CorruptDockerOverlay2",
+			"reason": "NoCorruptDockerOverlay2",
+			"message": "docker overlay2 is functioning properly"
+		}
+	],
 	"rules": [
 		{
 			"type": "temporary",
 			"reason": "CorruptDockerImage",
 			"pattern": "Error trying v2 registry: failed to register layer: rename /var/lib/docker/image/(.+) /var/lib/docker/image/(.+): directory not empty.*"
+		},
+		{
+			"type": "permanent",
+			"condition": "CorruptDockerOverlay2",
+			"reason": "CorruptDockerOverlay2",
+			"pattern": "returned error: readlink /var/lib/docker/overlay2.*: invalid argument.*"
+		},
+		{
+			"type": "temporary",
+			"reason": "DockerContainerStartupFailure",
+			"pattern": "OCI runtime start failed: container process is already dead: unknown"
 		}
 	]
 }
diff --git a/overlay-lakitu/app-admin/node-problem-detector/files/kernel-monitor.json b/overlay-lakitu/app-admin/node-problem-detector/files/kernel-monitor.json
index 0e8a7ed..ae85a3c 100644
--- a/overlay-lakitu/app-admin/node-problem-detector/files/kernel-monitor.json
+++ b/overlay-lakitu/app-admin/node-problem-detector/files/kernel-monitor.json
@@ -45,10 +45,21 @@
 		},
 		{
 			"type": "temporary",
-			"reason": "FilesystemError",
+			"reason": "Ext4Error",
 			"pattern": "EXT4-fs error .*"
 		},
 		{
+			"type": "temporary",
+			"reason": "Ext4Warning",
+			"pattern": "EXT4-fs warning .*"
+		},
+		{
+			"type": "permanent",
+			"condition": "KernelDeadlock",
+			"reason": "AUFSUmountHung",
+			"pattern": "task umount\\.aufs:\\w+ blocked for more than \\w+ seconds\\."
+		},
+		{
 			"type": "permanent",
 			"condition": "KernelDeadlock",
 			"reason": "DockerHung",
diff --git a/overlay-lakitu/app-admin/node-problem-detector/node-problem-detector-0.8.1-r1.ebuild b/overlay-lakitu/app-admin/node-problem-detector/node-problem-detector-0.8.1-r1.ebuild
deleted file mode 120000
index 7adebff..0000000
--- a/overlay-lakitu/app-admin/node-problem-detector/node-problem-detector-0.8.1-r1.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-node-problem-detector-0.8.1.ebuild
\ No newline at end of file
diff --git a/overlay-lakitu/app-admin/node-problem-detector/node-problem-detector-0.8.4-r1.ebuild b/overlay-lakitu/app-admin/node-problem-detector/node-problem-detector-0.8.4-r1.ebuild
new file mode 120000
index 0000000..69402e9
--- /dev/null
+++ b/overlay-lakitu/app-admin/node-problem-detector/node-problem-detector-0.8.4-r1.ebuild
@@ -0,0 +1 @@
+node-problem-detector-0.8.4.ebuild
\ No newline at end of file
diff --git a/overlay-lakitu/app-admin/node-problem-detector/node-problem-detector-0.8.1.ebuild b/overlay-lakitu/app-admin/node-problem-detector/node-problem-detector-0.8.4.ebuild
similarity index 100%
rename from overlay-lakitu/app-admin/node-problem-detector/node-problem-detector-0.8.1.ebuild
rename to overlay-lakitu/app-admin/node-problem-detector/node-problem-detector-0.8.4.ebuild