diff --git a/.github/workflows/cmangos-tbc-ubuntu-build.yml b/.github/workflows/cmangos-tbc-ubuntu-build.yml
index e83dceaf6..591870671 100644
--- a/.github/workflows/cmangos-tbc-ubuntu-build.yml
+++ b/.github/workflows/cmangos-tbc-ubuntu-build.yml
@@ -36,13 +36,13 @@ jobs:
             COMPILER_CC: gcc
             COMPILER_PP: g++
             USE_PCH: ON
-            EXTRA_BUILD: "-DBUILD_LOGIN_SERVER=OFF -DBUILD_IKE3_BOTS=ON -DBUILD_AHBOT=ON"
+            EXTRA_BUILD: "-DBUILD_EXTRACTORS=ON -DBUILD_PLAYERBOTS=ON -DBUILD_AHBOT=ON -DBUILD_GIT_ID=ON -DBUILD_MODULES=ON -DBUILD_MODULE_ACHIEVEMENTS=ON -DBUILD_MODULE_DUALSPEC=ON -DBUILD_MODULE_HARDCORE=ON -DBUILD_MODULE_IMMERSIVE=ON -DBUILD_MODULE_TRANSMOG=ON -DBUILD_MODULE_BOOST=ON -DBUILD_MODULE_BARBER=ON"
 
           - os: ubuntu-20.04
             COMPILER_CC: clang
             COMPILER_PP: clang++
             USE_PCH: ON
-            EXTRA_BUILD: "-DBUILD_LOGIN_SERVER=OFF -DBUILD_IKE3_BOTS=ON -DBUILD_AHBOT=ON"
+            EXTRA_BUILD: "-DBUILD_EXTRACTORS=ON -DBUILD_PLAYERBOTS=ON -DBUILD_AHBOT=ON -DBUILD_GIT_ID=ON -DBUILD_MODULES=ON -DBUILD_MODULE_ACHIEVEMENTS=ON -DBUILD_MODULE_DUALSPEC=ON -DBUILD_MODULE_HARDCORE=ON -DBUILD_MODULE_IMMERSIVE=ON -DBUILD_MODULE_TRANSMOG=ON -DBUILD_MODULE_BOOST=ON -DBUILD_MODULE_BARBER=ON"
 
           #- os: ubuntu-20.04
           #  COMPILER_CC: clang
@@ -57,13 +57,6 @@ jobs:
           repository: ${{env.CORE_REPO_OWNER}}/mangos-${{env.CORE_EXPANSION}}
           ref: ${{env.CORE_BRANCH}}
           path: ${{env.REPO_DIR}}
-          
-      - name: Checkout Bots
-        uses: actions/checkout@v2
-        with:
-          ref: ${{env.BOTS_BRANCH}}
-          repository: ${{env.CORE_REPO_OWNER}}/mangosbot-bots
-          path: "${{env.REPO_DIR}}/src/modules/Bots"
 
       - name: Create Build Environment
         run: |