diff --git a/composer.json b/composer.json
index a0294d1..066356a 100644
--- a/composer.json
+++ b/composer.json
@@ -58,12 +58,13 @@
     "symfony/dependency-injection": "^3.4 || ^4.4 || ^5.0",
     "symfony/http-kernel": "^3.4 || ^4.4 || ^5.0",
     "symfony/framework-bundle": "^3.4 || ^4.4 || ^5.0",
+    "symfony/messenger": "^4.2 || ^4.4 || ^5.0",
     "prooph/event-store": "^7.0"
   },
   "require-dev": {
     "prooph/event-sourcing": "^5.0",
     "prooph/snapshot-store": "^1.0",
-    "prooph/pdo-event-store": "^1.0",
+    "prooph/pdo-event-store": "^1.12",
     "phpunit/phpunit": "^7 || ^8",
     "symfony/yaml" : "^3.4 || ^4.4 || ^5.0",
     "bookdown/bookdown": "1.x-dev as 1.0.0",
diff --git a/doc/projection_manager.md b/doc/projection_manager.md
index a20cf45..d3c0586 100644
--- a/doc/projection_manager.md
+++ b/doc/projection_manager.md
@@ -252,4 +252,139 @@ As with the tag the `read_model` is necessary only if the projection implements
 
 Since both ways will produce the same result, it is up to you which of them you choose. 
 
-## Running projections
+## Projection options
+
+If you run projection you would want to pass options to it. This can be done in two ways.
+
+### Central
+
+Scalar options can be added to projection defined directly at the `projection_manager`:
+
+```yaml
+# app/config/config.yml or (flex) config/packages/prooph_event_store.yaml
+prooph_event_store:
+    projection_managers:
+        acme_projection_manager:
+            event_store: 'prooph_event_store.pdo_mysql_event_store'
+            connection: 'pdo.connection'
+            projections:
+                todo_projection:
+                    read_model: 'proophessor.projection.read_model.todo' 
+                    projection: 'proophessor.projection.todo'
+                    options:
+                        cache_size: 1000
+                        sleep: 100000
+                        persist_block_size: 1000
+                        lock_timeout_ms: 1000
+                        trigger_pcntl_dispatch: false
+                        update_lock_threshold: 0
+```
+
+### Tagged service
+
+If you want more complex usage, you can define tagged service which implements `\Prooph\Bundle\EventStore\Projection\ProjectionOptions`. 
+It should be tagged as `prooph_event_store.projection_options` with `projection_name` attribute pointing to specific projection.
+
+```php
+<?php
+
+declare(strict_types=1);
+
+namespace Prooph\ProophessorDo\Projection\Options;
+
+use Prooph\Bundle\EventStore\Projection\ProjectionOptions;
+use Prooph\EventStore\Pdo\Projection\GapDetection;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+
+final class ToDoProjectionOptions implements ProjectionOptions
+{
+    private ParameterBag $parameterBag;
+
+    public function __construct(ParameterBag $parameterBag)
+    {
+        $this->parameterBag = $parameterBag;
+    }
+    
+    public function options(): array
+    {
+        return [
+            'cache_size' => $this->parameterBag->get('projection.cache_size'),
+            'sleep' => $this->parameterBag->get('projection.sleep'),
+            'persist_block_size' => $this->parameterBag->get('projection.persist_block_size'),
+            'lock_timeout_ms' => $this->parameterBag->get('projection.lock_timeout_ms'),
+            'trigger_pcntl_dispatch' => $this->parameterBag->get('projection.trigger_pcntl_dispatch'),
+            'update_lock_threshold' => $this->parameterBag->get('projection.update_lock_threshold'),
+            'gap_detection' => new GapDetection([0, 5, 5, 10, 15, 25, 40, 65, 105]),
+        ];
+    }
+}
+```
+
+```yaml
+services:
+    Prooph\ProophessorDo\Projection\Options\ToDoProjectionOptions:
+        tags:
+            - { name: prooph_event_store.projection_options, projection_name: todo_projection }
+```
+
+## Manage projections
+
+Running a projection
+```
+$ bin/console event-store:projection:run [options] [--] <projection-name>
+
+Arguments:
+  projection-name       The name of the Projection
+
+Options:
+    -o, --run-once        Loop the projection only once, then exit
+```
+
+Stopping a projection
+```
+$ bin/console event-store:projection:stop <projection-name>
+
+Arguments:
+  projection-name       The name of the Projection
+```
+
+Resetting a projection
+```
+$ bin/console event-store:projection:reset <projection-name>
+
+Arguments:
+  projection-name       The name of the Projection
+```
+
+Showing the current projection state
+```
+$ bin/console event-store:projection:state <projection-name>
+
+Arguments:
+  projection-name       The name of the Projection
+```
+
+Deleting a projection
+```
+$ bin/console event-store:projection:delete [options] [--] <projection-name>
+
+Arguments:
+  projection-name            The name of the Projection
+
+Options:
+  -w, --with-emitted-events  Delete with emitted events
+```
+
+Showing a list of all projection names. Can be filtered.
+```
+$ bin/console event-store:projection:names [options] [--] [<filter>]
+
+Arguments:
+  filter                 Filter by this string
+
+Options:
+  -r, --regex            Enable regex syntax for filter
+  -l, --limit=LIMIT      Limit the result set [default: 20]
+  -o, --offset=OFFSET    Offset for result set [default: 0]
+  -m, --manager=MANAGER  Manager for result set
+```
\ No newline at end of file
diff --git a/src/Command/AbstractProjectionCommand.php b/src/Command/AbstractProjectionCommand.php
index 67014a3..401f330 100644
--- a/src/Command/AbstractProjectionCommand.php
+++ b/src/Command/AbstractProjectionCommand.php
@@ -63,14 +63,21 @@ abstract class AbstractProjectionCommand extends Command
      */
     protected $projectionReadModelLocator;
 
+    /**
+     * @var ContainerInterface
+     */
+    protected $projectionOptionsLocator;
+
     public function __construct(
         ContainerInterface $projectionManagerForProjectionsLocator,
         ContainerInterface $projectionsLocator,
-        ContainerInterface $projectionReadModelLocator
+        ContainerInterface $projectionReadModelLocator,
+        ContainerInterface $projectionOptionsLocator
     ) {
         $this->projectionManagerForProjectionsLocator = $projectionManagerForProjectionsLocator;
         $this->projectionsLocator = $projectionsLocator;
         $this->projectionReadModelLocator = $projectionReadModelLocator;
+        $this->projectionOptionsLocator = $projectionOptionsLocator;
 
         parent::__construct();
     }
@@ -97,6 +104,7 @@ protected function initialize(InputInterface $input, OutputInterface $output): v
             throw new RuntimeException(\vsprintf('Projection "%s" not found', \is_array($this->projectionName) ? $this->projectionName : [$this->projectionName]));
         }
         $this->projection = $this->projectionsLocator->get($this->projectionName);
