diff --git a/__tests__/buildkit/buildkit.test.ts b/__tests__/buildkit/buildkit.test.ts
index 1d4f5c04..de6f5b87 100644
--- a/__tests__/buildkit/buildkit.test.ts
+++ b/__tests__/buildkit/buildkit.test.ts
@@ -19,7 +19,7 @@ import {beforeEach, describe, expect, it, jest, test} from '@jest/globals';
 import {BuildKit} from '../../src/buildkit/buildkit';
 import {Builder} from '../../src/buildx/builder';
 
-import {BuilderInfo} from '../../src/types/builder';
+import {BuilderInfo} from '../../src/types/buildx/builder';
 
 beforeEach(() => {
   jest.clearAllMocks();
diff --git a/__tests__/buildx/bake.test.itg.ts b/__tests__/buildx/bake.test.itg.ts
index 42918a86..c9b900d0 100644
--- a/__tests__/buildx/bake.test.itg.ts
+++ b/__tests__/buildx/bake.test.itg.ts
@@ -19,7 +19,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 
 import {Bake} from '../../src/buildx/bake';
-import {BakeDefinition} from '../../src/types/bake';
+import {BakeDefinition} from '../../src/types/buildx/bake';
 
 const fixturesDir = path.join(__dirname, '..', 'fixtures');
 
diff --git a/__tests__/buildx/bake.test.ts b/__tests__/buildx/bake.test.ts
index 3f89a810..fd8b97ad 100644
--- a/__tests__/buildx/bake.test.ts
+++ b/__tests__/buildx/bake.test.ts
@@ -23,7 +23,7 @@ import {Bake} from '../../src/buildx/bake';
 import {Context} from '../../src/context';
 
 import {ExecOptions} from '@actions/exec';
-import {BakeDefinition, BakeMetadata} from '../../src/types/bake';
+import {BakeDefinition, BakeMetadata} from '../../src/types/buildx/bake';
 
 const fixturesDir = path.join(__dirname, '..', 'fixtures');
 // prettier-ignore
diff --git a/__tests__/buildx/build.test.ts b/__tests__/buildx/build.test.ts
index 25d7eaad..ac2b98c1 100644
--- a/__tests__/buildx/build.test.ts
+++ b/__tests__/buildx/build.test.ts
@@ -22,7 +22,7 @@ import * as rimraf from 'rimraf';
 import {Context} from '../../src/context';
 import {Build} from '../../src/buildx/build';
 
-import {BuildMetadata} from '../../src/types/build';
+import {BuildMetadata} from '../../src/types/buildx/build';
 
 const fixturesDir = path.join(__dirname, '..', 'fixtures');
 // prettier-ignore
diff --git a/__tests__/buildx/builder.test.ts b/__tests__/buildx/builder.test.ts
index 2606690c..fda5101c 100644
--- a/__tests__/buildx/builder.test.ts
+++ b/__tests__/buildx/builder.test.ts
@@ -21,7 +21,7 @@ import * as path from 'path';
 import {Builder} from '../../src/buildx/builder';
 import {Exec} from '../../src/exec';
 
-import {BuilderInfo} from '../../src/types/builder';
+import {BuilderInfo} from '../../src/types/buildx/builder';
 
 const fixturesDir = path.join(__dirname, '..', 'fixtures');
 
diff --git a/__tests__/buildx/buildx.test.ts b/__tests__/buildx/buildx.test.ts
index 9d6ec0a6..25cf505f 100644
--- a/__tests__/buildx/buildx.test.ts
+++ b/__tests__/buildx/buildx.test.ts
@@ -24,7 +24,7 @@ import {Buildx} from '../../src/buildx/buildx';
 import {Context} from '../../src/context';
 import {Exec} from '../../src/exec';
 
-import {Cert} from '../../src/types/buildx';
+import {Cert} from '../../src/types/buildx/buildx';
 
 const fixturesDir = path.join(__dirname, '..', 'fixtures');
 // prettier-ignore
diff --git a/__tests__/docker/docker.test.ts b/__tests__/docker/docker.test.ts
index 66b5f292..000ce509 100644
--- a/__tests__/docker/docker.test.ts
+++ b/__tests__/docker/docker.test.ts
@@ -24,7 +24,7 @@ import * as rimraf from 'rimraf';
 import {Docker} from '../../src/docker/docker';
 import {Exec} from '../../src/exec';
 
-import {ConfigFile} from '../../src/types/docker';
+import {ConfigFile} from '../../src/types/docker/docker';
 
 const fixturesDir = path.join(__dirname, '..', 'fixtures');
 
diff --git a/src/buildkit/buildkit.ts b/src/buildkit/buildkit.ts
index 95624d5e..af6b0d96 100644
--- a/src/buildkit/buildkit.ts
+++ b/src/buildkit/buildkit.ts
@@ -22,7 +22,7 @@ import {Builder} from '../buildx/builder';
 import {Config} from './config';
 import {Exec} from '../exec';
 
-import {BuilderInfo, NodeInfo} from '../types/builder';
+import {BuilderInfo, NodeInfo} from '../types/buildx/builder';
 
 export interface BuildKitOpts {
   buildx?: Buildx;
diff --git a/src/buildx/bake.ts b/src/buildx/bake.ts
index d296eafb..70165ae1 100644
--- a/src/buildx/bake.ts
+++ b/src/buildx/bake.ts
@@ -24,7 +24,7 @@ import {Exec} from '../exec';
 import {Util} from '../util';
 
 import {ExecOptions} from '@actions/exec';
-import {BakeDefinition, BakeMetadata} from '../types/bake';
+import {BakeDefinition, BakeMetadata} from '../types/buildx/bake';
 
 export interface BakeOpts {
   buildx?: Buildx;
diff --git a/src/buildx/build.ts b/src/buildx/build.ts
index 8b4bc86e..c368c45e 100644
--- a/src/buildx/build.ts
+++ b/src/buildx/build.ts
@@ -24,7 +24,7 @@ import {Context} from '../context';
 import {GitHub} from '../github';
 import {Util} from '../util';
 
-import {BuildMetadata} from '../types/build';
+import {BuildMetadata} from '../types/buildx/build';
 
 export interface BuildOpts {
   buildx?: Buildx;
diff --git a/src/buildx/builder.ts b/src/buildx/builder.ts
index d30b75ee..a44181fd 100644
--- a/src/buildx/builder.ts
+++ b/src/buildx/builder.ts
@@ -19,7 +19,7 @@ import * as core from '@actions/core';
 import {Buildx} from './buildx';
 import {Exec} from '../exec';
 
-import {BuilderInfo, GCPolicy, NodeInfo} from '../types/builder';
+import {BuilderInfo, GCPolicy, NodeInfo} from '../types/buildx/builder';
 
 export interface BuilderOpts {
   buildx?: Buildx;
diff --git a/src/buildx/buildx.ts b/src/buildx/buildx.ts
index 6ac7a142..5820236a 100644
--- a/src/buildx/buildx.ts
+++ b/src/buildx/buildx.ts
@@ -22,7 +22,7 @@ import * as semver from 'semver';
 import {Docker} from '../docker/docker';
 import {Exec} from '../exec';
 
-import {Cert, LocalRefsOpts, LocalRefsResponse, LocalState} from '../types/buildx';
+import {Cert, LocalRefsOpts, LocalRefsResponse, LocalState} from '../types/buildx/buildx';
 
 export interface BuildxOpts {
   standalone?: boolean;
diff --git a/src/buildx/history.ts b/src/buildx/history.ts
index 435b0036..970e58cf 100644
--- a/src/buildx/history.ts
+++ b/src/buildx/history.ts
@@ -27,7 +27,7 @@ import {Docker} from '../docker/docker';
 import {Exec} from '../exec';
 import {GitHub} from '../github';
 
-import {ExportRecordOpts, ExportRecordResponse, Summaries} from '../types/history';
+import {ExportRecordOpts, ExportRecordResponse, Summaries} from '../types/buildx/history';
 
 export interface HistoryOpts {
   buildx?: Buildx;
diff --git a/src/buildx/install.ts b/src/buildx/install.ts
index a1ed19ca..a78d51d1 100644
--- a/src/buildx/install.ts
+++ b/src/buildx/install.ts
@@ -31,7 +31,7 @@ import {Docker} from '../docker/docker';
 import {Git} from '../git';
 import {Util} from '../util';
 
-import {DownloadVersion} from '../types/buildx';
+import {DownloadVersion} from '../types/buildx/buildx';
 import {GitHubRelease} from '../types/github';
 
 export interface InstallOpts {
diff --git a/src/docker/docker.ts b/src/docker/docker.ts
index 63e4ce96..804b095a 100644
--- a/src/docker/docker.ts
+++ b/src/docker/docker.ts
@@ -25,7 +25,7 @@ import {Cache} from '../cache';
 import {Exec} from '../exec';
 import {Util} from '../util';
 
-import {ConfigFile} from '../types/docker';
+import {ConfigFile} from '../types/docker/docker';
 
 export class Docker {
   static get configDir(): string {
diff --git a/src/types/bake.ts b/src/types/buildx/bake.ts
similarity index 100%
rename from src/types/bake.ts
rename to src/types/buildx/bake.ts
diff --git a/src/types/build.ts b/src/types/buildx/build.ts
similarity index 100%
rename from src/types/build.ts
rename to src/types/buildx/build.ts
diff --git a/src/types/builder.ts b/src/types/buildx/builder.ts
similarity index 100%
rename from src/types/builder.ts
rename to src/types/buildx/builder.ts
diff --git a/src/types/buildx.ts b/src/types/buildx/buildx.ts
similarity index 100%
rename from src/types/buildx.ts
rename to src/types/buildx/buildx.ts
diff --git a/src/types/history.ts b/src/types/buildx/history.ts
similarity index 100%
rename from src/types/history.ts
rename to src/types/buildx/history.ts
diff --git a/src/types/docker.ts b/src/types/docker/docker.ts
similarity index 100%
rename from src/types/docker.ts
rename to src/types/docker/docker.ts
diff --git a/src/types/github.ts b/src/types/github.ts
index 81ad4759..7232f590 100644
--- a/src/types/github.ts
+++ b/src/types/github.ts
@@ -17,8 +17,8 @@
 import {components as OctoOpenApiTypes} from '@octokit/openapi-types';
 import {JwtPayload} from 'jwt-decode';
 
-import {BakeDefinition} from './bake';
-import {ExportRecordResponse} from './history';
+import {BakeDefinition} from './buildx/bake';
+import {ExportRecordResponse} from './buildx/history';
 
 export interface GitHubRelease {
   id: number;