diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index aedd3bd..8880235 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,17 +7,20 @@ jobs:
     build:
         runs-on: ubuntu-latest
         strategy:
+            fail-fast: false
             matrix:
                 es_version:
-                    - { image: 'elasticsearch:6.8.13', lib: '^6.0', proto: http, endpoint: 'http://localhost:9200/' }
-                    - { image: 'elasticsearch:7.10.1', lib: '^7.0', proto: http, endpoint: 'http://localhost:9200/' }
-                    - { image: 'opensearchproject/opensearch:1.2.4', lib: '^7.0', proto: https, endpoint: 'https://admin:admin@localhost:9200/' }
+                    - { image: 'docker.elastic.co/elasticsearch/elasticsearch:6.8.13', lib: '^6.0', proto: http, endpoint: 'http://localhost:9200/' }
+                    - { image: 'docker.elastic.co/elasticsearch/elasticsearch:7.10.1', lib: '^7.0', proto: http, endpoint: 'http://localhost:9200/' }
+                    - { image: 'docker.elastic.co/elasticsearch/elasticsearch:8.10.4', lib: '^7.0', proto: https, endpoint: 'https://elastic:admin@localhost:9200/' }
+                    - { image: 'public.ecr.aws/opensearchproject/opensearch:1.2.4', lib: '^7.0', proto: https, endpoint: 'https://admin:admin@localhost:9200/' }
+                    - { image: 'public.ecr.aws/opensearchproject/opensearch:2.11.0', lib: '^7.0', proto: https, endpoint: 'https://admin:admin@localhost:9200/' }
 
                 php_version:
                     - '7.4'
                     - '8.0'
-                    # Currently disabled as proxy-manager for php8.1 is not released yet.
-                    # - '8.1'
+                    - '8.1'
+                    - '8.2'
 
         name: PHP ${{ matrix.php_version }} against ${{ matrix.es_version.image }}
         services:
@@ -27,9 +30,10 @@ jobs:
                     - '9200:9200'
                 options: >-
                     --env discovery.type=single-node
+                    --env ELASTIC_PASSWORD=admin
 
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4
             - name: Setup PHP with pecl extension
               uses: shivammathur/setup-php@v2
               with:
@@ -39,7 +43,7 @@ jobs:
             -   name: Get Composer Cache Directory
                 id: composer-cache
                 run: |
-                    echo "::set-output name=dir::$(composer config cache-files-dir)"
+                    echo "dir=$(composer config cache-files-dir)" >> "$GITHUB_OUTPUT"
 
             -   name: Cache dependencies installed with composer
                 uses: actions/cache@v1
@@ -53,7 +57,10 @@ jobs:
             - run: composer install
 
             - name: Waiting for ES server to become available
-              run: ./wait-for-it.sh -p ${{ matrix.es_version.proto }} localhost:9200
+              run: ./wait-for-it.sh -p ${{ matrix.es_version.proto }} localhost:9200 && sleep 30
+
+            - run: |
+                curl -X PUT "${{ matrix.es_version.endpoint }}_cluster/settings?pretty" -k -H 'Content-Type: application/json' -d'{"persistent" : {"action.destructive_requires_name" : false}}' || true
 
             - run: vendor/bin/phpunit --coverage-clover coverage.xml
               env:
diff --git a/composer.json b/composer.json
index 10145e2..938deee 100644
--- a/composer.json
+++ b/composer.json
@@ -37,8 +37,7 @@
         "psr/cache-implementation": "^1.0 || ^2.0 || ^3.0",
         "psr/log": "^1.0",
         "ruflin/elastica": "^5.0 || ^6.0 || ^7.0",
