diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index cb6d796b3..cc8f3664d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @configcat/developers @sigewuzhere
\ No newline at end of file
+* @configcat/developers
\ No newline at end of file
diff --git a/website/docs/integrations/bitbucket.mdx b/website/docs/integrations/bitbucket.mdx
index ebfc35b38..b59e2b668 100644
--- a/website/docs/integrations/bitbucket.mdx
+++ b/website/docs/integrations/bitbucket.mdx
@@ -1,6 +1,6 @@
 ---
 id: bitbucket
-title: Bitbucket Pipe - Scan your code for unused feature flags
+title: Bitbucket - Scan your code for feature flag usages
 description: ConfigCat Bitbucket Pipe integration. This is a step-by-step guide on how to use the ConfigCat Bitbucket integration to eliminate tech debt in your project.
 ---
 
diff --git a/website/docs/integrations/bitrise.mdx b/website/docs/integrations/bitrise.mdx
index 4d56b2a3a..6010fab6a 100644
--- a/website/docs/integrations/bitrise.mdx
+++ b/website/docs/integrations/bitrise.mdx
@@ -1,6 +1,6 @@
 ---
 id: bitrise
-title: Bitrise Step
+title: Bitrise - Scan your code for feature flag usages
 description: ConfigCat Bitrise Step integration. This is a step-by-step guide on how to use the ConfigCat Bitrise integration to eliminate tech debt in your project.
 ---
 
diff --git a/website/docs/integrations/circleci.mdx b/website/docs/integrations/circleci.mdx
index 7dd819563..8be3e0b5f 100644
--- a/website/docs/integrations/circleci.mdx
+++ b/website/docs/integrations/circleci.mdx
@@ -1,6 +1,6 @@
 ---
 id: circleci
-title: CircleCI - Scan your code for unused feature flags
+title: CircleCI - Scan your code for feature flag usages
 description: ConfigCat CircleCI Orb. This is a step-by-step guide on how to use the ConfigCat CircleCI Orb to eliminate tech debt in your project.
 ---
 
diff --git a/website/docs/integrations/github.mdx b/website/docs/integrations/github.mdx
index 0cb49f411..72ac96543 100644
--- a/website/docs/integrations/github.mdx
+++ b/website/docs/integrations/github.mdx
@@ -1,6 +1,6 @@
 ---
 id: github
-title: GitHub Action - Scan your code for unused feature flags
+title: GitHub Action - Scan your code for feature flag usages
 description: ConfigCat GitHub Action. This is a step-by-step guide on how to use the ConfigCat GitHub Action to eliminate tech debt in your project.
 ---
 
diff --git a/website/docs/sdk-reference/overview.mdx b/website/docs/sdk-reference/overview.mdx
index 06ca45b24..c57c95d7e 100644
--- a/website/docs/sdk-reference/overview.mdx
+++ b/website/docs/sdk-reference/overview.mdx
@@ -8,11 +8,16 @@ The purpose of the SDKs is to download and cache feature flag values and to eval
 
 Check out our language specific<a href="https://app.configcat.com/sdkkey" target="_blank"> Getting Started Guide</a> on how to connect your applications.
 
-## .NET, .NET Core, Xamarin
+## .NET
 
 - [Documentation](./dotnet.mdx) on how to connect your application.
 - <a href="https://github.com/configcat/.net-sdk" target="_blank">GitHub repository of the ConfigCat .NET SDK.</a>
 
+## Android (Java)
+
+- [Documentation](./android.mdx) on how to connect your application.
+- <a href="https://github.com/configcat/android-sdk" target="_blank">GitHub repository of the ConfigCat Android (Java) SDK.</a>
+
 ## C++
 
 - [Documentation](./cpp.mdx) on how to connect your application.
@@ -38,11 +43,6 @@ Check out our language specific<a href="https://app.configcat.com/sdkkey" target
 - [Documentation](./java.mdx) on how to connect your application.
 - <a href="https://github.com/configcat/java-sdk" target="_blank">GitHub repository of the ConfigCat Java SDK.</a>
 
