diff --git a/BuildBotLib/basemodule.py b/BuildBotLib/basemodule.py
index 2525de7..1deb064 100644
--- a/BuildBotLib/basemodule.py
+++ b/BuildBotLib/basemodule.py
@@ -11,7 +11,8 @@ class BaseModule:
 
     P_Windows = 'Windows'
     P_Linux = 'Linux'
-    P_Android = 'Android'
+    P_AndroidQt5 = 'AndroidQt5'
+    P_AndroidQt6 = 'AndroidQt6'
     P_Wasm = 'Wasm'
 
     def __init__(self, platform, pwd="."):
@@ -31,7 +32,7 @@ class BaseModule:
         return self.platform == BaseModule.P_Linux
 
     def isAndroid(self, step):
-        return self.platform == BaseModule.P_Android
+        return self.platform == BaseModule.P_AndroidQt5 or self.platform == BaseModule.P_AndroidQt6
 
     def isWasm(self, step):
         return self.platform == BaseModule.P_Wasm
diff --git a/BuildBotLib/docs.py b/BuildBotLib/docs.py
index 980b4c4..aed296b 100644
--- a/BuildBotLib/docs.py
+++ b/BuildBotLib/docs.py
@@ -14,7 +14,8 @@ class Docs(CMake):
         platformXcmd = {
             CMake.P_Linux: self.linuxXmakeCmd,
             CMake.P_Windows: self.windowsXmakeCmd,
-            CMake.P_Android: self.androidXmakeCmd,
+            CMake.P_AndroidQt5: self.androidXmakeCmd,
+            CMake.P_AndroidQt6: self.androidXmakeCmd,
             CMake.P_Wasm: self.wasmXmakeCmd,
         }
 
diff --git a/BuildBotLib/make.py b/BuildBotLib/make.py
index 2841765..e2b15fa 100644
--- a/BuildBotLib/make.py
+++ b/BuildBotLib/make.py
@@ -160,7 +160,8 @@ class Make(BaseModule):
             platformEnv = {
                 BaseModule.P_Linux: self.linuxXmakeEnv,
                 BaseModule.P_Windows: self.windowsXmakeEnv,
-                BaseModule.P_Android: self.androidXmakeEnv,
+                BaseModule.P_AndroidQt5: self.androidXmakeCmd,
+                BaseModule.P_AndroidQt6: self.androidXmakeCmd,
                 BaseModule.P_Wasm: self.wasmXmakeEnv,
 
             }
@@ -205,7 +206,8 @@ class Make(BaseModule):
         platformXcmd = {
             BaseModule.P_Linux: self.linuxXmakeCmd,
             BaseModule.P_Windows: self.windowsXmakeCmd,
-            BaseModule.P_Android: self.androidXmakeCmd,
+            BaseModule.P_AndroidQt5: self.androidXmakeCmd,
+            BaseModule.P_AndroidQt6: self.androidXmakeCmd,
             BaseModule.P_Wasm: self.wasmXmakeCmd,
 
         }
@@ -238,7 +240,7 @@ class Make(BaseModule):
                                   'release project',
                                   self.isRelease)]
 
-        if platform != BaseModule.P_Android:
+        if not self.isAndroid(''):
 
             res += [steps.DirectoryUpload(
                 workersrc=util.Interpolate('%(prop:repoFolder)s'),
diff --git a/master.cfg b/master.cfg
index cd4f792..48c114a 100644
--- a/master.cfg
+++ b/master.cfg
@@ -22,11 +22,12 @@ bot = BuildBot()
 
 qmakeLinux = QMake(BaseModule.P_Linux)
 qmakeWindows = QMake(BaseModule.P_Windows)
-qmakeAndroid = QMake(BaseModule.P_Android)
+qmakeAndroid = QMake(BaseModule.P_AndroidQt5)
 
 cmakeLinux = CMake(BaseModule.P_Linux)
 cmakeWindows = CMake(BaseModule.P_Windows)
-cmakeAndroid = CMake(BaseModule.P_Android)
+cmakeAndroidqt5 = CMake(BaseModule.P_AndroidQt5)
+cmakeAndroidqt6 = CMake(BaseModule.P_AndroidQt6)
 
 wasm = CMake(BaseModule.P_Wasm)
 docs = Docs(BaseModule.P_Linux)
@@ -39,8 +40,8 @@ bot.addBuilder("WindowsBuilder", qmakeWindows)
 bot.addBuilder("LinuxCMakeBuilder", cmakeLinux)
 bot.addBuilder("WindowsCMakeBuilder", cmakeWindows)
 
-bot.addBuilder("AndroidBuilder_qt5", cmakeAndroid)
-bot.addBuilder("AndroidBuilder_qt6", cmakeAndroid)
+bot.addBuilder("AndroidBuilder_qt5", cmakeAndroidqt5)
+bot.addBuilder("AndroidBuilder_qt6", cmakeAndroidqt6)
 
 bot.addBuilder("RepoGen", repoGen)