diff --git a/Formula/charm-tools.rb b/Formula/charm-tools.rb
index 90a0f2d7b236f..c9db5635a076c 100644
--- a/Formula/charm-tools.rb
+++ b/Formula/charm-tools.rb
@@ -9,13 +9,14 @@ class CharmTools < Formula
   revision 3
 
   bottle do
-    sha256 cellar: :any,                 arm64_ventura:  "58da2e30e1b4a20ea0fd2b22c2cb912adf9959e0ce3b638e80efd6da7a44f397"
-    sha256 cellar: :any,                 arm64_monterey: "45beb21ce373fd233765a1eaba550c459d5d5202a05157262276a69ff51c1c4a"
-    sha256 cellar: :any,                 arm64_big_sur:  "c275ea5fafef3f62ba4585d72169abb26935b5947479f55264c676e06d17bb52"
-    sha256 cellar: :any,                 ventura:        "ee46fbf417842362e0ff9c037effc261a8b550a0b832dadb83e99e3f53a60774"
-    sha256 cellar: :any,                 monterey:       "73d16b91d6c72dcfda9267be0337a6805bf09d19ee814472a635f7e3410e5313"
-    sha256 cellar: :any,                 big_sur:        "7b9e0aef366a852998439645291d8bab02ef7608b41fe7600f935c046002aac7"
-    sha256 cellar: :any_skip_relocation, x86_64_linux:   "b1e25d9cb513bc595d657d8f6c72852c15a2756a1728fe057cd861a760fc7381"
+    rebuild 1
+    sha256 cellar: :any,                 arm64_ventura:  "100586aaad066f13aab903c934b6e5d10713c0db86ebc510cb82f5bd7fad7043"
+    sha256 cellar: :any,                 arm64_monterey: "f446d41d1dbbfae85293fd5de83977f5a58453b7487aada98cdea66f89fa52bf"
+    sha256 cellar: :any,                 arm64_big_sur:  "71f892a1e9876b37fcb00094418c6ef0b18f2990304c623abb03806303d476a1"
+    sha256 cellar: :any,                 ventura:        "d2b30271d21ec028249b7caf6cd783494eb8ef28aa9d2c88d151baf417f873ca"
+    sha256 cellar: :any,                 monterey:       "29f2543279ddca25bdba66bfec49e5e7910dab353d0ee669284f62bacced2378"
+    sha256 cellar: :any,                 big_sur:        "cca03328e197ecc9ea36af1eb008cfbae98629be428ba8c99d2582b0eaaff937"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:   "fe74f3e5f0a5a1b6cf2d8400b5ad640daf5f7ebd56799a1b2425adf214775699"
   end
 
   depends_on "pkg-config" => :build
@@ -25,6 +26,7 @@ class CharmTools < Formula
   depends_on "libyaml"
   depends_on "openssl@3"
   depends_on "python@3.11"
+  depends_on "pyyaml"
   depends_on "six"
 
   on_linux do
@@ -167,11 +169,6 @@ class CharmTools < Formula
     sha256 "f87ca4fcff7d2b0f81c6a748a77973d7af0f4d526f98f308477c3c436c74d528"
   end
 
-  resource "pyyaml" do
-    url "https://files.pythonhosted.org/packages/a0/a4/d63f2d7597e1a4b55aa3b4d6c5b029991d3b824b5bd331af8d4ab1ed687d/PyYAML-5.4.1.tar.gz"
-    sha256 "607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"
-  end
-
   resource "referencing" do
     url "https://files.pythonhosted.org/packages/20/93/45213b5b6e3eeab03e3f6eb82cc516a81fbf257586a25f9eb1d21af96e1b/referencing-0.29.1.tar.gz"
     sha256 "90cb53782d550ba28d2166ef3f55731f38397def8832baac5d45235f1995e35e"
@@ -247,6 +244,12 @@ class CharmTools < Formula
     sha256 "ebc15946aa78bd63458992fc81ec3b6f7b1e92d51c35e6de1c3804e73b799147"
   end
 
+  # Add cython 3+ patch for pyyaml
+  patch do
+    url "https://github.com/juju/charm-tools/commit/1a2009adff40067e555435ca58936509b9781764.patch?full_index=1"
+    sha256 "cb060c8a7825c1ada309b1b663744dfb5b22f6349f52043d04d751dae63c6871"
+  end
+
   def install
     # Ensure that the `openssl` crate picks up the intended library.
     ENV["OPENSSL_DIR"] = Formula["openssl@3"].opt_prefix