diff --git a/app/config/platforms.php b/app/config/platforms.php
index cfb21f3d82..1409cf2cc9 100644
--- a/app/config/platforms.php
+++ b/app/config/platforms.php
@@ -109,19 +109,20 @@ return [
                 'gitUserName' => 'appwrite',
             ],
             [
-                'key' => 'kotlin',
-                'name' => 'Kotlin',
-                'url' => '',
-                'package' => '',
-                'enabled' => false,
-                'beta' => false,
+                'key' => 'android',
+                'name' => 'Android',
+                'version' => '0.0.0-SNAPSHOT',
+                'url' => 'https://github.com/appwrite/sdk-for-android',
+                'package' => 'https://repo1.maven.org/maven2/io/appwrite/sdk-for-android/',
+                'enabled' => true,
+                'beta' => true,
                 'dev' => false,
                 'hidden' => false,
                 'family' => APP_PLATFORM_CLIENT,
                 'prism' => 'kotlin',
-                'source' => false,
-                'gitUrl' => 'git@github.com:appwrite/sdk-for-kotlin.git',
-                'gitRepoName' => 'sdk-for-kotlin',
+                'source' => \realpath(__DIR__ . '/../sdks/client-android'),
+                'gitUrl' => 'git@github.com:appwrite/sdk-for-android.git',
+                'gitRepoName' => 'sdk-for-android',
                 'gitUserName' => 'appwrite',
             ],
             // [
diff --git a/app/tasks/sdks.php b/app/tasks/sdks.php
index 108ce7a486..adc50392cf 100644
--- a/app/tasks/sdks.php
+++ b/app/tasks/sdks.php
@@ -15,7 +15,7 @@ use Appwrite\SDK\Language\Deno;
 use Appwrite\SDK\Language\DotNet;
 use Appwrite\SDK\Language\Flutter;
 use Appwrite\SDK\Language\Go;
-use Appwrite\SDK\Language\Java;
+use Appwrite\SDK\Language\Kotlin;
 use Appwrite\SDK\Language\Swift;
 
 $cli
@@ -134,9 +134,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
                     case 'go':
                         $config = new Go();
                         break;
-                    case 'java':
-                        $config = new Java();
-                        break;
                     case 'swift':
                         $config = new Swift();
                         break;
@@ -144,6 +141,9 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
                         $cover = '';
                         $config = new DotNet();
                         break;
+                    case 'android':
+                        $config = new Kotlin();
+                        break;
                     default:
                         throw new Exception('Language "'.$language['key'].'" not supported');
                         break;
@@ -155,9 +155,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
                 $sdk
                     ->setName($language['name'])