-        "symfony/polyfill-php80": "^1.0",
-        "thecodingmachine/safe": "^1.0 || ^2.0"
+        "symfony/polyfill-php80": "^1.0"
     },
     "require-dev": {
         "aws/aws-sdk-php": "^3.0",
diff --git a/src/Annotation/Analyzer.php b/src/Annotation/Analyzer.php
index e7b78b0..31f0e6d 100644
--- a/src/Annotation/Analyzer.php
+++ b/src/Annotation/Analyzer.php
@@ -12,7 +12,7 @@
 use function get_debug_type;
 use function is_array;
 use function is_string;
-use function Safe\sprintf;
+use function sprintf;
 
 /**
  * @Annotation
diff --git a/src/Annotation/DiscriminatorField.php b/src/Annotation/DiscriminatorField.php
index bc4cdcb..9b8ea3f 100644
--- a/src/Annotation/DiscriminatorField.php
+++ b/src/Annotation/DiscriminatorField.php
@@ -12,7 +12,7 @@
 use function get_debug_type;
 use function is_array;
 use function is_string;
-use function Safe\sprintf;
+use function sprintf;
 
 /**
  * @Annotation
diff --git a/src/Annotation/DiscriminatorMap.php b/src/Annotation/DiscriminatorMap.php
index bbee8a2..e9ec292 100644
--- a/src/Annotation/DiscriminatorMap.php
+++ b/src/Annotation/DiscriminatorMap.php
@@ -9,7 +9,7 @@
 use Doctrine\Common\Annotations\Annotation\Target;
 use Kcs\Metadata\Exception\InvalidMetadataException;
 
-use function Safe\sprintf;
+use function sprintf;
 
 /**
  * @Annotation
diff --git a/src/Annotation/Document.php b/src/Annotation/Document.php
index 3428d42..abb9aef 100644
--- a/src/Annotation/Document.php
+++ b/src/Annotation/Document.php
@@ -10,7 +10,7 @@
 use function get_debug_type;
 use function is_array;
 use function is_string;
-use function Safe\sprintf;
+use function sprintf;
 use function trigger_error;
 
 use const E_USER_DEPRECATED;
diff --git a/src/Annotation/DocumentId.php b/src/Annotation/DocumentId.php
index 2e041fe..a224ff7 100644
--- a/src/Annotation/DocumentId.php
+++ b/src/Annotation/DocumentId.php
@@ -10,7 +10,7 @@
 use function get_debug_type;
 use function is_array;
 use function is_string;
-use function Safe\sprintf;
+use function sprintf;
 
 /**
  * @Annotation
diff --git a/src/Annotation/Field.php b/src/Annotation/Field.php
index 90be3f2..ce80aad 100644
--- a/src/Annotation/Field.php
+++ b/src/Annotation/Field.php
@@ -11,7 +11,7 @@
 use function get_debug_type;
 use function is_array;
 use function is_string;
-use function Safe\sprintf;
+use function sprintf;
 
 /**
  * @Annotation
diff --git a/src/Annotation/Filter.php b/src/Annotation/Filter.php
index 3c3673c..ea75261 100644
--- a/src/Annotation/Filter.php
+++ b/src/Annotation/Filter.php
@@ -12,7 +12,7 @@
 use function get_debug_type;
 use function is_array;
 use function is_string;
-use function Safe\sprintf;
+use function sprintf;
 
 /**
  * @Annotation
diff --git a/src/Annotation/InheritanceType.php b/src/Annotation/InheritanceType.php
index d050ea2..47e46db 100644
--- a/src/Annotation/InheritanceType.php
+++ b/src/Annotation/InheritanceType.php
@@ -12,7 +12,7 @@
 use function get_debug_type;
 use function is_array;
 use function is_string;
-use function Safe\sprintf;
+use function sprintf;
 
 /**
  * @Annotation
diff --git a/src/Annotation/JoinField.php b/src/Annotation/JoinField.php
index 3b24599..872fc08 100644
--- a/src/Annotation/JoinField.php
+++ b/src/Annotation/JoinField.php
@@ -12,7 +12,7 @@
 use function get_debug_type;
 use function is_array;
 use function is_string;
-use function Safe\sprintf;
+use function sprintf;
 
 /**
  * @Annotation
diff --git a/src/Annotation/Setting.php b/src/Annotation/Setting.php
index 585e731..4ff3156 100644
--- a/src/Annotation/Setting.php
+++ b/src/Annotation/Setting.php
@@ -13,7 +13,7 @@
 use function in_array;
 use function is_array;
 use function is_string;
-use function Safe\sprintf;
+use function sprintf;
 
 /**
  * @Annotation
diff --git a/src/Annotation/Tokenizer.php b/src/Annotation/Tokenizer.php
index 0b1293a..3bba408 100644
--- a/src/Annotation/Tokenizer.php
+++ b/src/Annotation/Tokenizer.php
@@ -11,7 +11,7 @@
 use function get_debug_type;
 use function is_array;
 use function is_string;
-use function Safe\sprintf;
+use function sprintf;
 
 /**
  * @Annotation
diff --git a/src/Annotation/Version.php b/src/Annotation/Version.php
index ba3307b..a0ffee3 100644
--- a/src/Annotation/Version.php
+++ b/src/Annotation/Version.php
@@ -11,7 +11,7 @@
 use function get_debug_type;
 use function is_array;
 use function is_string;
-use function Safe\sprintf;
+use function sprintf;
 
 /**
  * @Annotation
diff --git a/src/Collection/Collection.php b/src/Collection/Collection.php
index 65f312b..12d461a 100644
--- a/src/Collection/Collection.php
+++ b/src/Collection/Collection.php
@@ -35,7 +35,7 @@
 use function implode;
 use function in_array;
 use function is_array;
-use function Safe\preg_match;
+use function preg_match;
 use function strlen;
 
 class Collection implements CollectionInterface
diff --git a/src/Command/UpdateSchemaCommand.php b/src/Command/UpdateSchemaCommand.php
index 668fd2e..3d06fec 100644
--- a/src/Command/UpdateSchemaCommand.php
+++ b/src/Command/UpdateSchemaCommand.php
@@ -13,7 +13,7 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
-use function Safe\preg_match;
+use function preg_match;
 
 class UpdateSchemaCommand extends Command
 {
diff --git a/src/Exception/BadResponseException.php b/src/Exception/BadResponseException.php
index 166f7a0..528830e 100644
--- a/src/Exception/BadResponseException.php
+++ b/src/Exception/BadResponseException.php
@@ -9,7 +9,7 @@
 
 use function is_string;
 use function json_encode;
-use function Safe\sprintf;
+use function sprintf;
 
 use const JSON_THROW_ON_ERROR;
 
diff --git a/src/Exception/CannotDropAnAliasException.php b/src/Exception/CannotDropAnAliasException.php
index e819401..70272cb 100644
--- a/src/Exception/CannotDropAnAliasException.php
+++ b/src/Exception/CannotDropAnAliasException.php
@@ -7,7 +7,7 @@
 use Elastica\Response;
 use Throwable;
 
-use function Safe\sprintf;
+use function sprintf;
 
 class CannotDropAnAliasException extends ResponseException
 {
diff --git a/src/Exception/DocumentNotManagedException.php b/src/Exception/DocumentNotManagedException.php
index a0d0b37..ae6c6ed 100644
--- a/src/Exception/DocumentNotManagedException.php
+++ b/src/Exception/DocumentNotManagedException.php
@@ -6,7 +6,7 @@
 
 use Throwable;
 
-use function Safe\sprintf;
+use function sprintf;
 
 class DocumentNotManagedException extends InvalidArgumentException
 {
diff --git a/src/Exception/ReadOnlyRequiresManagedDocumentException.php b/src/Exception/ReadOnlyRequiresManagedDocumentException.php
index adf1297..b4a9963 100644
--- a/src/Exception/ReadOnlyRequiresManagedDocumentException.php
+++ b/src/Exception/ReadOnlyRequiresManagedDocumentException.php
@@ -6,7 +6,7 @@
 
 use Throwable;
 
-use function Safe\sprintf;
+use function sprintf;
 
 class ReadOnlyRequiresManagedDocumentException extends InvalidArgumentException
 {
diff --git a/src/Exception/UnexpectedDocumentStateException.php b/src/Exception/UnexpectedDocumentStateException.php
index d6600eb..ff8584d 100644
--- a/src/Exception/UnexpectedDocumentStateException.php
+++ b/src/Exception/UnexpectedDocumentStateException.php
@@ -7,7 +7,7 @@
 use Refugis\ODM\Elastica\UnitOfWork;
 use Throwable;
 
-use function Safe\sprintf;
+use function sprintf;
 
 class UnexpectedDocumentStateException extends InvalidArgumentException
 {
diff --git a/src/Geotools/Coordinate/Coordinate.php b/src/Geotools/Coordinate/Coordinate.php
index e3736f1..a430c89 100644
--- a/src/Geotools/Coordinate/Coordinate.php
+++ b/src/Geotools/Coordinate/Coordinate.php
@@ -12,7 +12,7 @@
 use function is_string;
 use function max;
 use function min;
-use function Safe\preg_match;
+use function preg_match;
 use function strtoupper;
 
 class Coordinate implements CoordinateInterface
diff --git a/src/Hydrator/ObjectHydrator.php b/src/Hydrator/ObjectHydrator.php
index 94a2dd7..b14cfc5 100644
--- a/src/Hydrator/ObjectHydrator.php
+++ b/src/Hydrator/ObjectHydrator.php
@@ -17,7 +17,7 @@
 use function array_keys;
 use function array_map;
 use function assert;
-use function Safe\sort;
+use function sort;
 
 class ObjectHydrator implements HydratorInterface
 {
diff --git a/src/Internal/DocumentGraph.php b/src/Internal/DocumentGraph.php
index 50992a9..bdef189 100644
--- a/src/Internal/DocumentGraph.php
+++ b/src/Internal/DocumentGraph.php
@@ -8,7 +8,7 @@
 use IteratorAggregate;
 
 use function iterator_to_array;
-use function Safe\uasort;
+use function uasort;
 
 /**
  * Represents a document dependency graph.
diff --git a/src/Metadata/DocumentMetadata.php b/src/Metadata/DocumentMetadata.php
index 796fc33..6675149 100644
--- a/src/Metadata/DocumentMetadata.php
+++ b/src/Metadata/DocumentMetadata.php
@@ -18,8 +18,8 @@
 use function array_merge;
 use function array_unique;
 use function reset;
-use function Safe\sort;
-use function Safe\sprintf;
+use function sort;
+use function sprintf;
 
 /**
  * @template T of object
diff --git a/src/Metadata/Loader/AnnotationLoaderTrait.php b/src/Metadata/Loader/AnnotationLoaderTrait.php
index ee46a40..1a15275 100644
--- a/src/Metadata/Loader/AnnotationLoaderTrait.php
+++ b/src/Metadata/Loader/AnnotationLoaderTrait.php
@@ -16,7 +16,7 @@
 use TypeError;
 
 use function get_debug_type;
-use function Safe\sprintf;
+use function sprintf;
 
 trait AnnotationLoaderTrait
 {
diff --git a/src/Metadata/MetadataFactory.php b/src/Metadata/MetadataFactory.php
index 7b3f037..c88a424 100644
--- a/src/Metadata/MetadataFactory.php
+++ b/src/Metadata/MetadataFactory.php
@@ -21,8 +21,8 @@
 use function get_parent_class;
 use function is_array;
 use function method_exists;
-use function Safe\preg_replace;
-use function Safe\sprintf;
+use function preg_replace;
+use function sprintf;
 use function str_replace;
 
 class MetadataFactory extends AbstractMetadataFactory implements ClassMetadataFactory
diff --git a/src/Metadata/Processor/DocumentProcessor.php b/src/Metadata/Processor/DocumentProcessor.php
index 4a0b1e5..55f8de2 100644
--- a/src/Metadata/Processor/DocumentProcessor.php
+++ b/src/Metadata/Processor/DocumentProcessor.php
@@ -15,7 +15,7 @@
 
 use function class_exists;
 use function explode;
-use function Safe\sprintf;
+use function sprintf;
 use function str_contains;
 use function strpos;
 use function trigger_error;
diff --git a/src/Metadata/Processor/InheritanceTypeProcessor.php b/src/Metadata/Processor/InheritanceTypeProcessor.php
index 975c126..e25aeed 100644
--- a/src/Metadata/Processor/InheritanceTypeProcessor.php
+++ b/src/Metadata/Processor/InheritanceTypeProcessor.php
@@ -12,7 +12,7 @@
 use Refugis\ODM\Elastica\Annotation\InheritanceType;
 use Refugis\ODM\Elastica\Metadata\DocumentMetadata;
 
-use function Safe\sprintf;
+use function sprintf;
 
 /** @Processor(annotation=InheritanceType::class) */
 class InheritanceTypeProcessor implements ProcessorInterface
diff --git a/src/Persister/DocumentPersister.php b/src/Persister/DocumentPersister.php
index 507a8de..1eb0e0d 100644
--- a/src/Persister/DocumentPersister.php
+++ b/src/Persister/DocumentPersister.php
@@ -34,7 +34,7 @@
 use function count;
 use function implode;
 use function is_array;
-use function Safe\sprintf;
+use function sprintf;
 use function str_replace;
 
 /** @template T of object */
diff --git a/src/Tools/MappingGenerator.php b/src/Tools/MappingGenerator.php
index e6cb9ca..46f3ac1 100644
--- a/src/Tools/MappingGenerator.php
+++ b/src/Tools/MappingGenerator.php
@@ -17,7 +17,7 @@
 use function assert;
 use function class_exists;
 use function is_array;
-use function Safe\sprintf;
+use function sprintf;
 
 final class MappingGenerator
 {
diff --git a/src/Tools/Schema/Schema.php b/src/Tools/Schema/Schema.php
index aa87aa2..c3e5011 100644
--- a/src/Tools/Schema/Schema.php
+++ b/src/Tools/Schema/Schema.php
@@ -6,10 +6,10 @@
 
 use Refugis\ODM\Elastica\Exception\RuntimeException;
 
-use function Safe\sprintf;
+use function sprintf;
 
 /**
- * Holds the informations about the schema of collections.
+ * Holds information about the schema of collections.
  */
 class Schema
 {
diff --git a/src/Type/AbstractDateTimeType.php b/src/Type/AbstractDateTimeType.php
index 184d1f7..c10faf7 100644
--- a/src/Type/AbstractDateTimeType.php
+++ b/src/Type/AbstractDateTimeType.php
@@ -10,10 +10,10 @@
 use Refugis\ODM\Elastica\Exception\ConversionFailedException;
 
 use function assert;
+use function preg_match;
 use function preg_replace_callback;
-use function Safe\preg_match;
-use function Safe\sprintf;
-use function Safe\substr;
+use function sprintf;
+use function substr;
 
 abstract class AbstractDateTimeType extends AbstractType
 {
diff --git a/src/Type/AbstractDoctrineType.php b/src/Type/AbstractDoctrineType.php
index dc77869..4aaac30 100644
--- a/src/Type/AbstractDoctrineType.php
+++ b/src/Type/AbstractDoctrineType.php
@@ -9,7 +9,7 @@
 
 use function array_values;
 use function count;
-use function Safe\sprintf;
+use function sprintf;
 
 abstract class AbstractDoctrineType extends AbstractType
 {
diff --git a/src/Type/BinaryType.php b/src/Type/BinaryType.php
index 2a7ce4f..121f4f8 100644
--- a/src/Type/BinaryType.php
+++ b/src/Type/BinaryType.php
@@ -4,8 +4,8 @@
 
 namespace Refugis\ODM\Elastica\Type;
 
+use function base64_decode;
 use function base64_encode;
-use function Safe\base64_decode;
 
 final class BinaryType extends AbstractType
 {