diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
index 2025d90b..a0611f6c 100644
--- a/.github/workflows/test-application.yaml
+++ b/.github/workflows/test-application.yaml
@@ -70,6 +70,30 @@ jobs:
                       elasticsearch-package-constraint: '^7.0'
                       env: {}
 
+                    - php-version: '8.2'
+                      job-name-prefix: 'Allow to fail: '
+                      elasticsearch-version: '7.11.1'
+                      lint: true
+                      symfony-version: '^6.0'
+                      elasticsearch-package-constraint: '^7.0'
+                      env: {}
+
+                    - php-version: '8.3'
+                      job-name-prefix: 'Allow to fail: '
+                      elasticsearch-version: '7.11.1'
+                      lint: true
+                      symfony-version: '^6.0'
+                      elasticsearch-package-constraint: '^7.0'
+                      env: {}
+
+                    - php-version: '8.4'
+                      job-name-prefix: 'Allow to fail: '
+                      elasticsearch-version: '7.11.1'
+                      lint: true
+                      symfony-version: '^6.0'
+                      elasticsearch-package-constraint: '^7.0'
+                      env: {}
+
         services:
             elasticsearch:
                 image: docker.elastic.co/elasticsearch/elasticsearch:${{ matrix.elasticsearch-version }}
diff --git a/Command/AbstractManagerAwareCommand.php b/Command/AbstractManagerAwareCommand.php
index 577b93d8..cdc6070e 100644
--- a/Command/AbstractManagerAwareCommand.php
+++ b/Command/AbstractManagerAwareCommand.php
@@ -34,7 +34,7 @@ public function __construct(array $managers, $name = null)
     /**
      * {@inheritdoc}
      */