+        $projectionOptions = $this->projectionOptionsLocator->has($this->projectionName) ? $this->projectionOptionsLocator->get($this->projectionName)->options() : [];
 
         if ($this->projection instanceof ReadModelProjection) {
             if (! $this->projectionReadModelLocator->has($this->projectionName)) {
@@ -104,11 +112,11 @@ protected function initialize(InputInterface $input, OutputInterface $output): v
             }
             $this->readModel = $this->projectionReadModelLocator->get($this->projectionName);
 
-            $this->projector = $this->projectionManager->createReadModelProjection($this->projectionName, $this->readModel);
+            $this->projector = $this->projectionManager->createReadModelProjection($this->projectionName, $this->readModel, $projectionOptions);
         }
 
         if ($this->projection instanceof Projection) {
-            $this->projector = $this->projectionManager->createProjection($this->projectionName);
+            $this->projector = $this->projectionManager->createProjection($this->projectionName, $projectionOptions);
         }
 
         if (null === $this->projector) {
diff --git a/src/DependencyInjection/Compiler/ProjectionOptionsPass.php b/src/DependencyInjection/Compiler/ProjectionOptionsPass.php
new file mode 100644
index 0000000..e327122
--- /dev/null
+++ b/src/DependencyInjection/Compiler/ProjectionOptionsPass.php
@@ -0,0 +1,69 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Prooph\Bundle\EventStore\DependencyInjection\Compiler;
+
+use Prooph\Bundle\EventStore\DependencyInjection\ProophEventStoreExtension;
+use Prooph\Bundle\EventStore\Exception\RuntimeException;
+use Prooph\Bundle\EventStore\Projection\ProjectionOptions;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
+
+final class ProjectionOptionsPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container): void
+    {
+        if (! $container->hasDefinition('prooph_event_store.projection_options_locator')) {
+            return;
+        }
+
+        $projectionOptionsIds = \array_keys($container->findTaggedServiceIds(ProophEventStoreExtension::TAG_PROJECTION_OPTIONS));
+        $projectionOptionsLocator = [];
+
+        foreach ($projectionOptionsIds as $id) {
+            $definition = $container->getDefinition($id);
+
+            self::assertDefinitionIsAValidClass($id, $definition);
+
+            $tags = $definition->getTag(ProophEventStoreExtension::TAG_PROJECTION_OPTIONS);
+            foreach ($tags as $tag) {
+                if (! isset($tag['projection_name'])) {
+                    throw new RuntimeException(\sprintf(
+                        '"projection_name" attribute is missing from tag "%s" on service "%s"',
+                        ProophEventStoreExtension::TAG_PROJECTION_OPTIONS,
+                        $id
+                    ));
+                }
+
+                $projectionOptionsLocator[$tag['projection_name']] = new Reference($id);
+            }
+        }
+
+        $locator = $container->getDefinition('prooph_event_store.projection_options_locator');
+        $locator->replaceArgument(0, \array_merge($locator->getArgument(0), $projectionOptionsLocator));
+    }
+
+    /**
+     * @param string $serviceId The id of the service that is verified
+     * @param Definition $definition The Definition of the service that is verified
+     *
+     * @throws RuntimeException if the service does not implement ProjectionOptions.
+     */
+    private static function assertDefinitionIsAValidClass(string $serviceId, Definition $definition): void
+    {
+        /** @var object $definitionClass */
+        $definitionClass = $definition->getClass();
+        $reflection = new \ReflectionClass($definitionClass);
+
+        if (! $reflection->implementsInterface(ProjectionOptions::class)) {
+            throw new RuntimeException(\sprintf(
+                'Tagged service "%s" must implement "%s"',
+                $serviceId,
+                ProjectionOptions::class
+            ));
+        }
+    }
+}
diff --git a/src/DependencyInjection/Compiler/RegisterProjectionsPass.php b/src/DependencyInjection/Compiler/RegisterProjectionsPass.php
index ecc1804..646601e 100644
--- a/src/DependencyInjection/Compiler/RegisterProjectionsPass.php
+++ b/src/DependencyInjection/Compiler/RegisterProjectionsPass.php
@@ -80,7 +80,7 @@ private static function addServicesToLocator(
         array $serviceMap
     ): void {
         $definition = $container->getDefinition($locatorId);
-        $definition->replaceArgument(0, \array_merge($serviceMap, $definition->getArgument(0)));
+        $definition->replaceArgument(0, \array_merge($definition->getArgument(0), $serviceMap));
     }
 
     /**
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index 8f155eb..4c06a61 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -74,6 +74,13 @@ public function addProjectionManagerSection(ArrayNodeDefinition $node): void
                         ->then($removeFirstCharacter)
                     ->end()
                 ->end()
+                ->arrayNode('options')
+                    ->canBeUnset()
+                    ->addDefaultsIfNotSet()
+                    ->treatFalseLike([])
+                    ->treatNullLike([])
+                    ->ignoreExtraKeys(false)
+                ->end()
             ->end();
 
         $node
diff --git a/src/DependencyInjection/ProophEventStoreExtension.php b/src/DependencyInjection/ProophEventStoreExtension.php
index 62c2f99..8d7f5da 100644
--- a/src/DependencyInjection/ProophEventStoreExtension.php
+++ b/src/DependencyInjection/ProophEventStoreExtension.php
@@ -28,6 +28,7 @@
 final class ProophEventStoreExtension extends Extension
 {
     public const TAG_PROJECTION = 'prooph_event_store.projection';
+    public const TAG_PROJECTION_OPTIONS = 'prooph_event_store.projection_options';
 
     public function getNamespace(): string
     {
@@ -60,17 +61,20 @@ private static function loadProjectionManagers(array $config, ContainerBuilder $
         $projectionManagerForProjectionsLocator = [];
         $projectionsLocator = [];
         $readModelsLocator = [];
+        $projectionOptionsLocator = [];
 
         foreach ($config['projection_managers'] as $projectionManagerName => $projectionManagerConfig) {
             $projectionManagerId = "prooph_event_store.projection_manager.$projectionManagerName";
             self::defineProjectionManager($container, $projectionManagerId, $projectionManagerConfig);
 
-            [$projectionManagerForProjectionsLocator, $projectionsLocator, $readModelsLocator] = self::collectProjectionsForLocators(
+            [$projectionManagerForProjectionsLocator, $projectionsLocator, $readModelsLocator, $projectionOptionsLocator] = self::collectProjectionsForLocators(
+                $container,
                 $projectionManagerConfig['projections'],
                 $projectionManagerId,
                 $projectionManagerForProjectionsLocator,
                 $projectionsLocator,
-                $readModelsLocator
+                $readModelsLocator,
+                $projectionOptionsLocator
             );
 
             $projectionManagers[$projectionManagerName] = "prooph_event_store.$projectionManagerName";
@@ -83,6 +87,7 @@ private static function loadProjectionManagers(array $config, ContainerBuilder $
         self::defineServiceLocator($container, 'prooph_event_store.projection_manager_for_projections_locator', $projectionManagerForProjectionsLocator);
         self::defineServiceLocator($container, 'prooph_event_store.projection_read_models_locator', $readModelsLocator);
         self::defineServiceLocator($container, 'prooph_event_store.projections_locator', $projectionsLocator);
+        self::defineServiceLocator($container, 'prooph_event_store.projection_options_locator', $projectionOptionsLocator);
     }
 
     private static function defineProjectionManager(ContainerBuilder $container, string $serviceId, array $config): void
@@ -108,11 +113,13 @@ private static function defineServiceLocator(ContainerBuilder $container, string
     }
 
     private static function collectProjectionsForLocators(
+        ContainerBuilder $container,
         array $projections,
         string $projectionManagerId,
         array $projectionManagerForProjectionsLocator,
         array $projectionsLocator,
-        array $readModelsLocator
+        array $readModelsLocator,
+        array $projectionOptionsLocator
     ): array {
         foreach ($projections as $projectionName => $projectionConfig) {
             if (isset($projectionConfig['read_model'])) {
@@ -121,9 +128,22 @@ private static function collectProjectionsForLocators(
 
             $projectionsLocator[$projectionName] = new Reference($projectionConfig['projection']);
             $projectionManagerForProjectionsLocator[$projectionName] = new Reference($projectionManagerId);
+
+            $projectionOptionsId = \sprintf('prooph_event_store.projection_options.%s', $projectionName);
+            self::defineProjectionOptions($container, $projectionOptionsId, $projectionConfig['options']);
+            $projectionOptionsLocator[$projectionName] = new Reference($projectionOptionsId);
         }
 
-        return [$projectionManagerForProjectionsLocator, $projectionsLocator, $readModelsLocator];
+        return [$projectionManagerForProjectionsLocator, $projectionsLocator, $readModelsLocator, $projectionOptionsLocator];
+    }
+
+    private static function defineProjectionOptions(ContainerBuilder $container, string $serviceId, array $projectionOptions): void
+    {
+        $definition = new ChildDefinition('prooph_event_store.projection_options');
+        $definition->setFactory([new Reference('prooph_event_store.projection_options_factory'), 'createProjectionOptions']);
+        $definition->setArguments([$projectionOptions]);
+
+        $container->setDefinition($serviceId, $definition);
     }
 
     /**
diff --git a/src/Projection/Options/ProjectionOptions.php b/src/Projection/Options/ProjectionOptions.php
new file mode 100644
index 0000000..4cddd48
--- /dev/null
+++ b/src/Projection/Options/ProjectionOptions.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Prooph\Bundle\EventStore\Projection\Options;
+
+use Prooph\Bundle\EventStore\Projection\ProjectionOptions as ProjectionOptionsInterface;
+
+final class ProjectionOptions implements ProjectionOptionsInterface
+{
+    /**
+     * @var array
+     */
+    private $options;
+
+    public function __construct(array $options)
+    {
+        $this->options = $options;
+    }
+
+    public function options(): array
+    {
+        return $this->options;
+    }
+}
diff --git a/src/Projection/Options/ProjectionOptionsFactory.php b/src/Projection/Options/ProjectionOptionsFactory.php
new file mode 100644
index 0000000..1d115b9
--- /dev/null
+++ b/src/Projection/Options/ProjectionOptionsFactory.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Prooph\Bundle\EventStore\Projection\Options;
+
+final class ProjectionOptionsFactory
+{
+    public static function createProjectionOptions(array $options): ProjectionOptions
+    {
+        return new ProjectionOptions($options);
+    }
+}
diff --git a/src/Projection/ProjectionOptions.php b/src/Projection/ProjectionOptions.php
new file mode 100644
index 0000000..84958be
--- /dev/null
+++ b/src/Projection/ProjectionOptions.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Prooph\Bundle\EventStore\Projection;
+
+interface ProjectionOptions
+{
+    public function options(): array;
+}
diff --git a/src/ProophEventStoreBundle.php b/src/ProophEventStoreBundle.php
index f042922..ad80a71 100644
--- a/src/ProophEventStoreBundle.php
+++ b/src/ProophEventStoreBundle.php
@@ -15,6 +15,7 @@
 use Prooph\Bundle\EventStore\DependencyInjection\Compiler\MetadataEnricherPass;
 use Prooph\Bundle\EventStore\DependencyInjection\Compiler\PluginLocatorPass;
 use Prooph\Bundle\EventStore\DependencyInjection\Compiler\PluginsPass;
