diff --git a/docker/coolify/build_images.bat b/docker/coolify/build_images.bat
new file mode 100644
index 000000000..60fc9aa4a
--- /dev/null
+++ b/docker/coolify/build_images.bat
@@ -0,0 +1,36 @@
+@echo off
+setlocal enabledelayedexpansion
+
+REM Change directory to root Server directory for correct Docker Context
+cd /d "%~dp0"
+cd ../..
+
+REM Define service names and their corresponding Dockerfiles
+set services[0]=bluewaveuptime/uptime_client
+set dockerfiles[0]=.\docker\coolify\client.Dockerfile
+
+set services[1]=bluewaveuptime/uptime_database_mongo
+set dockerfiles[1]=.\docker\coolify\mongoDB.Dockerfile
+
+set services[2]=bluewaveuptime/uptime_redis
+set dockerfiles[2]=.\docker\coolify\redis.Dockerfile
+
+set services[3]=bluewaveuptime/uptime_server
+set dockerfiles[3]=.\docker\coolify\server.Dockerfile
+
+REM Loop through each service and build the corresponding image
+for /L %%i in (0,1,2,3) do (
+    set service=!services[%%i]!
+    set dockerfile=!dockerfiles[%%i]!
+
+    docker build -f "!dockerfile!" -t "!service!" .
+
+    REM Check if the build succeeded
+    if errorlevel 1 (
+        echo Error building !service! image. Exiting...
+        exit /b 1
+    )
+)
+
+echo All images built successfully
+exit /b 0
diff --git a/docker/coolify/build_images.sh b/docker/coolify/build_images.sh
index 179b50b5b..04dfe324c 100755
--- a/docker/coolify/build_images.sh
+++ b/docker/coolify/build_images.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 # Change directory to root Server directory for correct Docker Context
 cd "$(dirname "$0")"
-cd ../../../
+cd ../../
 
 # Define an array of services and their Dockerfiles
 declare -A services=(
-  ["bluewaveuptime/uptime_client"]="./server/docker/dist/client.Dockerfile"
-  ["bluewaveuptime/uptime_database_mongo"]="./server/docker/dist/mongoDB.Dockerfile"
-  ["bluewaveuptime/uptime_redis"]="./server/docker/dist/redis.Dockerfile"
-  ["bluewaveuptime/uptime_server"]="./server/docker/dist/server.Dockerfile"
+  ["bluewaveuptime/uptime_client"]="./docker/coolify/client.Dockerfile"
+  ["bluewaveuptime/uptime_database_mongo"]="./docker/coolify/mongoDB.Dockerfile"
+  ["bluewaveuptime/uptime_redis"]="./docker/coolify/redis.Dockerfile"
+  ["bluewaveuptime/uptime_server"]="./docker/coolify/server.Dockerfile"
 )
 
 # Loop through each service and build the corresponding image
