diff --git a/.github/buildkit-container-logs.png b/.github/buildkit-container-logs.png
new file mode 100644
index 0000000..e2cf1ea
Binary files /dev/null and b/.github/buildkit-container-logs.png differ
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9c75748..7b73e74 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -77,6 +77,34 @@ jobs:
           echo "Flags:     ${{ steps.buildx2.outputs.flags }}"
           echo "Platforms: ${{ steps.buildx2.outputs.platforms }}"
 
+  debug:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Create Dockerfile
+        run: |
+          cat > ./Dockerfile <<EOL
+          FROM alpine
+          RUN uname -a
+          EOL
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      -
+        name: Set up Docker Buildx
+        uses: ./
+        with:
+          buildkitd-flags: --debug
+      -
+        name: Build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64,linux/ppc64le
+
   install:
     runs-on: ubuntu-latest
     steps:
diff --git a/README.md b/README.md
index 2b611a7..d381230 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,8 @@ ___
   * [inputs](#inputs)
   * [outputs](#outputs)
   * [environment variables](#environment-variables)
+* [Notes](#notes)
+  * [BuildKit container logs](#buildkit-container-logs)
 * [Keep up-to-date with GitHub Dependabot](#keep-up-to-date-with-github-dependabot)
 * [Limitation](#limitation)
 
@@ -164,6 +166,25 @@ The following [official docker environment variables](https://docs.docker.com/en
 |-----------------|---------|-------------|-------------------------------------------------|
 | `DOCKER_CONFIG` | String  | `~/.docker` | The location of your client configuration files |
 
+## Notes
+
+### BuildKit container logs
+
+To display BuildKit container logs (when `docker-container` driver is used) you have to [enable step debug logging](https://docs.github.com/en/actions/managing-workflow-runs/enabling-debug-logging#enabling-step-debug-logging)
+or you can also enable debugging in the [setup-buildx action step](https://github.com/docker/setup-buildx-action):
+
+```yaml
+  -
+    name: Set up Docker Buildx
+    uses: docker/setup-buildx-action@v1
+    with:
+      buildkitd-flags: --debug
+```
+
+Logs will be available at the end of a job:
+
+![BuildKit container logs](.github/buildkit-container-logs.png)
+
 ## Keep up-to-date with GitHub Dependabot
 
 Since [Dependabot](https://docs.github.com/en/github/administering-a-repository/keeping-your-actions-up-to-date-with-github-dependabot)
diff --git a/dist/index.js b/dist/index.js
index 93457d4..380744f 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -519,6 +519,7 @@ const context = __importStar(__webpack_require__(842));
 const mexec = __importStar(__webpack_require__(757));
 const stateHelper = __importStar(__webpack_require__(647));
 function run() {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         try {
             if (os.platform() !== 'linux') {
@@ -581,6 +582,12 @@ function run() {
             context.setOutput('flags', builder.node_flags);
             context.setOutput('platforms', builder.node_platforms);
             core.endGroup();
+            if (inputs.driver == 'docker-container') {
+                stateHelper.setContainerName(`buildx_buildkit_${builder.node_name}`);
+            }
+            if (core.isDebug() || ((_a = builder.node_flags) === null || _a === void 0 ? void 0 : _a.includes('--debug'))) {
+                stateHelper.setDebug('true');
+            }
         }
         catch (error) {
             core.setFailed(error.message);
@@ -589,14 +596,24 @@ function run() {
 }
 function cleanup() {
     return __awaiter(this, void 0, void 0, function* () {
-        if (stateHelper.builderName.length == 0) {
-            return;
+        if (stateHelper.IsDebug && stateHelper.containerName.length > 0) {
+            core.startGroup(`BuildKit container logs`);
+            yield mexec.exec('docker', ['logs', `${stateHelper.containerName}`], false).then(res => {
+                if (res.stderr != '' && !res.success) {
+                    core.warning(res.stderr);
+                }
+            });
+            core.endGroup();
+        }
+        if (stateHelper.builderName.length > 0) {
+            core.startGroup(`Removing builder`);
+            yield mexec.exec('docker', ['buildx', 'rm', `${stateHelper.builderName}`], false).then(res => {
+                if (res.stderr != '' && !res.success) {
+                    core.warning(res.stderr);
+                }
+            });
+            core.endGroup();
         }
-        yield mexec.exec('docker', ['buildx', 'rm', `${stateHelper.builderName}`], false).then(res => {
-            if (res.stderr != '' && !res.success) {
-                core.warning(res.stderr);
-            }
-        });
     });
 }
 if (!stateHelper.IsPost) {
@@ -5623,14 +5640,24 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setBuilderName = exports.builderName = exports.IsPost = void 0;
+exports.setContainerName = exports.setBuilderName = exports.setDebug = exports.containerName = exports.builderName = exports.IsDebug = exports.IsPost = void 0;
 const core = __importStar(__webpack_require__(186));
 exports.IsPost = !!process.env['STATE_isPost'];
+exports.IsDebug = !!process.env['STATE_isDebug'];
 exports.builderName = process.env['STATE_builderName'] || '';
+exports.containerName = process.env['STATE_containerName'] || '';
+function setDebug(debug) {
+    core.saveState('isDebug', debug);
+}
+exports.setDebug = setDebug;
 function setBuilderName(builderName) {
     core.saveState('builderName', builderName);
 }
 exports.setBuilderName = setBuilderName;
+function setContainerName(containerName) {
+    core.saveState('containerName', containerName);
+}
+exports.setContainerName = setContainerName;
 if (!exports.IsPost) {
     core.saveState('isPost', 'true');
 }
diff --git a/src/main.ts b/src/main.ts
index 5a1e2b9..87540fd 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -78,20 +78,38 @@ async function run(): Promise<void> {
     context.setOutput('flags', builder.node_flags);
     context.setOutput('platforms', builder.node_platforms);
     core.endGroup();
+
+    if (inputs.driver == 'docker-container') {
+      stateHelper.setContainerName(`buildx_buildkit_${builder.node_name}`);
+    }
+    if (core.isDebug() || builder.node_flags?.includes('--debug')) {
+      stateHelper.setDebug('true');
+    }
   } catch (error) {
     core.setFailed(error.message);
   }
 }
 
 async function cleanup(): Promise<void> {
-  if (stateHelper.builderName.length == 0) {
-    return;
+  if (stateHelper.IsDebug && stateHelper.containerName.length > 0) {
+    core.startGroup(`BuildKit container logs`);
+    await mexec.exec('docker', ['logs', `${stateHelper.containerName}`], false).then(res => {
+      if (res.stderr != '' && !res.success) {
+        core.warning(res.stderr);
+      }
+    });
+    core.endGroup();
+  }
+
+  if (stateHelper.builderName.length > 0) {
+    core.startGroup(`Removing builder`);
+    await mexec.exec('docker', ['buildx', 'rm', `${stateHelper.builderName}`], false).then(res => {
+      if (res.stderr != '' && !res.success) {
+        core.warning(res.stderr);
+      }
+    });
+    core.endGroup();
   }
-  await mexec.exec('docker', ['buildx', 'rm', `${stateHelper.builderName}`], false).then(res => {
-    if (res.stderr != '' && !res.success) {
-      core.warning(res.stderr);
-    }
-  });
 }
 
 if (!stateHelper.IsPost) {
diff --git a/src/state-helper.ts b/src/state-helper.ts
index 6e675ea..bbdd05b 100644
--- a/src/state-helper.ts
+++ b/src/state-helper.ts
@@ -1,12 +1,22 @@
 import * as core from '@actions/core';
 
 export const IsPost = !!process.env['STATE_isPost'];
+export const IsDebug = !!process.env['STATE_isDebug'];
 export const builderName = process.env['STATE_builderName'] || '';
+export const containerName = process.env['STATE_containerName'] || '';
+
+export function setDebug(debug: string) {
+  core.saveState('isDebug', debug);
+}
 
 export function setBuilderName(builderName: string) {
   core.saveState('builderName', builderName);
 }
 
+export function setContainerName(containerName: string) {
+  core.saveState('containerName', containerName);
+}
+
 if (!IsPost) {
   core.saveState('isPost', 'true');
 }