+use Prooph\Bundle\EventStore\DependencyInjection\Compiler\ProjectionOptionsPass;
 use Prooph\Bundle\EventStore\DependencyInjection\Compiler\RegisterProjectionsPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
@@ -28,6 +29,7 @@ public function build(ContainerBuilder $container): void
         $container->addCompilerPass(new MetadataEnricherPass());
         $container->addCompilerPass(new PluginsPass());
         $container->addCompilerPass(new RegisterProjectionsPass());
+        $container->addCompilerPass(new ProjectionOptionsPass());
         $container->addCompilerPass(new PluginLocatorPass());
         $container->addCompilerPass(new DeprecateFqcnProjectionsPass());
     }
diff --git a/src/Resources/config/event_store.xml b/src/Resources/config/event_store.xml
index 33c0d8b..827dbe3 100644
--- a/src/Resources/config/event_store.xml
+++ b/src/Resources/config/event_store.xml
@@ -20,6 +20,8 @@
             <factory service="prooph_event_store.projection_factory" method="createProjectionManager" />
         </service>
         <service id="prooph_event_store.projection_factory" class="Prooph\Bundle\EventStore\ProjectionManagerFactory"/>
+        <service id="prooph_event_store.projection_options" class="Prooph\Bundle\EventStore\Projection\Options\ProjectionOptions" abstract="true" public="true" />
+        <service id="prooph_event_store.projection_options_factory" class="Prooph\Bundle\EventStore\Projection\Options\ProjectionOptionsFactory"/>
         <service id="prooph_event_store.repository_definition" class="Prooph\EventSourcing\Aggregate\AggregateRepository" abstract="true" public="true">
             <factory service="prooph_event_store.repository_factory" method="create" />
         </service>
