diff --git a/.bazelrc b/.bazelrc
index afb376b4dd..eb1bf2035e 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -25,10 +25,6 @@ build --define DOCKER_REGISTRY=localhost:5000
 # https://github.com/bazelbuild/rules_docker/issues/842
 build --host_force_python=PY2
 
-# TODO: Remove the workaround flag after bumping Bazel to greater than 4.0.0
-# Workaround for this: https://github.com/bazelbuild/bazel/issues/12905
-build --features=-debug_prefix_map_pwd_is_dot
-
 # CI configurations
 build:ci --define DOCKER_REGISTRY=gcr.io/pipecd
 build:ci --remote_http_cache=https://storage.googleapis.com/pipecd-bazel-cache
diff --git a/.bazelversion b/.bazelversion
index fcdb2e109f..ee74734aa2 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-4.0.0
+4.1.0