diff --git a/composer.json b/composer.json
index 5a2c10def..18453ab82 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpunit/phpunit": "^10.5.35",
         "rector/rector": "^1.2",
         "squizlabs/php_codesniffer": "^3.7",
-        "vimeo/psalm": "^5.13"
+        "vimeo/psalm": "^6"
     },
     "replace": {
         "mongodb/builder": "*"
diff --git a/psalm.xml.dist b/psalm.xml.dist
index 83d825d51..08eb020ac 100644
--- a/psalm.xml.dist
+++ b/psalm.xml.dist
@@ -17,12 +17,6 @@
         </ignoreFiles>
     </projectFiles>
 
-    <stubs>
-        <file name="stubs/BSON/Document.stub.php"/>
-        <file name="stubs/BSON/Iterator.stub.php"/>
-        <file name="stubs/BSON/PackedArray.stub.php"/>
-    </stubs>
-
     <issueHandlers>
         <!-- Class is meant to be Unserialized by the extension only -->
         <PropertyNotSetInConstructor>
diff --git a/stubs/BSON/Document.stub.php b/stubs/BSON/Document.stub.php
deleted file mode 100644
index b1b3c60fb..000000000
--- a/stubs/BSON/Document.stub.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace MongoDB\BSON;
-
-/**
- * This stub file is temporary and can be removed when using Psalm 5
- *
- * @template TValue
- * @template-implements \IteratorAggregate<string, TValue>
- */
-final class Document implements \IteratorAggregate, \Serializable
-{
-    private function __construct() {}
-
-    final static public function fromBSON(string $bson): Document {}
-
-    final static public function fromJSON(string $json): Document {}
-
-    /** @param array|object $value */
-    final static public function fromPHP($value): Document {}
-
-    /** @return TValue */
-    final public function get(string $key) {}
-
-    /** @return Iterator<string, TValue> */
-    final public function getIterator(): Iterator {}
-
-    final public function has(string $key): bool {}
-
-    /** @return array|object */
-    final public function toPHP(?array $typeMap = null) {}
-
-    final public function toCanonicalExtendedJSON(): string {}
-
-    final public function toRelaxedExtendedJSON(): string {}
-
-    final public function __toString(): string {}
-
-    final public static function __set_state(array $properties): Document {}
-
-    final public function serialize(): string {}
-
-    /** @param string $serialized */
-    final public function unserialize($serialized): void {}
-
-    final public function __unserialize(array $data): void {}
-
-    final public function __serialize(): array {}
-}
diff --git a/stubs/BSON/Iterator.stub.php b/stubs/BSON/Iterator.stub.php
deleted file mode 100644
index cc8f699e4..000000000
--- a/stubs/BSON/Iterator.stub.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace MongoDB\BSON;
-
-/**
- * This stub file is temporary and can be removed when using Psalm 5
- *
- * @psalm-template TKey of int|string
- * @psalm-template TValue
- * $psalm-implements \Iterator<TKey, TValue>
- */
-final class Iterator implements \Iterator
-{
-    final private function __construct() {}
-
-    /** @return TValue */
-    final public function current() {}
-
-    /** @return TKey */
-    final public function key() {}
-
-    final public function next(): void {}
-
-    final public function rewind(): void {}
-
-    final public function valid(): bool {}
-
-    final public function __wakeup(): void {}
-}
diff --git a/stubs/BSON/PackedArray.stub.php b/stubs/BSON/PackedArray.stub.php
deleted file mode 100644
index 231a55019..000000000
--- a/stubs/BSON/PackedArray.stub.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace MongoDB\BSON;
-
-/**
- * This stub file is temporary and can be removed when using Psalm 5
- *
- * @template TValue
- * @template-implements \IteratorAggregate<int, TValue>
- */
-final class PackedArray implements \IteratorAggregate, \Serializable
-{
-    private function __construct() {}
-
-    final static public function fromPHP(array $value): PackedArray {}
-
-    /** @return TValue */
-    final public function get(int $index) {}
-
-    /** @return Iterator<int, TValue> */
-    final public function getIterator(): Iterator {}
-
-    final public function has(int $index): bool {}
-
-    /** @return array|object */
-    final public function toPHP(?array $typeMap = null) {}
-
-    final public function __toString(): string {}
-
-    final public static function __set_state(array $properties): PackedArray {}
-
-    final public function serialize(): string {}
-
-    /** @param string $serialized */
-    final public function unserialize($serialized): void {}
-
-    final public function __unserialize(array $data): void {}
-
-    final public function __serialize(): array {}
-}