@@ -34,6 +36,7 @@
             <argument type="service" id="prooph_event_store.projection_manager_for_projections_locator" />
             <argument type="service" id="prooph_event_store.projections_locator" />
             <argument type="service" id="prooph_event_store.projection_read_models_locator" />
+            <argument type="service" id="prooph_event_store.projection_options_locator" />
         </service>
 
         <service id="Prooph\Bundle\EventStore\Command\ProjectionDeleteCommand"
diff --git a/test/Command/Fixture/Projection/Options/BlackHoleProjectionOptions.php b/test/Command/Fixture/Projection/Options/BlackHoleProjectionOptions.php
new file mode 100644
index 0000000..db9182e
--- /dev/null
+++ b/test/Command/Fixture/Projection/Options/BlackHoleProjectionOptions.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ProophTest\Bundle\EventStore\Command\Fixture\Projection\Options;
+
+use Prooph\Bundle\EventStore\Projection\ProjectionOptions;
+use Prooph\EventStore\Pdo\Projection\GapDetection;
+
+final class BlackHoleProjectionOptions implements ProjectionOptions
+{
+    public function options(): array
+    {
+        return [
+            'gap_detection' => new GapDetection([0, 5, 5, 10, 15, 25, 40, 65, 105]),
+        ];
+    }
+}
diff --git a/test/Command/Fixture/config/projections.yml b/test/Command/Fixture/config/projections.yml
index af529d7..eac952d 100644
--- a/test/Command/Fixture/config/projections.yml
+++ b/test/Command/Fixture/config/projections.yml
@@ -11,6 +11,8 @@ prooph_event_store:
                 black_hole_read_model_projection:
                     projection: ProophTest\Bundle\EventStore\Command\Fixture\Projection\BlackHoleReadModelProjection
                     read_model: ProophTest\Bundle\EventStore\Command\Fixture\Projection\BlackHoleReadModel
