diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 9c6de5e..16d8869 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -67,6 +67,9 @@ jobs:
           - windows-2022
           - windows-2019
         cmdline-tools-version:
+          - 12266719
+          - 11479570
+          - 11076708
           - 10406996
           - 9862592
           - 9477386
diff --git a/README.md b/README.md
index e6f224a..0d91cab 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ Additional packages can be installed at a later time by calling sdkmanager manua
 Command line tools are versioned using two variables - short and long.
 Long one is the build number, used in the zip URL, short one is the human friendly version name.
 
-By default, setup-android installs version 10406996 (short version 11.0).
+By default, setup-android installs version 12266719 (short version 11.0).
 
 To install a different version, call setup-android with desired long version as the input parameter `cmdline-tools-version`:
 ```yaml
@@ -73,12 +73,15 @@ To install a different version, call setup-android with desired long version as
 
 #### Version table
 | Short version | Long version |
-| --- | --- |
-| 11.0 | 10406996 |
-| 10.0 | 9862592 |
-| 9.0 | 9477386 |
-| 8.0 | 9123335 |
-| 7.0 | 8512546 |
+|---------------| --- |
+| 16.0          | 12266719 |
+| 13.0          | 11479570 |
+| 12.0          | 11076708 |
+| 11.0          | 10406996 |
+| 10.0          | 9862592 |
+| 9.0           | 9477386 |
+| 8.0           | 9123335 |
+| 7.0           | 8512546 |
 
 Current cmdline tools version can be found at https://developer.android.com/studio#command-line-tools-only
 
diff --git a/action.yml b/action.yml
index 2b925c9..2b23091 100644
--- a/action.yml
+++ b/action.yml
@@ -6,7 +6,7 @@ inputs:
   cmdline-tools-version:
     description: 'cmdline-tools-version. See https://developer.android.com/studio#command-line-tools-only'
     required: false
-    default: '10406996'
+    default: '12266719'
 
   accept-android-sdk-licenses:
     description: 'Android SDK is usable only after the license agreement. Should setup-android agree to the licences, provided by "sdkmanager --licenses"'
diff --git a/dist/index.js b/dist/index.js
index 096018e..3f946fa 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -28824,6 +28824,12 @@ const fs = __importStar(__nccwpck_require__(7147));
 const os = __importStar(__nccwpck_require__(2037));
 function getVersionShort(versionLong) {
     switch (versionLong) {
+        case '12266719':
+            return '16.0';
+        case '11479570':
+            return '13.0';
+        case '11076708':
+            return '12.0';
         case '10406996':
             return '11.0';
         case '9862592':
diff --git a/src/main.ts b/src/main.ts
index f5ca205..aa240bf 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -7,6 +7,12 @@ import * as os from 'os'
 
 function getVersionShort(versionLong: string): string {
   switch (versionLong) {
+    case '12266719':
+      return '16.0'
+    case '11479570':
+      return '13.0'
+    case '11076708':
+      return '12.0'
     case '10406996':
       return '11.0'
     case '9862592':