3 files changed, 5 insertions, 5 deletions
diff --git a/src/buildtool/execution_api/common/api_bundle.cpp b/src/buildtool/execution_api/common/api_bundle.cpp
index 85ab49f1..bbcaa3b5 100644
--- a/src/buildtool/execution_api/common/api_bundle.cpp
+++ b/src/buildtool/execution_api/common/api_bundle.cpp
@@ -25,7 +25,7 @@ ApiBundle::ApiBundle(
       remote{CreateRemote(remote_address)} {}
 
 auto ApiBundle::CreateRemote(std::optional<ServerAddress> const& address) const
-    -> gsl::not_null<std::shared_ptr<IExecutionApi>> {
+    -> gsl::not_null<IExecutionApi::Ptr> {
     if (address) {
         ExecutionConfiguration config;
         config.skip_cache_lookup = false;
diff --git a/src/buildtool/execution_api/common/api_bundle.hpp b/src/buildtool/execution_api/common/api_bundle.hpp
index 2f393dba..58a80677 100644
--- a/src/buildtool/execution_api/common/api_bundle.hpp
+++ b/src/buildtool/execution_api/common/api_bundle.hpp
@@ -33,10 +33,10 @@ struct ApiBundle final {
         std::optional<ServerAddress> const& remote_address);
 
     [[nodiscard]] auto CreateRemote(std::optional<ServerAddress> const& address)
-        const -> gsl::not_null<std::shared_ptr<IExecutionApi>>;
+        const -> gsl::not_null<IExecutionApi::Ptr>;
 
-    gsl::not_null<std::shared_ptr<IExecutionApi>> const local;
-    gsl::not_null<std::shared_ptr<IExecutionApi>> const remote;
+    gsl::not_null<IExecutionApi::Ptr> const local;
+    gsl::not_null<IExecutionApi::Ptr> const remote;
 };
 
 #endif  // INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_API_BUNDLE_HPP
diff --git a/src/buildtool/execution_api/common/execution_api.hpp b/src/buildtool/execution_api/common/execution_api.hpp
index 5b6743e3..72663c2e 100644
--- a/src/buildtool/execution_api/common/execution_api.hpp
+++ b/src/buildtool/execution_api/common/execution_api.hpp
@@ -34,7 +34,7 @@
 /// Can be used to create actions.
 class IExecutionApi {
   public:
-    using Ptr = std::unique_ptr<IExecutionApi>;
+    using Ptr = std::shared_ptr<IExecutionApi const>;
 
     IExecutionApi() = default;
     IExecutionApi(IExecutionApi const&) = delete;