+                    options:
+                        sleep: 10
 
 services:
     Prooph\EventStore\InMemoryEventStore:
@@ -29,4 +31,8 @@ services:
         public: true
     test.prooph_event_store.projection.black_hole_read_model_projection:
         alias: ProophTest\Bundle\EventStore\Command\Fixture\Projection\BlackHoleReadModelProjection
-        public: true
\ No newline at end of file
+        public: true
+
+    ProophTest\Bundle\EventStore\Command\Fixture\Projection\Options\BlackHoleProjectionOptions:
+        tags:
+            - { name: prooph_event_store.projection_options, projection_name: black_hole_projection }
\ No newline at end of file
diff --git a/test/DependencyInjection/AbstractEventStoreExtensionTestCase.php b/test/DependencyInjection/AbstractEventStoreExtensionTestCase.php
index 0af7d75..9dafc0e 100644
--- a/test/DependencyInjection/AbstractEventStoreExtensionTestCase.php
+++ b/test/DependencyInjection/AbstractEventStoreExtensionTestCase.php
@@ -173,6 +173,7 @@ public function it_can_register_projections_centrally(): void
         $managerLocator = $container->get('test.prooph_event_store.projection_manager_for_projections_locator');
         $projectionsLocator = $container->get('test.prooph_event_store.projections_locator');
         $readModelLocator = $container->get('test.prooph_event_store.projection_read_models_locator');
