diff --git a/CHANGELOG.md b/CHANGELOG.md
index 354734b..39d0a87 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## [Next Version - available as `edge`]
 
 - New: Ability to deploy simplified Docker compose [PR-191](https://github.com/caprover/caprover-frontend/pull/191)
+- New: Defaulting to BuildKit [Issue-1582](https://github.com/caprover/caprover/issues/1582)
 - Improved: Descriptive error on installations on incompatible systems (e.g. Proxmox LXC) [issues-2326](https://github.com/caprover/caprover/issues/2326)
 - Improved: Moved one click app creation process to backend for more stability [PR-2334](https://github.com/caprover/caprover/pull/2334)
 - Improved: Reduced the Backup size by excluding the GoAccess logs [PR-2336](https://github.com/caprover/caprover/pull/2336)
diff --git a/src/docker/DockerApi.ts b/src/docker/DockerApi.ts
index 7893b3f..15a0734 100644
--- a/src/docker/DockerApi.ts
+++ b/src/docker/DockerApi.ts
@@ -321,6 +321,7 @@ class DockerApi {
                 const optionsForBuild: Dockerode.ImageBuildOptions = {
                     t: imageName,
                     buildargs: buildargs,
+                    version: CaptainConstants.configs.defaultDockerBuildVersion,
                 }
 
                 if (Object.keys(registryConfig).length > 0) {
diff --git a/src/utils/CaptainConstants.ts b/src/utils/CaptainConstants.ts
index 7c95263..eac9b3b 100644
--- a/src/utils/CaptainConstants.ts
+++ b/src/utils/CaptainConstants.ts
@@ -21,6 +21,8 @@ const configs = {
 
     defaultMaxLogSize: '512m',
 
+    defaultDockerBuildVersion: '2' as '1' | '2',
+
     buildLogSize: 50,
 
     appLogSize: 500,