diff --git a/dist/index.js b/dist/index.js
index 96efc4f..eab796d 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -541,17 +541,9 @@ function run() {
                 core.startGroup(`🔨 Creating a new builder instance`);
                 let createArgs = ['buildx', 'create', '--name', builderName, '--driver', inputs.driver];
                 if (semver.satisfies(buildxVersion, '>=0.3.0')) {
-                    let hasImageDriverOpt = false;
                     yield context.asyncForEach(inputs.driverOpts, (driverOpt) => __awaiter(this, void 0, void 0, function* () {
-                        if (driverOpt.startsWith('image=')) {
-                            hasImageDriverOpt = true;
-                        }
                         createArgs.push('--driver-opt', driverOpt);
                     }));
-                    if (!hasImageDriverOpt) {
-                        //FIXME: Temporary fix (docker/build-push-action#154, docker/build-push-action#162)
-                        createArgs.push('--driver-opt', 'image=moby/buildkit:v0.8-beta');
-                    }
                     if (inputs.buildkitdFlags) {
                         createArgs.push('--buildkitd-flags', inputs.buildkitdFlags);
                     }
diff --git a/src/main.ts b/src/main.ts
index 0dfe761..c1d9a37 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -36,17 +36,9 @@ async function run(): Promise<void> {
       core.startGroup(`🔨 Creating a new builder instance`);
       let createArgs: Array<string> = ['buildx', 'create', '--name', builderName, '--driver', inputs.driver];
       if (semver.satisfies(buildxVersion, '>=0.3.0')) {
-        let hasImageDriverOpt: boolean = false;
         await context.asyncForEach(inputs.driverOpts, async driverOpt => {
-          if (driverOpt.startsWith('image=')) {
-            hasImageDriverOpt = true;
-          }
           createArgs.push('--driver-opt', driverOpt);
         });
-        if (!hasImageDriverOpt) {
-          //FIXME: Temporary fix (docker/build-push-action#154, docker/build-push-action#162)
-          createArgs.push('--driver-opt', 'image=moby/buildkit:v0.8-beta');
-        }
         if (inputs.buildkitdFlags) {
           createArgs.push('--buildkitd-flags', inputs.buildkitdFlags);
         }