+        $projectionOptionsLocator = $container->get('test.prooph_event_store.projection_options_locator');
 
         self::assertTrue(
             $managerLocator->has('todo_projection'),
@@ -186,6 +187,10 @@ public function it_can_register_projections_centrally(): void
             $readModelLocator->has('todo_projection'),
             'The read model for the todo_projection is not available through the dedicated service locator'
         );
+        self::assertTrue(
+            $projectionOptionsLocator->has('todo_projection'),
+            'The projection options for the todo_projection is not available through the dedicated service locator'
+        );
     }
 
     /** @test */
diff --git a/test/DependencyInjection/Compiler/ProjectionOptionsPassTest.php b/test/DependencyInjection/Compiler/ProjectionOptionsPassTest.php
new file mode 100644
index 0000000..f63e1ff
--- /dev/null
+++ b/test/DependencyInjection/Compiler/ProjectionOptionsPassTest.php
@@ -0,0 +1,100 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ProophTest\Bundle\EventStore\DependencyInjection\Compiler;
+
+use Prooph\Bundle\EventStore\DependencyInjection\Compiler\ProjectionOptionsPass;
+use Prooph\Bundle\EventStore\DependencyInjection\ProophEventStoreExtension;
+use Prooph\Bundle\EventStore\Exception\RuntimeException;
+use Prooph\Bundle\EventStore\Projection\ProjectionOptions;
+use ProophTest\Bundle\EventStore\DependencyInjection\Fixture\Projection\Options\BlackHoleProjectionOptions;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\ServiceLocator;
+
+final class ProjectionOptionsPassTest extends CompilerPassTestCase
+{
+    protected function registerCompilerPass(ContainerBuilder $container): void
+    {
+        $container->addCompilerPass(new ProjectionOptionsPass());
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->registerEmptyServiceLocator('prooph_event_store.projection_options_locator');
+    }
+
+    /** @test */
+    public function it_does_not_allow_inappropriate_classes(): void
+    {
+        $this->registerProjectionOptions(
+            'foo.projection_options',
+            ['projection_name' => 'foo'],
+            \stdClass::class
+        );
+
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage(\sprintf(
+            'Tagged service "foo.projection_options" must implement "%s"',
+            ProjectionOptions::class
+        ));
+
+        $this->compile();
+    }
+
+    /** @test */
+    public function it_does_not_allow_tags_without_projection_name(): void
+    {
+        $this->registerProjectionOptions(
+            'foo.projection_options',
+            [],
+            BlackHoleProjectionOptions::class
+        );
+
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage(
+            '"projection_name" attribute is missing from tag "prooph_event_store.projection_options" on service "foo.projection_options"'
+        );
+
+        $this->compile();
+    }
+
+    /** @test */
+    public function it_registers_tagged_projection_optionss()
+    {
+        $this->registerProjectionOptions(
+            'foo.projection_options',
+            ['projection_name' => 'foo'],
+            BlackHoleProjectionOptions::class
+        );
+
+        $this->compile();
+
+        $this->assertContainerBuilderHasServiceDefinitionWithArgument(
+            'prooph_event_store.projection_options_locator',
+            0,
+            ['foo' => new Reference('foo.projection_options')]
+        );
+    }
+
+    private function registerEmptyServiceLocator(string $serviceId): void
+    {
+        $this->container
+            ->setDefinition($serviceId, new Definition(ServiceLocator::class, [[]]))
+            ->addTag('container.service_locator');
+    }
+
+    private function registerProjectionOptions(
+        string $serviceId,
+        array $attributes,
+        string $class
+    ): void {
+        $definition = new Definition($class);
+        $definition->addTag(ProophEventStoreExtension::TAG_PROJECTION_OPTIONS, $attributes);
+        $this->setDefinition($serviceId, $definition);
+    }
+}
diff --git a/test/DependencyInjection/ConfigurationTest.php b/test/DependencyInjection/ConfigurationTest.php
index 38dfcd2..674b153 100644
--- a/test/DependencyInjection/ConfigurationTest.php
+++ b/test/DependencyInjection/ConfigurationTest.php
@@ -63,6 +63,7 @@ public function it_allows_to_prefix_services_with_an_at(string $configFile): voi
                         'todo_projection' => [
                             'read_model' => TodoReadModel::class,
                             'projection' => TodoProjection::class,
+                            'options' => [],
                         ],
                     ],
                     'event_streams_table' => 'event_streams',
