diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 00095b3c..4ad9c861 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -75,6 +75,19 @@ jobs:
           path: |
             ${{ github.workspace }}/BinaryCache/ds2/Release/ds2.exe
 
+  bazel:
+    runs-on: ubuntu-latest
+    name: Bazel Build Check
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          path: ${{ github.workspace }}/SourceCache/ds2
+      - run: |
+          sudo apt-get update
+          sudo apt-get install -qq --no-install-recommends bison flex ninja-build 
+      - run: |
+          bazel build //...
+        working-directory: ${{ github.workspace }}/SourceCache/ds2
 
   mingw:
     needs: [windows_tools]
diff --git a/BUILD b/BUILD
index 71308e57..8856b85e 100644
--- a/BUILD
+++ b/BUILD
@@ -139,7 +139,7 @@ config_setting(
             "@platforms//os:macos": "darwin",
             "@platforms//os:windows": "windows",
         }) + " -I DebugServer2/Architecture/RegisterLayout.h -h -o $@ -f $<",
-        exec_tools = ["//Tools/RegsGen2:regsgen2"],
+        tools = ["//Tools/RegsGen2:regsgen2"],
     )
     for arch in ("ARM", "ARM64", "RISCV32", "RISCV64", "RISCV128", "X86", "X86_64")
 ]
@@ -156,7 +156,7 @@ config_setting(
             "@platforms//os:macos": "darwin",
             "@platforms//os:windows": "windows",
         }) + " -I DebugServer2/Architecture/{}/RegistersDescriptors.h -c -o $@ -f $<".format(arch),
-        exec_tools = ["//Tools/RegsGen2:regsgen2"],
+        tools = ["//Tools/RegsGen2:regsgen2"],
     )
     for arch in ("ARM", "ARM64", "RISCV32", "RISCV64", "RISCV128", "X86", "X86_64")
 ]
diff --git a/MODULE.bazel b/MODULE.bazel
new file mode 100644
index 00000000..7b07785e
--- /dev/null
+++ b/MODULE.bazel
@@ -0,0 +1,5 @@
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "rules_m4", version = "0.2.4")
+bazel_dep(name = "rules_bison", version = "0.3.1")
+bazel_dep(name = "rules_flex", version = "0.3.1")
+bazel_dep(name = "platforms", version = "0.0.11")
diff --git a/WORKSPACE b/WORKSPACE
deleted file mode 100644
index b228c13b..00000000
--- a/WORKSPACE
+++ /dev/null
@@ -1,54 +0,0 @@
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-http_archive(
-    name = "bazel_skylib",
-    sha256 = "f7be3474d42aae265405a592bb7da8e171919d74c16f082a5457840f06054728",
-    urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.2.1/bazel-skylib-1.2.1.tar.gz",
-        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.2.1/bazel-skylib-1.2.1.tar.gz",
-    ],
-)
-
-load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
-
-bazel_skylib_workspace()
-
-http_archive(
-    name = "rules_m4",
-    sha256 = "c67fa9891bb19e9e6c1050003ba648d35383b8cb3c9572f397ad24040fb7f0eb",
-    urls = ["https://github.com/jmillikin/rules_m4/releases/download/v0.2/rules_m4-v0.2.tar.xz"],
-)
-
-load("@rules_m4//m4:m4.bzl", "m4_register_toolchains")
-
-m4_register_toolchains()
-
-http_archive(
-    name = "rules_bison",
-    sha256 = "6ee9b396f450ca9753c3283944f9a6015b61227f8386893fb59d593455141481",
-    urls = ["https://github.com/jmillikin/rules_bison/releases/download/v0.2/rules_bison-v0.2.tar.xz"],
-)
-
-load("@rules_bison//bison:bison.bzl", "bison_register_toolchains")
-
-bison_register_toolchains()
-
-http_archive(
-    name = "rules_flex",
-    sha256 = "f1685512937c2e33a7ebc4d5c6cf38ed282c2ce3b7a9c7c0b542db7e5db59d52",
-    urls = ["https://github.com/jmillikin/rules_flex/releases/download/v0.2/rules_flex-v0.2.tar.xz"],
-)
-
-load("@rules_flex//flex:flex.bzl", "flex_register_toolchains")
-
-flex_register_toolchains()
-
-http_archive(
-    name = "platforms",
-    sha256 = "379113459b0feaf6bfbb584a91874c065078aa673222846ac765f86661c27407",
-    urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz",
-        "https://github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz",
-    ],
-)