-                    ->setDescription("Appwrite is an open-source backend as a service server that abstract and simplify complex and repetitive development tasks behind a very simple to use REST API. Appwrite aims to help you develop your apps faster and in a more secure way.
-                        Use the {$language['name']} SDK to integrate your app with the Appwrite server to easily start interacting with all of Appwrite backend APIs and tools.
-                        For full API documentation and tutorials go to [https://appwrite.io/docs](https://appwrite.io/docs)")
+                    ->setDescription("Appwrite is an open-source backend as a service server that abstract and simplify complex and repetitive development tasks behind a very simple to use REST API. Appwrite aims to help you develop your apps faster and in a more secure way. Use the {$language['name']} SDK to integrate your app with the Appwrite server to easily start interacting with all of Appwrite backend APIs and tools. For full API documentation and tutorials go to [https://appwrite.io/docs](https://appwrite.io/docs)")
                     ->setShortDescription('Appwrite is an open-source self-hosted backend server that abstract and simplify complex and repetitive development tasks behind a very simple REST API')
                     ->setLicense($license)
                     ->setLicenseContent($licenseContent)
diff --git a/docs/sdks/android/GETTING_STARTED.md b/docs/sdks/android/GETTING_STARTED.md
index 23223d85de..8a38e86fe0 100644
--- a/docs/sdks/android/GETTING_STARTED.md
+++ b/docs/sdks/android/GETTING_STARTED.md
@@ -1,14 +1,14 @@
 ## Getting Started
 
 ### Add your Android Platform
-To init your SDK and start interacting with Appwrite services, you need to add a new Flutter platform to your project. To add a new platform, go to your Appwrite console, choose the project you created in the step before, and click the 'Add Platform' button.
+To initialize your SDK and start interacting with Appwrite services, you need to add a new Android platform to your project. To add a new platform, go to your Appwrite console, choose the project you created in the step before, and click the 'Add Platform' button.
 
-From the options, choose to add a new **Flutter** platform and add your app credentials, ignoring iOS.
+From the options, choose to add a new **Android** platform and add your app credentials.
 
-Add your app <u>name</u> and <u>package name</u>, Your package name is generally the applicationId in your app-level build.gradle file. By registering your new app platform, you are allowing your app to communicate with the Appwrite API.
+Add your app <u>name</u> and <u>package name</u>. Your package name is generally the applicationId in your app-level `build.gradle` file. By registering a new platform, you are allowing your app to communicate with the Appwrite API.
 
 ### OAuth
-In order to capture the Appwrite OAuth callback url, the following activity needs to be added to your [AndroidManifest.xml](https://github.com/appwrite/playground-for-flutter/blob/master/android/app/src/main/AndroidManifest.xml). Be sure to relpace the **[PROJECT_ID]** string with your actual Appwrite project ID. You can find your Appwrite project ID in you project settings screen in your Appwrite console.
+In order to capture the Appwrite OAuth callback url, the following activity needs to be added to your [AndroidManifest.xml](). Be sure to replace the **[PROJECT_ID]** string with your actual Appwrite project ID. You can find your Appwrite project ID in your project settings screen in the console.
 
 ```xml
 <manifest>
@@ -41,7 +41,7 @@ val client = Client(context)
 
 Before starting to send any API calls to your new Appwrite instance, make sure your Android emulators has network access to the Appwrite server hostname or IP address.
 
-When trying to connect to Appwrite from an emulator or a mobile device, localhost is the hostname for the device or emulator and not your local Appwrite instance. You should replace localhost with your private IP as the Appwrite endpoint's hostname. You can also use a service like [ngrok](https://ngrok.com/) to proxy the Appwrite API.
+When trying to connect to Appwrite from an emulator or a mobile device, localhost is the hostname of the device or emulator and not your local Appwrite instance. You should replace localhost with your private IP. You can also use a service like [ngrok](https://ngrok.com/) to proxy the Appwrite API.
 
 ### Make Your First Request
 
@@ -75,7 +75,7 @@ val response = account.create(
 ```
 
 ### Error Handling
-The Apopwrite Android SDK raises `AppwriteException` object with `message`, `code` and `response` properties. You can handle any errors by catching `AppwriteException` and present the `message` to the user or handle it yourself based on provided error information. Below is an example.
+The Appwrite Android SDK raises an `AppwriteException` object with `message`, `code` and `response` properties. You can handle any errors by catching `AppwriteException` and present the `message` to the user or handle it yourself based on the provided error information. Below is an example.
 
 ```kotlin
 try {
@@ -87,8 +87,8 @@ try {
 ```
 
 ### Learn more
-You can use followng resources to learn more and get help
+You can use following resources to learn more and get help
 - 🚀 [Getting Started Tutorial](https://appwrite.io/docs/getting-started-for-android)
 - 📜 [Appwrite Docs](https://appwrite.io/docs)
 - 💬 [Discord Community](https://appwrite.io/discord)
-- - 🚂 [Appwrite Android Playground](https://github.com/appwrite/playground-for-android)
\ No newline at end of file
+- 🚂 [Appwrite Android Playground](https://github.com/appwrite/playground-for-android)
\ No newline at end of file
diff --git a/docs/sdks/flutter/GETTING_STARTED.md b/docs/sdks/flutter/GETTING_STARTED.md
index 9af9720d89..bf2d613c74 100644
--- a/docs/sdks/flutter/GETTING_STARTED.md
+++ b/docs/sdks/flutter/GETTING_STARTED.md
@@ -23,7 +23,7 @@ The Appwrite SDK uses ASWebAuthenticationSession on iOS 12+ and SFAuthentication
 4. In Deployment Info, 'Target' select iOS 11.0
 
 ### Android
-In order to capture the Appwrite OAuth callback url, the following activity needs to be added to your [AndroidManifest.xml](https://github.com/appwrite/playground-for-flutter/blob/master/android/app/src/main/AndroidManifest.xml). Be sure to relpace the **[PROJECT_ID]** string with your actual Appwrite project ID. You can find your Appwrite project ID in you project settings screen in your Appwrite console.
+In order to capture the Appwrite OAuth callback url, the following activity needs to be added to your [AndroidManifest.xml](https://github.com/appwrite/playground-for-flutter/blob/master/android/app/src/main/AndroidManifest.xml). Be sure to replace the **[PROJECT_ID]** string with your actual Appwrite project ID. You can find your Appwrite project ID in your project settings screen in the console.
 
 ```xml
 <manifest>