diff --git a/test/DependencyInjection/Fixture/Projection/Options/BlackHoleProjectionOptions.php b/test/DependencyInjection/Fixture/Projection/Options/BlackHoleProjectionOptions.php
new file mode 100644
index 0000000..d3f3f32
--- /dev/null
+++ b/test/DependencyInjection/Fixture/Projection/Options/BlackHoleProjectionOptions.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ProophTest\Bundle\EventStore\DependencyInjection\Fixture\Projection\Options;
+
+use Prooph\Bundle\EventStore\Projection\ProjectionOptions;
+
+final class BlackHoleProjectionOptions implements ProjectionOptions
+{
+    public function options(): array
+    {
+        return [];
+    }
+}
diff --git a/test/DependencyInjection/Fixture/config/xml/projections.xml b/test/DependencyInjection/Fixture/config/xml/projections.xml
index 8b1fae7..4ddacc2 100644
--- a/test/DependencyInjection/Fixture/config/xml/projections.xml
+++ b/test/DependencyInjection/Fixture/config/xml/projections.xml
@@ -30,6 +30,7 @@
 
         <srv:service id="test.prooph_event_store.projection_manager_for_projections_locator" alias="prooph_event_store.projection_manager_for_projections_locator" public="true" />
         <srv:service id="test.prooph_event_store.projections_locator" alias="prooph_event_store.projections_locator" public="true" />
+        <srv:service id="test.prooph_event_store.projection_options_locator" alias="prooph_event_store.projection_options_locator" public="true" />
         <srv:service id="test.prooph_event_store.projection_read_models_locator" alias="prooph_event_store.projection_read_models_locator" public="true" />
     </srv:services>
 </srv:container>
diff --git a/test/DependencyInjection/Fixture/config/yml/projections.yml b/test/DependencyInjection/Fixture/config/yml/projections.yml
index 028fe8e..2424b68 100644
--- a/test/DependencyInjection/Fixture/config/yml/projections.yml
+++ b/test/DependencyInjection/Fixture/config/yml/projections.yml
@@ -26,6 +26,10 @@ services:
     alias: prooph_event_store.projections_locator
     public: true
 
+  test.prooph_event_store.projection_options_locator:
+    alias: prooph_event_store.projection_options_locator
+    public: true
+
   test.prooph_event_store.projection_read_models_locator:
     alias: prooph_event_store.projection_read_models_locator
     public: true