diff --git a/__tests__/context.test.ts b/__tests__/context.test.ts
index 8177f29..b204379 100644
--- a/__tests__/context.test.ts
+++ b/__tests__/context.test.ts
@@ -3,7 +3,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import {Buildx} from '@docker/actions-toolkit/lib/buildx/buildx';
 import {Context} from '@docker/actions-toolkit/lib/context';
-import {Docker} from '@docker/actions-toolkit/lib/docker';
+import {Docker} from '@docker/actions-toolkit/lib/docker/docker';
 import {Toolkit} from '@docker/actions-toolkit/lib/toolkit';
 
 import * as context from '../src/context';
diff --git a/src/context.ts b/src/context.ts
index 6797019..9660288 100644
--- a/src/context.ts
+++ b/src/context.ts
@@ -1,4 +1,5 @@
 import * as core from '@actions/core';
+import {Inputs as BuildxInputs} from '@docker/actions-toolkit/lib/buildx/inputs';
 import {Toolkit} from '@docker/actions-toolkit/lib/toolkit';
 import {Util} from '@docker/actions-toolkit/lib/util';
 
@@ -51,7 +52,7 @@ async function getBakeArgs(inputs: Inputs, toolkit: Toolkit): Promise<Array<stri
     args.push('--set', set);
   });
   if (await toolkit.buildx.versionSatisfies('>=0.6.0')) {
-    args.push('--metadata-file', toolkit.buildx.inputs.getBuildMetadataFilePath());
+    args.push('--metadata-file', BuildxInputs.getBuildMetadataFilePath());
   }
   return args;
 }
diff --git a/src/main.ts b/src/main.ts
index 4f39ad1..f08101c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,8 +1,9 @@
 import * as fs from 'fs';
 import * as core from '@actions/core';
 import * as actionsToolkit from '@docker/actions-toolkit';
+import {Inputs as BuildxInputs} from '@docker/actions-toolkit/lib/buildx/inputs';
 import {Context} from '@docker/actions-toolkit/lib/context';
-import {Docker} from '@docker/actions-toolkit/lib/docker';
+import {Docker} from '@docker/actions-toolkit/lib/docker/docker';
 import {Exec} from '@docker/actions-toolkit/lib/exec';
 import {Toolkit} from '@docker/actions-toolkit/lib/toolkit';
 
@@ -53,7 +54,7 @@ actionsToolkit.run(
       }
     });
 
-    const metadata = await toolkit.buildx.inputs.resolveBuildMetadata();
+    const metadata = await BuildxInputs.resolveBuildMetadata();
     if (metadata) {
       await core.group(`Metadata`, async () => {
         core.info(metadata);