diff --git a/.bazelrc b/.bazelrc
index 5ed26fd4..c2648f97 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -1,3 +1,4 @@
+build --enable_platform_specific_config
 build:linux --cxxopt='-std=c++17'
 build:macos --cxxopt='-std=c++17' --features=-supports_dynamic_linker
 build:windows --cxxopt='/std:c++17'
diff --git a/.bazelversion b/.bazelversion
new file mode 100644
index 00000000..19b860c1
--- /dev/null
+++ b/.bazelversion
@@ -0,0 +1 @@
+6.4.0
diff --git a/WORKSPACE b/WORKSPACE
index 6fb49acb..4ab4b821 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,5 +1,39 @@
 workspace(name = "PyDP")
 
+# Google DP library and it's dependencies
+local_repository(
+    name = "com_google_differential_privacy",
+    path = "third_party/differential-privacy",
+)
+
+load("@com_google_differential_privacy//:differential_privacy_deps.bzl", "differential_privacy_deps")
+
+differential_privacy_deps()
+
+# Google DP library and it's dependencies
+local_repository(
+    name = "com_google_cc_differential_privacy",
+    path = "third_party/differential-privacy/cc",
+)
+
+load("@com_google_cc_differential_privacy//:cc_differential_privacy_deps.bzl", "cc_differential_privacy_deps")
+
+cc_differential_privacy_deps()
+
+# Skylib setup.
+load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
+
+bazel_skylib_workspace()
+
+# Protobuf transitive dependencies.
+load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+
+protobuf_deps()
+
+load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies")
+
+rules_foreign_cc_dependencies()
+
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
@@ -26,45 +60,3 @@ http_archive(
     sha256 = "778197e26c5fbeb07ac2a2c5ae405b30f6cb7ad1f5510ea6fdac03bded96cc6f",
     url = "https://github.com/bazelbuild/rules_python/releases/download/0.2.0/rules_python-0.2.0.tar.gz",
 )
-
-http_archive(
-    name = "com_google_protobuf",
-    sha256 = "7892a35d979304a404400a101c46ce90e85ec9e2a766a86041bb361f626247f5",
-    strip_prefix = "protobuf-3.16.0",
-    urls = [
-        "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v3.16.0.tar.gz",
-    ],
-)
-
-http_archive(
-    name = "zlib",
-    build_file = "@com_google_protobuf//:third_party/zlib.BUILD",
-    sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1",
-    strip_prefix = "zlib-1.2.11",
-    urls = [
-        "https://mirror.bazel.build/zlib.net/zlib-1.2.11.tar.gz",
-        "https://zlib.net/zlib-1.2.11.tar.gz",
-    ],
-)
-
-# Google DP library and it's dependencies
-local_repository(
-    name = "com_google_differential_privacy",
-    path = "third_party/differential-privacy",
-)
-
-load("@com_google_differential_privacy//:differential_privacy_deps.bzl", "differential_privacy_deps")
-
-differential_privacy_deps()
-
-
-# Google DP library and it's dependencies
-local_repository(
-    name = "com_google_cc_differential_privacy",
-    path = "third_party/differential-privacy/cc",
-)
-
-load("@com_google_cc_differential_privacy//:cc_differential_privacy_deps.bzl", "cc_differential_privacy_deps")
-
-cc_differential_privacy_deps()
-