diff --git a/Makefile b/Makefile
index 738a45fd5e..822f1eafc4 100644
--- a/Makefile
+++ b/Makefile
@@ -116,6 +116,16 @@ postgres-v14: postgres-v14-configure \
 	+@echo "Compiling pageinspect v14"
 	$(MAKE) -C $(POSTGRES_INSTALL_DIR)/build/v14/contrib/pageinspect install
 
+.PHONY: pg_wait_sampling-v14
+pg_wait_sampling-v14: postgres-v14-configure
+	+@echo "Compiling pg_wait_sampling v14"
+	$(MAKE) -C $(POSTGRES_INSTALL_DIR)/build/v14/contrib/pg_wait_sampling install
+
+.PHONY: pg_stat_statements-v14
+pg_stat_statements-v14: postgres-v14-configure
+	+@echo "Compiling pg_stat_statements v14"
+	$(MAKE) -C $(POSTGRES_INSTALL_DIR)/build/v14/contrib/pg_stat_statements install
+
 .PHONY: postgres-v15
 postgres-v15: postgres-v15-configure \
 		  postgres-v15-headers # to prevent `make install` conflicts with neon's `postgres-headers`
diff --git a/control_plane/src/compute.rs b/control_plane/src/compute.rs
index 89994c5647..df5dd5b85c 100644
--- a/control_plane/src/compute.rs
+++ b/control_plane/src/compute.rs
@@ -321,7 +321,10 @@ impl PostgresNode {
             // uses only needed variables namely host, port, user, password.
             format!("postgresql://no_user:{password}@{host}:{port}")
         };
-        conf.append("shared_preload_libraries", "neon");
+        conf.append(
+            "shared_preload_libraries",
+            "neon, pg_stat_statements, pg_wait_sampling",
+        );
         conf.append_line("");
         conf.append("neon.pageserver_connstring", &pageserver_connstr);
         conf.append("neon.tenant_id", &self.tenant_id.to_string());