diff --git a/dist/index.js b/dist/index.js
index 03889eb..6e1a5de 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -62142,7 +62142,7 @@ function addCiRegistryAuth(ci_registry, registryAuthJson) {
     return;
   }
 
-  registryAuthJson.auths[ci_registry] = gBase64.encode('token:' + argCiRegistryPassword);
+  registryAuthJson.auths[ci_registry] = {'auth': gBase64.encode('token:' + argCiRegistryPassword)};
 }
 
 function mergeArgRegistryAuthJson(registryAuthJson) {
@@ -62268,8 +62268,9 @@ function prepareDockerArgs(destinations) {
 
 function executeDockerBuild(dockerArgs) {
   const dockerArgsStr = dockerArgs.join(' ');
+  const dockerSubCmd  = core.getBooleanInput('use_buildx') ? 'buildx' : 'build';
 
-  const proc = external_child_process_namespaceObject.spawnSync('docker ' + dockerArgsStr, {
+  const proc = external_child_process_namespaceObject.spawnSync(`docker ${dockerSubCmd} ${dockerArgsStr}`, {
     shell: true,
     stdio: 'inherit',
     cwd  : getDockerContextDir()
diff --git a/src/lib.js b/src/lib.js
index 493db2b..c5ed0f7 100644
--- a/src/lib.js
+++ b/src/lib.js
@@ -40,7 +40,7 @@ export function addCiRegistryAuth(ci_registry, registryAuthJson) {
     return;
   }
 
-  registryAuthJson.auths[ci_registry] = Base64.encode('token:' + argCiRegistryPassword);
+  registryAuthJson.auths[ci_registry] = {'auth': Base64.encode('token:' + argCiRegistryPassword)};
 }
 
 export function mergeArgRegistryAuthJson(registryAuthJson) {
@@ -166,8 +166,9 @@ export function prepareDockerArgs(destinations) {
 
 export function executeDockerBuild(dockerArgs) {
   const dockerArgsStr = dockerArgs.join(' ');
+  const dockerSubCmd  = core.getBooleanInput('use_buildx') ? 'buildx' : 'build';
 
-  const proc = child_process.spawnSync('docker ' + dockerArgsStr, {
+  const proc = child_process.spawnSync(`docker ${dockerSubCmd} ${dockerArgsStr}`, {
     shell: true,
     stdio: 'inherit',
     cwd  : getDockerContextDir()