diff --git a/repos/spack_repo/builtin/packages/yamlfmt/package.py b/repos/spack_repo/builtin/packages/yamlfmt/package.py
new file mode 100644
index 00000000000..b4af5cfb90f
--- /dev/null
+++ b/repos/spack_repo/builtin/packages/yamlfmt/package.py
@@ -0,0 +1,36 @@
+# Copyright Spack Project Developers. See COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+from spack_repo.builtin.build_systems.go import GoPackage
+
+from spack.package import *
+
+
+class Yamlfmt(GoPackage):
+    """yamlfmt is an extensible command line tool or library to format yaml files."""
+
+    homepage = "https://github.com/google/yamlfmt"
+    url = "https://github.com/google/yamlfmt/archive/refs/tags/v0.20.0.tar.gz"
+
+    maintainers("ebagrenrut")
+
+    license("Apache-2.0")
+
+    version("0.21.0", sha256="9ec915d70e527a94171eaaf6b785d1423222b5b82e7633f80dcc6b66e6a655aa")
+    version("0.20.0", sha256="de6bc4373ba46c520d936dd4b60395868ec17aba338b9fd849594c1f41b6c057")
+
+    depends_on("go@1.22:", type="build", when="@0.21:")
+    depends_on("go@1.21:", type="build")
+
+    @property
+    def build_args(self):
+        return [
+            "-p",
+            str(make_jobs),
+            "-modcacherw",
+            "-ldflags",
+            f"-s -w -X main.version={self.version}",
+            "-o",
+            f"{self.name}",
+            f"{join_path(self.build_directory, 'cmd', self.name)}",
+        ]