diff --git a/docker/dist-mono/build_images.bat b/docker/dist-mono/build_images.bat
new file mode 100644
index 000000000..3e1d39fe1
--- /dev/null
+++ b/docker/dist-mono/build_images.bat
@@ -0,0 +1,30 @@
+@echo off
+setlocal enabledelayedexpansion
+
+REM Change directory to root Server directory for correct Docker Context
+cd /d "%~dp0"
+cd ../..
+
+REM Define service names and their corresponding Dockerfiles
+set services[0]=uptime_database_mongo
+set dockerfiles[0]=.\docker\dist-mono\mongoDB.Dockerfile
+
+set services[1]=uptime_server
+set dockerfiles[1]=.\docker\dist-mono\server.Dockerfile
+
+REM Loop through each service and build the corresponding image
+for /L %%i in (0,1) do (
+    set service=!services[%%i]!
+    set dockerfile=!dockerfiles[%%i]!
+
+    docker build -f "!dockerfile!" -t "!service!" .
+
+    REM Check if the build succeeded
+    if errorlevel 1 (
+        echo Error building !service! image. Exiting...
+        exit /b 1
+    )
+)
+
+echo All images built successfully
+exit /b 0
diff --git a/docker/dist/build_images.bat b/docker/dist/build_images.bat
new file mode 100644
index 000000000..92b5c4a9d
--- /dev/null
+++ b/docker/dist/build_images.bat
@@ -0,0 +1,33 @@
+@echo off
+setlocal enabledelayedexpansion
+
+REM Change directory to root Server directory for correct Docker Context
+cd /d "%~dp0"
+cd ../..
+
+REM Define service names and their corresponding Dockerfiles
+set services[0]=bluewaveuptime/uptime_client
+set dockerfiles[0]=.\docker\dist\client.Dockerfile
+
+set services[1]=bluewaveuptime/uptime_database_mongo
+set dockerfiles[1]=.\docker\dist\mongoDB.Dockerfile
+
+set services[2]=bluewaveuptime/uptime_server
+set dockerfiles[2]=.\docker\dist\server.Dockerfile
+
+REM Loop through each service and build the corresponding image
+for /L %%i in (0,1,2) do (
+    set service=!services[%%i]!
+    set dockerfile=!dockerfiles[%%i]!
+
+    docker build -f "!dockerfile!" -t "!service!" .
+
+    REM Check if the build succeeded
+    if errorlevel 1 (
+        echo Error building !service! image. Exiting...
+        exit /b 1
+    )
+)
+
+echo All images built successfully
+exit /b 0
diff --git a/docker/prod/build_images.bat b/docker/prod/build_images.bat
new file mode 100644
index 000000000..79403db3f
--- /dev/null
+++ b/docker/prod/build_images.bat
@@ -0,0 +1,33 @@
+@echo off
+setlocal enabledelayedexpansion
+
+REM Change directory to root Server directory for correct Docker Context
+cd /d "%~dp0"
+cd ../..
+
+REM Define service names and their corresponding Dockerfiles
+set services[0]=uptime_client
+set dockerfiles[0]=.\docker\prod\client.Dockerfile
+
+set services[1]=uptime_database_mongo
+set dockerfiles[1]=.\docker\prod\mongoDB.Dockerfile
+
+set services[2]=uptime_server
+set dockerfiles[2]=.\docker\prod\server.Dockerfile
+
+REM Loop through each service and build the corresponding image
+for /L %%i in (0,1,2) do (
+    set service=!services[%%i]!
+    set dockerfile=!dockerfiles[%%i]!
+
+    docker build -f "!dockerfile!" -t "!service!" .
+
+    REM Check if the build succeeded
+    if errorlevel 1 (
+        echo Error building !service! image. Exiting...
+        exit /b 1
+    )
+)
+
+echo All images built successfully
+exit /b 0
diff --git a/docker/staging/build_images.bat b/docker/staging/build_images.bat
new file mode 100644
index 000000000..c8be0378a
--- /dev/null
+++ b/docker/staging/build_images.bat
@@ -0,0 +1,33 @@
+@echo off
+setlocal enabledelayedexpansion
+
+REM Change directory to root Server directory for correct Docker Context
+cd /d "%~dp0"
+cd ../..
+
+REM Define service names and their corresponding Dockerfiles
+set services[0]=uptime_client
+set dockerfiles[0]=.\docker\staging\client.Dockerfile
+
+set services[1]=uptime_database_mongo
+set dockerfiles[1]=.\docker\staging\mongoDB.Dockerfile
+
+set services[2]=uptime_server
+set dockerfiles[2]=.\docker\staging\server.Dockerfile
+
+REM Loop through each service and build the corresponding image
+for /L %%i in (0,1,2) do (
+    set service=!services[%%i]!
+    set dockerfile=!dockerfiles[%%i]!
+
+    docker build -f "!dockerfile!" -t "!service!" .
+
+    REM Check if the build succeeded
+    if errorlevel 1 (
+        echo Error building !service! image. Exiting...
+        exit /b 1
+    )
+)
+
+echo All images built successfully
+exit /b 0
diff --git a/docker/unified/build_images.bat b/docker/unified/build_images.bat
new file mode 100644
index 000000000..a3d54e60d
--- /dev/null
+++ b/docker/unified/build_images.bat
@@ -0,0 +1,33 @@
+@echo off
+setlocal enabledelayedexpansion
+
+REM Change directory to root Server directory for correct Docker Context
+cd /d "%~dp0"
+cd ../..
+
+REM Define service names and their corresponding Dockerfiles
+set services[0]=uptime_client
+set dockerfiles[0]=.\docker\unified\client.Dockerfile
+
+set services[1]=uptime_database_mongo
+set dockerfiles[1]=.\docker\unified\mongoDB.Dockerfile
+
+set services[2]=uptime_server
+set dockerfiles[2]=.\docker\unified\server.Dockerfile
+
+REM Loop through each service and build the corresponding image
+for /L %%i in (0,1,2) do (
+    set service=!services[%%i]!
+    set dockerfile=!dockerfiles[%%i]!
+
+    docker build -f "!dockerfile!" -t "!service!" .
+
+    REM Check if the build succeeded
+    if errorlevel 1 (
+        echo Error building !service! image. Exiting...
+        exit /b 1
+    )
+)
+
+echo All images built successfully
+exit /b 0
diff --git a/docker/unified/build_images.sh b/docker/unified/build_images.sh
index 49f8c7841..21b866bbe 100755
--- a/docker/unified/build_images.sh
+++ b/docker/unified/build_images.sh
@@ -6,9 +6,9 @@ cd ../../
 
 # Define an array of services and their Dockerfiles
 declare -A services=(
-  ["uptime_client"]="./docker/prod/client.Dockerfile"
-  ["uptime_database_mongo"]="./docker/prod/mongoDB.Dockerfile"
-  ["uptime_server"]="./docker/prod/server.Dockerfile"
+  ["uptime_client"]="./docker/unified/client.Dockerfile"
+  ["uptime_database_mongo"]="./docker/unified/mongoDB.Dockerfile"
+  ["uptime_server"]="./docker/unified/server.Dockerfile"
 )
 
 # Loop through each service and build the corresponding image
@@ -22,4 +22,4 @@ for service in "${!services[@]}"; do
   fi
 done
 
-echo "All images built successfully"
\ No newline at end of file
+echo "All images built successfully"