-## Java (Android)
-
-- [Documentation](./android.mdx) on how to connect your application.
-- <a href="https://github.com/configcat/android-sdk" target="_blank">GitHub repository of the ConfigCat Android (Java) SDK.</a>
-
 ## JavaScript
 
 - [Documentation](./js.mdx) on how to connect your application.
diff --git a/website/sidebars.ts b/website/sidebars.ts
index cf620fef3..38bc8bf30 100644
--- a/website/sidebars.ts
+++ b/website/sidebars.ts
@@ -199,12 +199,12 @@ const sidebars: SidebarsConfig = {
       link: { type: 'doc', id: 'sdk-reference/overview' },
       items: [
         { type: 'doc', id: 'sdk-reference/dotnet', label: '.NET' },
+        { type: 'doc', id: 'sdk-reference/android', label: 'Android (Java)' },
         { type: 'doc', id: 'sdk-reference/cpp', label: 'C++' },
         { type: 'doc', id: 'sdk-reference/dart', label: 'Dart (Flutter)' },
         { type: 'doc', id: 'sdk-reference/elixir', label: 'Elixir' },
         { type: 'doc', id: 'sdk-reference/go', label: 'Go' },
         { type: 'doc', id: 'sdk-reference/java', label: 'Java' },
-        { type: 'doc', id: 'sdk-reference/android', label: 'Java (Android)' },
         { type: 'doc', id: 'sdk-reference/js', label: 'JavaScript' },
         { type: 'doc', id: 'sdk-reference/react', label: 'JavaScript (React)' },
         { type: 'doc', id: 'sdk-reference/js-ssr', label: 'JavaScript (SSR)' },
diff --git a/website/src/pages/index.js b/website/src/pages/index.js
index 16cfa0b83..7d09976b8 100644
--- a/website/src/pages/index.js
+++ b/website/src/pages/index.js
@@ -59,13 +59,13 @@ const features = [
     title: 'SDK references', // This list should be in alphabetical order
     description: <>Let's do some coding.</>,
     links: [
-      { url: 'sdk-reference/dotnet', title: '.NET, .NET Core, Xamarin' },
+      { url: 'sdk-reference/dotnet', title: '.NET' },
+      { url: 'sdk-reference/android', title: 'Android (Java)' },
       { url: 'sdk-reference/cpp', title: 'C++' },
       { url: 'sdk-reference/dart', title: 'Dart (Flutter)' },
       { url: 'sdk-reference/elixir', title: 'Elixir' },
       { url: 'sdk-reference/go', title: 'Go' },
       { url: 'sdk-reference/java', title: 'Java' },
-      { url: 'sdk-reference/android', title: 'Java (Android)' },
       { url: 'sdk-reference/js', title: 'JavaScript' },
       { url: 'sdk-reference/community/deno', title: 'JavaScript (Deno)' },
       { url: 'sdk-reference/community/vue', title: 'JavaScript (Vue.js)' },
diff --git a/website/versioned_docs/version-V1/integrations/bitbucket.mdx b/website/versioned_docs/version-V1/integrations/bitbucket.mdx
index ebfc35b38..b59e2b668 100644
--- a/website/versioned_docs/version-V1/integrations/bitbucket.mdx
+++ b/website/versioned_docs/version-V1/integrations/bitbucket.mdx
@@ -1,6 +1,6 @@
 ---
 id: bitbucket
-title: Bitbucket Pipe - Scan your code for unused feature flags
+title: Bitbucket - Scan your code for feature flag usages
 description: ConfigCat Bitbucket Pipe integration. This is a step-by-step guide on how to use the ConfigCat Bitbucket integration to eliminate tech debt in your project.
 ---
 
diff --git a/website/versioned_docs/version-V1/integrations/bitrise.mdx b/website/versioned_docs/version-V1/integrations/bitrise.mdx
index 4d56b2a3a..6010fab6a 100644
--- a/website/versioned_docs/version-V1/integrations/bitrise.mdx
+++ b/website/versioned_docs/version-V1/integrations/bitrise.mdx
@@ -1,6 +1,6 @@
 ---
 id: bitrise
-title: Bitrise Step
+title: Bitrise - Scan your code for feature flag usages
 description: ConfigCat Bitrise Step integration. This is a step-by-step guide on how to use the ConfigCat Bitrise integration to eliminate tech debt in your project.
 ---
 
diff --git a/website/versioned_docs/version-V1/integrations/circleci.mdx b/website/versioned_docs/version-V1/integrations/circleci.mdx
index 7dd819563..8be3e0b5f 100644
--- a/website/versioned_docs/version-V1/integrations/circleci.mdx
+++ b/website/versioned_docs/version-V1/integrations/circleci.mdx
@@ -1,6 +1,6 @@
 ---
 id: circleci
-title: CircleCI - Scan your code for unused feature flags
+title: CircleCI - Scan your code for feature flag usages
 description: ConfigCat CircleCI Orb. This is a step-by-step guide on how to use the ConfigCat CircleCI Orb to eliminate tech debt in your project.
 ---
 
diff --git a/website/versioned_docs/version-V1/integrations/github.mdx b/website/versioned_docs/version-V1/integrations/github.mdx
index 0cb49f411..72ac96543 100644
--- a/website/versioned_docs/version-V1/integrations/github.mdx
+++ b/website/versioned_docs/version-V1/integrations/github.mdx
@@ -1,6 +1,6 @@
 ---
 id: github
-title: GitHub Action - Scan your code for unused feature flags
+title: GitHub Action - Scan your code for feature flag usages
 description: ConfigCat GitHub Action. This is a step-by-step guide on how to use the ConfigCat GitHub Action to eliminate tech debt in your project.
 ---
 
diff --git a/website/versioned_docs/version-V1/sdk-reference/overview.mdx b/website/versioned_docs/version-V1/sdk-reference/overview.mdx
index 06ca45b24..c57c95d7e 100644
--- a/website/versioned_docs/version-V1/sdk-reference/overview.mdx
+++ b/website/versioned_docs/version-V1/sdk-reference/overview.mdx
@@ -8,11 +8,16 @@ The purpose of the SDKs is to download and cache feature flag values and to eval
 
 Check out our language specific<a href="https://app.configcat.com/sdkkey" target="_blank"> Getting Started Guide</a> on how to connect your applications.
 
-## .NET, .NET Core, Xamarin
+## .NET
 
 - [Documentation](./dotnet.mdx) on how to connect your application.
 - <a href="https://github.com/configcat/.net-sdk" target="_blank">GitHub repository of the ConfigCat .NET SDK.</a>
 
+## Android (Java)
+
+- [Documentation](./android.mdx) on how to connect your application.
+- <a href="https://github.com/configcat/android-sdk" target="_blank">GitHub repository of the ConfigCat Android (Java) SDK.</a>
+
 ## C++
 
 - [Documentation](./cpp.mdx) on how to connect your application.
@@ -38,11 +43,6 @@ Check out our language specific<a href="https://app.configcat.com/sdkkey" target
 - [Documentation](./java.mdx) on how to connect your application.
 - <a href="https://github.com/configcat/java-sdk" target="_blank">GitHub repository of the ConfigCat Java SDK.</a>
 
-## Java (Android)
-
-- [Documentation](./android.mdx) on how to connect your application.
-- <a href="https://github.com/configcat/android-sdk" target="_blank">GitHub repository of the ConfigCat Android (Java) SDK.</a>
-
 ## JavaScript
 
 - [Documentation](./js.mdx) on how to connect your application.
diff --git a/website/versioned_sidebars/version-V1-sidebars.json b/website/versioned_sidebars/version-V1-sidebars.json
index 4531d4db5..05318a3cc 100644
--- a/website/versioned_sidebars/version-V1-sidebars.json
+++ b/website/versioned_sidebars/version-V1-sidebars.json
@@ -285,6 +285,11 @@
           "id": "sdk-reference/dotnet",
           "label": ".NET"
         },
+        {
+          "type": "doc",
+          "id": "sdk-reference/android",
+          "label": "Android (Java)"
+        },
         {
           "type": "doc",
           "id": "sdk-reference/cpp",
@@ -310,11 +315,6 @@
           "id": "sdk-reference/java",
           "label": "Java"
         },
-        {
-          "type": "doc",
-          "id": "sdk-reference/android",
-          "label": "Java (Android)"
-        },
         {
           "type": "doc",
           "id": "sdk-reference/js",