-    protected function configure()
+    protected function configure(): void
     {
         $this->addOption(
             'manager',
diff --git a/Command/CacheClearCommand.php b/Command/CacheClearCommand.php
index 5b43d58c..c1f65158 100644
--- a/Command/CacheClearCommand.php
+++ b/Command/CacheClearCommand.php
@@ -30,7 +30,7 @@ public function __construct(array $managers = [])
     /**
      * {@inheritdoc}
      */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -42,7 +42,7 @@ protected function configure()
     /**
      * {@inheritdoc}
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $io = new SymfonyStyle($input, $output);
         $this
diff --git a/Command/DocumentGenerateCommand.php b/Command/DocumentGenerateCommand.php
index a6604dd9..4de06815 100644
--- a/Command/DocumentGenerateCommand.php
+++ b/Command/DocumentGenerateCommand.php
@@ -78,7 +78,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -90,7 +90,7 @@ protected function configure()
     /**
      * {@inheritdoc}
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         if ($input->hasParameterOption(['--no-interaction', '-n'])) {
             throw $this->getException('No interaction mode is not allowed!');
diff --git a/Command/IndexCreateCommand.php b/Command/IndexCreateCommand.php
index 2a1975c3..68794093 100644
--- a/Command/IndexCreateCommand.php
+++ b/Command/IndexCreateCommand.php
@@ -39,7 +39,7 @@ public function __construct(IndexSuffixFinder $indexSuffixFinder, array $manager
     /**
      * {@inheritdoc}
      */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -66,7 +66,7 @@ protected function configure()
     /**
      * {@inheritdoc}
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output):int
     {
         $io = new SymfonyStyle($input, $output);
         $manager = $this->getManager($input->getOption('manager'));
diff --git a/Command/IndexDropCommand.php b/Command/IndexDropCommand.php
index 3d107d93..4738b449 100644
--- a/Command/IndexDropCommand.php
+++ b/Command/IndexDropCommand.php
@@ -26,7 +26,7 @@ class IndexDropCommand extends AbstractManagerAwareCommand
     /**
      * {@inheritdoc}
      */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -44,7 +44,7 @@ protected function configure()
     /**
      * {@inheritdoc}
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $io = new SymfonyStyle($input, $output);
         if ($input->getOption('force')) {
diff --git a/Command/IndexExportCommand.php b/Command/IndexExportCommand.php
index adcf523e..6baccc4a 100644
--- a/Command/IndexExportCommand.php
+++ b/Command/IndexExportCommand.php
@@ -40,7 +40,7 @@ public function __construct(ExportService $exportService, array $managers = [])
     /**
      * {@inheritdoc}
      */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -74,7 +74,7 @@ protected function configure()
     /**
      * {@inheritdoc}
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $io = new SymfonyStyle($input, $output);
         $manager = $this->getManager($input->getOption('manager'));
diff --git a/Command/IndexImportCommand.php b/Command/IndexImportCommand.php
index b88aa103..4bdcc225 100644
--- a/Command/IndexImportCommand.php
+++ b/Command/IndexImportCommand.php
@@ -40,7 +40,7 @@ public function __construct(ImportService $importService, array $managers = [])
     /**
      * {@inheritdoc}
      */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -70,7 +70,7 @@ protected function configure()
     /**
      * {@inheritdoc}
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $io = new SymfonyStyle($input, $output);
         $manager = $this->getManager($input->getOption('manager'));
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index f34a4e10..74c7d0cc 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -23,7 +23,7 @@ class Configuration implements ConfigurationInterface
     /**
      * {@inheritdoc}
      */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('ongr_elasticsearch');
 
diff --git a/README.md b/README.md
index 6f631d5f..b5fa3e1d 100644
--- a/README.md
+++ b/README.md
@@ -3,10 +3,10 @@
 This is a fork of the [ongr/elasticsearch-bundle](https://github.com/ongr-io/elasticsearchbundle).
 With some basic changes to support wider range of Symfony Versions.
 
-| Version   | Supported Elasticsearch Version | Supported Symfony Version      |
-|-----------|---------------------------------|--------------------------------|
-| `5.x`     | `^7.0, ^6.0, ^5.0`              | `^6.0, ^5.0, ^4.0, ^3.4, ^2.8` |
-| `1.x`     | `^1.0, ^2.0`                    | `^3.0, ^2.7`                   |
+| Version   | Supported Elasticsearch Version | Supported Symfony Version            |
+|-----------|---------------------------------|--------------------------------------|
+| `5.x`     | `^7.0, ^6.0, ^5.0`              | `^7.0, ^6.0, ^5.0, ^4.0, ^3.4, ^2.8` |
+| `1.x`     | `^1.0, ^2.0`                    | `^3.0, ^2.7`                         |
 
 ## Documentation
 
diff --git a/composer.json b/composer.json
index 0758ff6c..f81f1463 100644
--- a/composer.json
+++ b/composer.json
@@ -16,31 +16,31 @@
     ],
     "require": {
         "php": "^7.2|^8.0",
-        "symfony/framework-bundle": "^2.8|^3.0|^4|^5|^6",
-        "symfony/console": "^2.8|^3.0|^4|^5|^6",
-        "symfony/stopwatch": "^2.8|^3.0|^4|^5|^6",
-        "symfony/templating": "^2.8|^3.0|^4|^5|^6",
-        "symfony/asset": "^2.8|^3.0|^4|^5|^6",
+        "symfony/framework-bundle": "^2.8|^3.0|^4|^5|^6|^7",
+        "symfony/console": "^2.8|^3.0|^4|^5|^6|^7",
+        "symfony/stopwatch": "^2.8|^3.0|^4|^5|^6|^7",
+        "symfony/templating": "^2.8|^3.0|^4|^5|^6|^7",
+        "symfony/asset": "^2.8|^3.0|^4|^5|^6|^7",
         "doctrine/annotations": "^1.10",
         "doctrine/inflector": "^1.0 || ^2.0",
         "doctrine/cache": "~1.4",
-        "doctrine/collections": "~1.4",
+        "doctrine/collections": "^1.4|^2.0",
         "monolog/monolog": "^1.10 || ^2.0 || ^3.0",
         "handcraftedinthealps/elasticsearch-dsl": "^5.0.7.1|^6.2.0.1|^7.2.0.1",
-        "symfony/event-dispatcher": "^2.8|^3.0|^4|^5|^6"
+        "symfony/event-dispatcher": "^2.8|^3.0|^4|^5|^6|^7"
     },
     "require-dev": {
         "mikey179/vfsstream": "~1.4",
         "squizlabs/php_codesniffer": "^2.0|^3.0",
-        "symfony/browser-kit" : "^2.8|^3.4|^4|^5|^6",
-        "symfony/expression-language" : "^2.8|^3.4|^4|^5|^6",
-        "symfony/twig-bundle": "^2.8|^3.4|^4|^5|^6",
-        "symfony/serializer": "^2.8|^3.4|^4|^5|^6",
-        "symfony/yaml": "^2.8|^3.4|^4|^5|^6",
-        "symfony/phpunit-bridge": "^5.1|^6",
-        "symfony/dependency-injection": "^2.8|^3.4|^4|^5|^6",
-        "symfony/validator": "^2.8|^3.4|^4|^5|^6",
-        "symfony/options-resolver": "^2.8|^3.4|^4|^5|^6"
+        "symfony/browser-kit" : "^2.8|^3.4|^4|^5|^6|^7",
+        "symfony/expression-language" : "^2.8|^3.4|^4|^5|^6|^7",
+        "symfony/twig-bundle": "^2.8|^3.4|^4|^5|^6|^7",
+        "symfony/serializer": "^2.8|^3.4|^4|^5|^6|^7",
+        "symfony/yaml": "^2.8|^3.4|^4|^5|^6|^7",
+        "symfony/phpunit-bridge": "^5.1|^6|^7",
+        "symfony/dependency-injection": "^2.8|^3.4|^4|^5|^6|^7",
+        "symfony/validator": "^2.8|^3.4|^4|^5|^6|^7",
+        "symfony/options-resolver": "^2.8|^3.4|^4|^5|^6|^7"
     },
     "autoload": {
         "psr-4": { "ONGR\\ElasticsearchBundle\\": "" },