diff --git a/.github/workflows/distribution-deploy.yml b/.github/workflows/distribution-deploy.yml
index 55d7c5e4c..69f3afd73 100644
--- a/.github/workflows/distribution-deploy.yml
+++ b/.github/workflows/distribution-deploy.yml
@@ -23,8 +23,7 @@ jobs:
 
       - name: Build Client Docker image
         run: |
-          docker buildx build \
-            --platform linux/amd64,linux/arm64 \
+          docker build \
             -t ghcr.io/bluewave-labs/checkmate:frontend-dist \
             -f ./docker/dist/client.Dockerfile \
             --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
@@ -52,8 +51,7 @@ jobs:
 
       - name: Build Server Docker image
         run: |
-          docker buildx build \
-            --platform linux/amd64,linux/arm64 \
+          docker build \
             -t ghcr.io/bluewave-labs/checkmate:backend-dist \
             -f ./docker/dist/server.Dockerfile \
             --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
@@ -64,8 +62,7 @@ jobs:
 
       - name: Build Mongo Docker image
         run: |
-          docker buildx build \
-            --platform linux/amd64,linux/arm64 \
+          docker build \
             -t ghcr.io/bluewave-labs/checkmate:mongo-dist \
             -f ./docker/dist/mongoDB.Dockerfile \
             --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
@@ -76,8 +73,7 @@ jobs:
 
       - name: Build Redis Docker image
         run: |
-          docker buildx build \
-            --platform linux/amd64,linux/arm64 \
+          docker build \
             -t ghcr.io/bluewave-labs/checkmate:redis-dist \
             -f ./docker/dist/redis.Dockerfile \
             --label org.opencontainers.image.source=https://github.com/bluewave-labs/checkmate \
diff --git a/client/src/Validation/validation.js b/client/src/Validation/validation.js
index be6cb19f7..096db1a1a 100644
--- a/client/src/Validation/validation.js
+++ b/client/src/Validation/validation.js
@@ -171,7 +171,7 @@ const monitorValidation = joi.object({
 		.max(65535)
 		.when("type", {
 			is: "port",
-			then: joi.required().messages({
+			then: joi.number().messages({
 				"number.base": "Port must be a number.",
 				"number.min": "Port must be at least 1.",
 				"number.max": "Port must be at most 65535.",
diff --git a/server/service/notificationService.js b/server/service/notificationService.js
index 624056694..e4f343c80 100755
--- a/server/service/notificationService.js
+++ b/server/service/notificationService.js
@@ -257,9 +257,7 @@ class NotificationService {
 		const alerts = {
 			cpu: cpuThreshold !== -1 && cpuUsage > cpuThreshold ? true : false,
 			memory: memoryThreshold !== -1 && memoryUsage > memoryThreshold ? true : false,
-			disk: disk.some((d) => diskThreshold !== -1 && d.usage_percent > diskThreshold)
-				? true
-				: false,
+			disk: disk?.some(d => diskThreshold !== -1 && typeof d?.usage_percent === "number" && d?.usage_percent > diskThreshold) ?? false,
 		};
 
 		const notifications = await this.db.getNotificationsByMonitorId(