diff --git a/.travis.yml b/.travis.yml
index 4c6c24e54..8e62e69a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,8 @@ matrix:
       env: SYMFONY_VERSION=3.0.* UNIT_TESTS=true
     - php: 7.0
       env: SYMFONY_VERSION=3.0.* UNIT_TESTS=true
+    - php: 7.1
+      env: SYMFONY_VERSION=v4.0.0-BETA4 UNIT_TESTS=true
     - php: 7.1
       services: docker
       env: SYMFONY_VERSION=2.8.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
@@ -31,6 +33,9 @@ matrix:
     - php: 7.1
       services: docker
       env: SYMFONY_VERSION=3.3.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
+    - php: 7.1
+      services: docker
+      env: SYMFONY_VERSION=v4.0.0-BETA4 FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
     - php: 7.1
       services: docker
       env: SYMFONY_VERSION=3.3.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true
diff --git a/composer.json b/composer.json
index d5fb0cfef..d92658557 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "enqueue/enqueue-dev",
   "type": "project",
-  "minimum-stability": "stable",
+  "minimum-stability": "beta",
   "homepage": "https://github.com/php-enqueue/enqueue-dev",
   "require": {
     "php": ">=5.6",
@@ -34,13 +34,14 @@
     "phpunit/phpunit": "^5",
     "doctrine/doctrine-bundle": "~1.2",
     "predis/predis": "^1.1",
-    "symfony/monolog-bundle": "^2.8|^3",
-    "symfony/browser-kit": "^2.8|^3",
-    "symfony/expression-language": "^2.8|^3",
-    "symfony/event-dispatcher": "^2.8|^3",
-    "symfony/console": "^2.8|^3",
+    "symfony/monolog-bundle": "^2.8|^3|^4",
+    "symfony/browser-kit": "^2.8|^3|^4",
+    "symfony/expression-language": "^2.8|^3|^4",
+    "symfony/event-dispatcher": "^2.8|^3|^4",
+    "symfony/console": "^2.8|^3|^4",
     "friendsofphp/php-cs-fixer": "^2",
-    "empi89/php-amqp-stubs": "*@dev"
+    "empi89/php-amqp-stubs": "*@dev",
+    "php-http/client-common": "^1.7@dev"
   },
   "autoload": {
     "files": [
diff --git a/docker-compose.yml b/docker-compose.yml
index 1673b5775..cf4c3cb2c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,23 +19,23 @@ services:
       - AMQP_DSN=amqp://guest:guest@rabbitmq:5672/mqdev
       - AMQPS_DSN=amqps://guest:guest@rabbitmqssl:5671
       - DOCTINE_DSN=mysql://root:rootpass@mysql/mqdev
-      - SYMFONY__RABBITMQ__HOST=rabbitmq
-      - SYMFONY__RABBITMQ__USER=guest
-      - SYMFONY__RABBITMQ__PASSWORD=guest
-      - SYMFONY__RABBITMQ__VHOST=mqdev
-      - SYMFONY__RABBITMQ__AMQP__PORT=5672
-      - SYMFONY__RABBITMQ__STOMP__PORT=61613
-      - SYMFONY__DB__DRIVER=pdo_mysql
-      - SYMFONY__DB__HOST=mysql
-      - SYMFONY__DB__PORT=3306
-      - SYMFONY__DB__NAME=mqdev
-      - SYMFONY__DB__USER=root
-      - SYMFONY__DB__PASSWORD=rootpass
-      - SYMFONY__REDIS__HOST=redis
-      - SYMFONY__REDIS__PORT=6379
-      - AWS__SQS__KEY=$ENQUEUE_AWS__SQS__KEY
-      - AWS__SQS__SECRET=$ENQUEUE_AWS__SQS__SECRET
-      - AWS__SQS__REGION=$ENQUEUE_AWS__SQS__REGION
+      - RABBITMQ_HOST=rabbitmq
+      - RABBITMQ_USER=guest
+      - RABBITMQ_PASSWORD=guest
+      - RABBITMQ_VHOST=mqdev
+      - RABBITMQ_AMQP__PORT=5672
+      - RABBITMQ_STOMP_PORT=61613
+      - DOCTRINE_DRIVER=pdo_mysql
+      - DOCTRINE_HOST=mysql
+      - DOCTRINE_PORT=3306
+      - DOCTRINE_DB_NAME=mqdev
+      - DOCTRINE_USER=root
+      - DOCTRINE_PASSWORD=rootpass
+      - REDIS_HOST=redis
+      - REDIS_PORT=6379
+      - AWS_SQS_KEY=$ENQUEUE_AWS__SQS__KEY
+      - AWS_SQS_SECRET=$ENQUEUE_AWS__SQS__SECRET
+      - AWS_SQS_REGION=$ENQUEUE_AWS__SQS__REGION
       - BEANSTALKD_HOST=beanstalkd
       - BEANSTALKD_PORT=11300
       - BEANSTALKD_DSN=beanstalk://beanstalkd:11300
diff --git a/pkg/amqp-bunny/composer.json b/pkg/amqp-bunny/composer.json
index cd527ad70..9c452ebf4 100644
--- a/pkg/amqp-bunny/composer.json
+++ b/pkg/amqp-bunny/composer.json
@@ -18,8 +18,8 @@
         "enqueue/enqueue": "^0.8@dev",
         "enqueue/null": "^0.8@dev",
         "queue-interop/queue-spec": "^0.5.3@dev",
-        "symfony/dependency-injection": "^2.8|^3",
-        "symfony/config": "^2.8|^3"
+        "symfony/dependency-injection": "^2.8|^3|^4",
+        "symfony/config": "^2.8|^3|^4"
     },
     "autoload": {
         "psr-4": { "Enqueue\\AmqpBunny\\": "" },
diff --git a/pkg/amqp-ext/composer.json b/pkg/amqp-ext/composer.json
index 5e01ef500..90400e471 100644
--- a/pkg/amqp-ext/composer.json
+++ b/pkg/amqp-ext/composer.json
@@ -19,8 +19,8 @@
         "enqueue/null": "^0.8@dev",
         "queue-interop/queue-spec": "^0.5.3@dev",
         "empi89/php-amqp-stubs": "*@dev",
-        "symfony/dependency-injection": "^2.8|^3",
-        "symfony/config": "^2.8|^3"
+        "symfony/dependency-injection": "^2.8|^3|^4",
+        "symfony/config": "^2.8|^3|^4"
     },
     "autoload": {
         "psr-4": { "Enqueue\\AmqpExt\\": "" },
diff --git a/pkg/amqp-ext/examples/consume.php b/pkg/amqp-ext/examples/consume.php
index ece61b1d4..ab13cece9 100644
--- a/pkg/amqp-ext/examples/consume.php
+++ b/pkg/amqp-ext/examples/consume.php
@@ -18,11 +18,11 @@
 use Enqueue\AmqpExt\AmqpConnectionFactory;
 
 $config = [
-    'host' => getenv('SYMFONY__RABBITMQ__HOST'),
-    'port' => getenv('SYMFONY__RABBITMQ__AMQP__PORT'),
-    'user' => getenv('SYMFONY__RABBITMQ__USER'),
-    'pass' => getenv('SYMFONY__RABBITMQ__PASSWORD'),
-    'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'),
+    'host' => getenv('RABBITMQ_HOST'),
+    'port' => getenv('RABBITMQ_AMQP__PORT'),
+    'user' => getenv('RABBITMQ_USER'),
+    'pass' => getenv('RABBITMQ_PASSWORD'),
+    'vhost' => getenv('RABBITMQ_VHOST'),
 ];
 
 $factory = new AmqpConnectionFactory($config);
diff --git a/pkg/amqp-ext/examples/produce.php b/pkg/amqp-ext/examples/produce.php
index a905e49be..d529a3431 100644
--- a/pkg/amqp-ext/examples/produce.php
+++ b/pkg/amqp-ext/examples/produce.php
@@ -21,11 +21,11 @@
 use Interop\Amqp\Impl\AmqpBind;
 
 $config = [
-    'host' => getenv('SYMFONY__RABBITMQ__HOST'),
-    'port' => getenv('SYMFONY__RABBITMQ__AMQP__PORT'),
-    'user' => getenv('SYMFONY__RABBITMQ__USER'),
-    'pass' => getenv('SYMFONY__RABBITMQ__PASSWORD'),
-    'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'),
+    'host' => getenv('RABBITMQ_HOST'),
+    'port' => getenv('RABBITMQ_AMQP__PORT'),
+    'user' => getenv('RABBITMQ_USER'),
+    'pass' => getenv('RABBITMQ_PASSWORD'),
+    'vhost' => getenv('RABBITMQ_VHOST'),
 ];
 
 $factory = new AmqpConnectionFactory($config);
diff --git a/pkg/amqp-lib/composer.json b/pkg/amqp-lib/composer.json
index a0a645d57..d0599e0b5 100644
--- a/pkg/amqp-lib/composer.json
+++ b/pkg/amqp-lib/composer.json
@@ -18,8 +18,8 @@
         "enqueue/enqueue": "^0.8@dev",
         "enqueue/null": "^0.8@dev",
         "queue-interop/queue-spec": "^0.5.3@dev",
-        "symfony/dependency-injection": "^2.8|^3",
-        "symfony/config": "^2.8|^3"
+        "symfony/dependency-injection": "^2.8|^3|^4",
+        "symfony/config": "^2.8|^3|^4"
     },
     "autoload": {
         "psr-4": { "Enqueue\\AmqpLib\\": "" },
diff --git a/pkg/amqp-lib/examples/consume.php b/pkg/amqp-lib/examples/consume.php
index 9af598bc5..4acca541d 100644
--- a/pkg/amqp-lib/examples/consume.php
+++ b/pkg/amqp-lib/examples/consume.php
@@ -18,11 +18,11 @@
 use Enqueue\AmqpLib\AmqpConnectionFactory;
 
 $config = [
-    'host' => getenv('SYMFONY__RABBITMQ__HOST'),
-    'port' => getenv('SYMFONY__RABBITMQ__AMQP__PORT'),
-    'user' => getenv('SYMFONY__RABBITMQ__USER'),
-    'pass' => getenv('SYMFONY__RABBITMQ__PASSWORD'),
-    'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'),
+    'host' => getenv('RABBITMQ_HOST'),
+    'port' => getenv('RABBITMQ_AMQP__PORT'),
+    'user' => getenv('RABBITMQ_USER'),
+    'pass' => getenv('RABBITMQ_PASSWORD'),
+    'vhost' => getenv('RABBITMQ_VHOST'),
     'receive_method' => 'basic_consume',
 ];
 
diff --git a/pkg/amqp-lib/examples/produce.php b/pkg/amqp-lib/examples/produce.php
index 4f9a83192..4b3ff025a 100644
--- a/pkg/amqp-lib/examples/produce.php
+++ b/pkg/amqp-lib/examples/produce.php
@@ -21,11 +21,11 @@
 use Interop\Amqp\Impl\AmqpBind;
 
 $config = [
-    'host' => getenv('SYMFONY__RABBITMQ__HOST'),
-    'port' => getenv('SYMFONY__RABBITMQ__AMQP__PORT'),
-    'user' => getenv('SYMFONY__RABBITMQ__USER'),
-    'pass' => getenv('SYMFONY__RABBITMQ__PASSWORD'),
-    'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'),
+    'host' => getenv('RABBITMQ_HOST'),
+    'port' => getenv('RABBITMQ_AMQP__PORT'),
+    'user' => getenv('RABBITMQ_USER'),
+    'pass' => getenv('RABBITMQ_PASSWORD'),
+    'vhost' => getenv('RABBITMQ_VHOST'),
 ];
 
 $factory = new AmqpConnectionFactory($config);
diff --git a/pkg/async-event-dispatcher/DependencyInjection/AsyncEventDispatcherExtension.php b/pkg/async-event-dispatcher/DependencyInjection/AsyncEventDispatcherExtension.php
index 160999d03..d417bcedd 100644
--- a/pkg/async-event-dispatcher/DependencyInjection/AsyncEventDispatcherExtension.php
+++ b/pkg/async-event-dispatcher/DependencyInjection/AsyncEventDispatcherExtension.php
@@ -4,6 +4,7 @@
 
 use Enqueue\AsyncEventDispatcher\OldAsyncEventDispatcher;
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Extension\Extension;
@@ -20,7 +21,7 @@ public function load(array $configs, ContainerBuilder $container)
     {
         $config = $this->processConfiguration(new Configuration(), $configs);
 
-        $container->setAlias('enqueue.events.context', $config['context_service']);
+        $container->setAlias('enqueue.events.context', new Alias($config['context_service'], true));
 
         $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yml');
diff --git a/pkg/async-event-dispatcher/Resources/config/services.yml b/pkg/async-event-dispatcher/Resources/config/services.yml
index 94dd698e9..e2916058f 100644
--- a/pkg/async-event-dispatcher/Resources/config/services.yml
+++ b/pkg/async-event-dispatcher/Resources/config/services.yml
@@ -14,17 +14,20 @@ services:
 
     enqueue.events.async_listener:
         class: 'Enqueue\AsyncEventDispatcher\AsyncListener'
+        public: public
         arguments: ['@enqueue.events.context', '@enqueue.events.registry', '%enqueue_events_queue%']
 
 
     enqueue.events.event_dispatcher:
         class: 'Enqueue\AsyncEventDispatcher\AsyncEventDispatcher'
+        public: public
         arguments:
             - '@event_dispatcher'
             - '@enqueue.events.async_listener'
 
     enqueue.events.async_processor:
         class: 'Enqueue\AsyncEventDispatcher\AsyncProcessor'
+        public: public
         arguments:
             - '@enqueue.events.registry'
             - '@enqueue.events.event_dispatcher'
@@ -39,6 +42,7 @@ services:
 
     enqueue.events.php_serializer_event_transofrmer:
         class: 'Enqueue\AsyncEventDispatcher\PhpSerializerEventTransformer'
+        public: public
         arguments:
             - '@enqueue.events.context'
         tags:
diff --git a/pkg/async-event-dispatcher/composer.json b/pkg/async-event-dispatcher/composer.json
index a5fc506b3..0e416d893 100644
--- a/pkg/async-event-dispatcher/composer.json
+++ b/pkg/async-event-dispatcher/composer.json
@@ -8,20 +8,20 @@
     "require": {
         "php": ">=5.6",
         "enqueue/enqueue": "^0.8@dev",
-        "symfony/event-dispatcher": "^2.8|^3"
+        "symfony/event-dispatcher": "^2.8|^3|^4"
     },
     "require-dev": {
         "phpunit/phpunit": "~5.5",
-        "symfony/dependency-injection": "^2.8|^3",
-        "symfony/config": "^2.8|^3",
-        "symfony/http-kernel": "^2.8|^3",
-        "symfony/filesystem": "^2.8|^3",
+        "symfony/dependency-injection": "^2.8|^3|^4",
+        "symfony/config": "^2.8|^3|^4",
+        "symfony/http-kernel": "^2.8|^3|^4",
+        "symfony/filesystem": "^2.8|^3|^4",
         "enqueue/null": "^0.8@dev",
         "enqueue/fs": "^0.8@dev",
         "enqueue/test": "^0.8@dev"
     },
     "suggest": {
-        "symfony/dependency-injection": "^2.8|^3 If you'd like to use async event dispatcher container extension."
+        "symfony/dependency-injection": "^2.8|^3|^4 If you'd like to use async event dispatcher container extension."
     },
     "autoload": {
         "psr-4": { "Enqueue\\AsyncEventDispatcher\\": "" },
diff --git a/pkg/dbal/Symfony/DbalTransportFactory.php b/pkg/dbal/Symfony/DbalTransportFactory.php
index 11e26ccbb..1deb22416 100644
--- a/pkg/dbal/Symfony/DbalTransportFactory.php
+++ b/pkg/dbal/Symfony/DbalTransportFactory.php
@@ -100,6 +100,7 @@ public function createContext(ContainerBuilder $container, array $config)
         $factoryId = sprintf('enqueue.transport.%s.connection_factory', $this->getName());
 
         $context = new Definition(DbalContext::class);
+        $context->setPublic(true);
         $context->setFactory([new Reference($factoryId), 'createContext']);
 
         $contextId = sprintf('enqueue.transport.%s.context', $this->getName());
@@ -114,6 +115,7 @@ public function createContext(ContainerBuilder $container, array $config)
     public function createDriver(ContainerBuilder $container, array $config)
     {
         $driver = new Definition(DbalDriver::class);
+        $driver->setPublic(true);
         $driver->setArguments([
             new Reference(sprintf('enqueue.transport.%s.context', $this->getName())),
             new Reference('enqueue.client.config'),
diff --git a/pkg/dbal/composer.json b/pkg/dbal/composer.json
index 69bd93b7e..15197f7f4 100644
--- a/pkg/dbal/composer.json
+++ b/pkg/dbal/composer.json
@@ -16,8 +16,8 @@
         "enqueue/enqueue": "^0.8@dev",
         "enqueue/null": "^0.8@dev",
         "queue-interop/queue-spec": "^0.5.3@dev",
-        "symfony/dependency-injection": "^2.8|^3",
-        "symfony/config": "^2.8|^3"
+        "symfony/dependency-injection": "^2.8|^3|^4",
+        "symfony/config": "^2.8|^3|^4"
     },
     "autoload": {
         "psr-4": { "Enqueue\\Dbal\\": "" },
diff --git a/pkg/dbal/examples/consume.php b/pkg/dbal/examples/consume.php
index 1ad3061e6..0fc0eae93 100644
--- a/pkg/dbal/examples/consume.php
+++ b/pkg/dbal/examples/consume.php
@@ -19,12 +19,12 @@
 
 $config = [
     'connection' => [
-        'dbname' => getenv('SYMFONY__DB__NAME'),
-        'user' => getenv('SYMFONY__DB__USER'),
-        'password' => getenv('SYMFONY__DB__PASSWORD'),
-        'host' => getenv('SYMFONY__DB__HOST'),
-        'port' => getenv('SYMFONY__DB__PORT'),
-        'driver' => getenv('SYMFONY__DB__DRIVER'),
+        'dbname' => getenv('DOCTRINE_DB_NAME'),
+        'user' => getenv('DOCTRINE_USER'),
+        'password' => getenv('DOCTRINE_PASSWORD'),
+        'host' => getenv('DOCTRINE_HOST'),
+        'port' => getenv('DOCTRINE_PORT'),
+        'driver' => getenv('DOCTRINE_DRIVER'),
     ],
 ];
 
diff --git a/pkg/dbal/examples/produce.php b/pkg/dbal/examples/produce.php
index 2a8ceece7..31befb24a 100644
--- a/pkg/dbal/examples/produce.php
+++ b/pkg/dbal/examples/produce.php
@@ -19,12 +19,12 @@
 
 $config = [
     'connection' => [
-        'dbname' => getenv('SYMFONY__DB__NAME'),
-        'user' => getenv('SYMFONY__DB__USER'),
-        'password' => getenv('SYMFONY__DB__PASSWORD'),
-        'host' => getenv('SYMFONY__DB__HOST'),
-        'port' => getenv('SYMFONY__DB__PORT'),
-        'driver' => getenv('SYMFONY__DB__DRIVER'),
+        'dbname' => getenv('DOCTRINE_DB_NAME'),
+        'user' => getenv('DOCTRINE_USER'),
+        'password' => getenv('DOCTRINE_PASSWORD'),
+        'host' => getenv('DOCTRINE_HOST'),
+        'port' => getenv('DOCTRINE_PORT'),
+        'driver' => getenv('DOCTRINE_DRIVER'),
     ],
 ];
 
diff --git a/pkg/enqueue-bundle/Profiler/MessageQueueCollector.php b/pkg/enqueue-bundle/Profiler/MessageQueueCollector.php
index b3e2b5f0f..86bdd7456 100644
--- a/pkg/enqueue-bundle/Profiler/MessageQueueCollector.php
+++ b/pkg/enqueue-bundle/Profiler/MessageQueueCollector.php
@@ -82,4 +82,12 @@ public function getName()
     {
         return 'enqueue.message_queue';
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        $this->data = [];
+    }
 }
diff --git a/pkg/enqueue-bundle/Resources/config/client.yml b/pkg/enqueue-bundle/Resources/config/client.yml
index 539abfcc3..b87bec7a0 100644
--- a/pkg/enqueue-bundle/Resources/config/client.yml
+++ b/pkg/enqueue-bundle/Resources/config/client.yml
@@ -5,6 +5,7 @@ services:
 
     Enqueue\Client\Producer:
         class: 'Enqueue\Client\Producer'
+        public: true
         arguments:
             - '@enqueue.client.driver'
             - '@enqueue.client.rpc_factory'
@@ -12,27 +13,33 @@ services:
 
     # Deprecated. To be removed in 0.10.
     enqueue.client.producer:
+        public: true
         alias: 'Enqueue\Client\Producer'
 
     # Deprecated. To be removed in 0.10.
     enqueue.producer:
+        public: true
         alias: 'enqueue.client.producer'
 
     # Deprecated. To be removed in 0.10.
     enqueue.client.producer_v2:
+        public: true
         alias: 'enqueue.client.producer'
 
     Enqueue\Client\SpoolProducer:
         class: 'Enqueue\Client\SpoolProducer'
+        public: true
         arguments:
             - '@Enqueue\Client\Producer'
 
     # Deprecated. To be removed in 0.10.
     enqueue.client.spool_producer:
+        public: true
         alias: 'Enqueue\Client\SpoolProducer'
 
     # Deprecated. To be removed in 0.10.
     enqueue.spool_producer:
+        public: true
         alias: 'enqueue.client.spool_producer'
 
     enqueue.client.extensions:
@@ -62,6 +69,7 @@ services:
 
     # Deprecated. To be removed in 0.10.
     enqueue.client.router_processor:
+        public: true
         alias: 'Enqueue\Client\RouterProcessor'
 
     enqueue.client.processor_registry:
@@ -77,6 +85,7 @@ services:
 
     # Deprecated. To be removed in 0.10.
     enqueue.client.meta.topic_meta_registry:
+        public: true
         alias: 'Enqueue\Client\Meta\TopicMetaRegistry'
 
     Enqueue\Client\Meta\QueueMetaRegistry:
@@ -86,6 +95,7 @@ services:
 
     # Deprecated. To be removed in 0.10.
     enqueue.client.meta.queue_meta_registry:
+        public: true
         alias: 'Enqueue\Client\Meta\QueueMetaRegistry'
 
     enqueue.client.delegate_processor:
@@ -124,6 +134,7 @@ services:
 
     # Deprecated. To be removed in 0.10.
     enqueue.client.consume_messages_command:
+        public: true
         alias: 'Enqueue\Symfony\Client\ConsumeMessagesCommand'
 
     Enqueue\Symfony\Client\ProduceMessageCommand:
@@ -136,10 +147,12 @@ services:
 
     # Deprecated. To be removed in 0.10.
     enqueue.client.produce_message_command:
+        public: true
         alias: 'Enqueue\Symfony\Client\ProduceMessageCommand'
 
     Enqueue\Symfony\Client\Meta\TopicsCommand:
         class: 'Enqueue\Symfony\Client\Meta\TopicsCommand'
+        public: true
         arguments:
             - '@Enqueue\Client\Meta\TopicMetaRegistry'
         tags:
@@ -147,10 +160,12 @@ services:
 
     # Deprecated. To be removed in 0.10.
     enqueue.client.meta.topics_command:
+        public: true
         alias: 'Enqueue\Symfony\Client\Meta\TopicsCommand'
 
     Enqueue\Symfony\Client\Meta\QueuesCommand:
         class: 'Enqueue\Symfony\Client\Meta\QueuesCommand'
+        public: true
         arguments:
             - '@Enqueue\Client\Meta\QueueMetaRegistry'
         tags:
@@ -158,6 +173,7 @@ services:
 
     # Deprecated. To be removed in 0.10.
     enqueue.client.meta.queues_command:
+        public: true
         alias: 'Enqueue\Symfony\Client\Meta\QueuesCommand'
 
     Enqueue\Symfony\Client\SetupBrokerCommand:
@@ -170,6 +186,7 @@ services:
 
     # Deprecated. To be removed in 0.10.
     enqueue.client.setup_broker_command:
+        public: true
         alias: 'Enqueue\Symfony\Client\SetupBrokerCommand'
 
     enqueue.profiler.message_queue_collector:
@@ -182,6 +199,7 @@ services:
 
     Enqueue\Symfony\Client\FlushSpoolProducerListener:
         class: 'Enqueue\Symfony\Client\FlushSpoolProducerListener'
+        public: true
         arguments:
             - '@Enqueue\Client\SpoolProducer'
         tags:
@@ -189,4 +207,5 @@ services:
 
     # Deprecated. To be removed in 0.10.
     enqueue.flush_spool_producer_listener:
+        public: true
         alias: 'Enqueue\Symfony\Client\FlushSpoolProducerListener'
diff --git a/pkg/enqueue-bundle/Resources/config/job.yml b/pkg/enqueue-bundle/Resources/config/job.yml
index d8db70793..159aecc61 100644
--- a/pkg/enqueue-bundle/Resources/config/job.yml
+++ b/pkg/enqueue-bundle/Resources/config/job.yml
@@ -4,6 +4,7 @@ parameters:
 services:
     Enqueue\JobQueue\Doctrine\JobStorage:
         class: 'Enqueue\JobQueue\Doctrine\JobStorage'
+        public: true
         arguments:
             - '@doctrine'
             - 'Enqueue\JobQueue\Doctrine\Entity\Job'
@@ -11,38 +12,46 @@ services:
 
     # Deprecated. To be removed in 0.10.
     enqueue.job.storage:
+        public: true
         alias: 'Enqueue\JobQueue\Doctrine\JobStorage'
 
     Enqueue\JobQueue\JobProcessor:
         class: 'Enqueue\JobQueue\JobProcessor'
+        public: true
         arguments:
             - '@Enqueue\JobQueue\Doctrine\JobStorage'
             - '@Enqueue\Client\Producer'
 
     # Deprecated. To be removed in 0.10.
     enqueue.job.processor:
+        public: true
         alias: 'Enqueue\JobQueue\JobProcessor'
 
     Enqueue\JobQueue\JobRunner:
         class: 'Enqueue\JobQueue\JobRunner'
+        public: true
         arguments:
             - '@Enqueue\JobQueue\JobProcessor'
 
     # Deprecated. To be removed in 0.10.
     enqueue.job.runner:
+        public: true
         alias: 'Enqueue\JobQueue\JobRunner'
 
     Enqueue\JobQueue\CalculateRootJobStatusService:
         class: 'Enqueue\JobQueue\CalculateRootJobStatusService'
+        public: true
         arguments:
             - '@Enqueue\JobQueue\Doctrine\JobStorage'
 
     # Deprecated. To be removed in 0.10.
     enqueue.job.calculate_root_job_status_service:
+        public: true
         alias: 'Enqueue\JobQueue\CalculateRootJobStatusService'
 
     Enqueue\JobQueue\CalculateRootJobStatusProcessor:
         class: 'Enqueue\JobQueue\CalculateRootJobStatusProcessor'
+        public: true
         arguments:
             - '@Enqueue\JobQueue\Doctrine\JobStorage'
             - '@Enqueue\JobQueue\CalculateRootJobStatusService'
@@ -53,10 +62,12 @@ services:
 
     # Deprecated. To be removed in 0.10.
     enqueue.job.calculate_root_job_status_processor:
+        public: true
         alias: 'Enqueue\JobQueue\CalculateRootJobStatusProcessor'
 
     Enqueue\JobQueue\DependentJobProcessor:
         class: 'Enqueue\JobQueue\DependentJobProcessor'
+        public: true
         arguments:
             - '@Enqueue\JobQueue\Doctrine\JobStorage'
             - '@Enqueue\Client\Producer'
@@ -66,13 +77,16 @@ services:
 
     # Deprecated. To be removed in 0.10.
     enqueue.job.dependent_job_processor:
+        public: true
         alias: 'Enqueue\JobQueue\DependentJobProcessor'
 
     Enqueue\JobQueue\DependentJobService:
         class: 'Enqueue\JobQueue\DependentJobService'
+        public: true
         arguments:
             - '@Enqueue\JobQueue\Doctrine\JobStorage'
 
     # Deprecated. To be removed in 0.10.
     enqueue.job.dependent_job_service:
+        public: true
         alias: 'Enqueue\JobQueue\DependentJobService'
diff --git a/pkg/enqueue-bundle/Resources/config/services.yml b/pkg/enqueue-bundle/Resources/config/services.yml
index 21a58dfdc..452ab315b 100644
--- a/pkg/enqueue-bundle/Resources/config/services.yml
+++ b/pkg/enqueue-bundle/Resources/config/services.yml
@@ -7,6 +7,7 @@ services:
 
     Enqueue\Consumption\QueueConsumer:
         class: 'Enqueue\Consumption\QueueConsumer'
+        public: true
         arguments:
             - '@enqueue.transport.context'
             - '@enqueue.consumption.extensions'
@@ -15,10 +16,12 @@ services:
 
     # Deprecated. To be removed in 0.10.
     enqueue.consumption.queue_consumer:
+        public: true
         alias: 'Enqueue\Consumption\QueueConsumer'
 
     Enqueue\Symfony\Consumption\ContainerAwareConsumeMessagesCommand:
         class: 'Enqueue\Symfony\Consumption\ContainerAwareConsumeMessagesCommand'
+        public: true
         arguments:
             - '@Enqueue\Consumption\QueueConsumer'
         tags:
@@ -26,6 +29,7 @@ services:
 
     # Deprecated. To be removed in 0.10.
     enqueue.command.consume_messages:
+        public: true
         alias: 'Enqueue\Symfony\Consumption\ContainerAwareConsumeMessagesCommand'
 
     enqueue.transport.rpc_factory:
@@ -36,10 +40,12 @@ services:
 
     Enqueue\Rpc\RpcClient:
         class: 'Enqueue\Rpc\RpcClient'
+        public: true
         arguments:
             - '@enqueue.transport.context'
             - '@enqueue.transport.rpc_factory'
 
     # Deprecated. To be removed in 0.10.
     enqueue.transport.rpc_client:
+        public: true
         alias: 'Enqueue\Rpc\RpcClient'
diff --git a/pkg/enqueue-bundle/Tests/Functional/App/AppKernel.php b/pkg/enqueue-bundle/Tests/Functional/App/AppKernel.php
index e2ed065a3..59ac38666 100644
--- a/pkg/enqueue-bundle/Tests/Functional/App/AppKernel.php
+++ b/pkg/enqueue-bundle/Tests/Functional/App/AppKernel.php
@@ -46,6 +46,21 @@ public function registerContainerConfiguration(LoaderInterface $loader)
         $loader->load(__DIR__.'/config/config.yml');
     }
 
+    protected function getKernelParameters()
+    {
+        $parameters = parent::getKernelParameters();
+
+        // it works in all Symfony version, 2.8, 3.x, 4.x
+        $parameters['db.driver'] = getenv('DOCTRINE_DRIVER');
+        $parameters['db.host'] = getenv('DOCTRINE_HOST');
+        $parameters['db.port'] = getenv('DOCTRINE_PORT');
+        $parameters['db.name'] = getenv('DOCTRINE_DB_NAME');
+        $parameters['db.user'] = getenv('DOCTRINE_USER');
+        $parameters['db.password'] = getenv('DOCTRINE_PASSWORD');
+
+        return $parameters;
+    }
+
     protected function getContainerClass()
     {
         return parent::getContainerClass().'BundleDefault';
diff --git a/pkg/enqueue-bundle/Tests/Functional/App/config/config.yml b/pkg/enqueue-bundle/Tests/Functional/App/config/config.yml
index d5f2dc07f..aa1d645ff 100644
--- a/pkg/enqueue-bundle/Tests/Functional/App/config/config.yml
+++ b/pkg/enqueue-bundle/Tests/Functional/App/config/config.yml
@@ -44,26 +44,31 @@ enqueue:
 services:
     test_async_listener:
         class: 'Enqueue\Bundle\Tests\Functional\App\TestAsyncListener'
+        public: true
         tags:
             - { name: 'kernel.event_listener', async: true, event: 'test_async', method: 'onEvent' }
 
     test_command_subscriber_processor:
         class: 'Enqueue\Bundle\Tests\Functional\App\TestCommandSubscriberProcessor'
+        public: true
         tags:
             - { name: 'enqueue.client.processor' }
 
     test_exclusive_command_subscriber_processor:
         class: 'Enqueue\Bundle\Tests\Functional\App\TestExclusiveCommandSubscriberProcessor'
+        public: true
         tags:
             - { name: 'enqueue.client.processor' }
 
     test_async_subscriber:
         class: 'Enqueue\Bundle\Tests\Functional\App\TestAsyncSubscriber'
+        public: true
         tags:
             - { name: 'kernel.event_subscriber', async: true }
 
     test_async_event_transformer:
         class: 'Enqueue\Bundle\Tests\Functional\App\TestAsyncEventTransformer'
+        public: true
         arguments:
             - '@enqueue.transport.default.context'
         tags:
@@ -73,4 +78,5 @@ services:
     # overwrite async listener with one based on client producer. so we can use traceable producer.
     enqueue.events.async_listener:
         class: 'Enqueue\Bundle\Tests\Functional\App\AsyncListener'
+        public: true
         arguments: ['@Enqueue\Client\Producer', '@enqueue.events.registry']
\ No newline at end of file
diff --git a/pkg/enqueue-bundle/Tests/Functional/App/config/custom-config.yml b/pkg/enqueue-bundle/Tests/Functional/App/config/custom-config.yml
index d99f650d2..9bcc45a30 100644
--- a/pkg/enqueue-bundle/Tests/Functional/App/config/custom-config.yml
+++ b/pkg/enqueue-bundle/Tests/Functional/App/config/custom-config.yml
@@ -24,10 +24,12 @@ monolog:
 services:
     test.message.processor:
         class: 'Enqueue\Bundle\Tests\Functional\TestProcessor'
+        public: true
         tags:
             - { name: 'enqueue.client.processor' }
 
     test.message.command_processor:
         class: 'Enqueue\Bundle\Tests\Functional\TestCommandProcessor'
+        public: true
         tags:
             - { name: 'enqueue.client.processor' }
diff --git a/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php b/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php
index 3541badc0..69793bf4b 100644
--- a/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php
+++ b/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php
@@ -29,6 +29,10 @@ public function setUp()
 
     public function tearDown()
     {
+        if ($this->getPsrContext()) {
+            $this->getPsrContext()->close();
+        }
+
         if (static::$kernel) {
             $fs = new Filesystem();
             $fs->remove(static::$kernel->getLogDir());
@@ -53,13 +57,12 @@ public function provideEnqueueConfigs()
                 'default' => 'amqp',
                 'amqp' => [
                     'driver' => 'ext',
-                    'host' => getenv('SYMFONY__RABBITMQ__HOST'),
-                    'port' => getenv('SYMFONY__RABBITMQ__AMQP__PORT'),
-                    'user' => getenv('SYMFONY__RABBITMQ__USER'),
-                    'pass' => getenv('SYMFONY__RABBITMQ__PASSWORD'),
-                    'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'),
-                    'lazy' => true,
-                    'persisted' => false,
+                    'host' => getenv('RABBITMQ_HOST'),
+                    'port' => getenv('RABBITMQ_AMQP__PORT'),
+                    'user' => getenv('RABBITMQ_USER'),
+                    'pass' => getenv('RABBITMQ_PASSWORD'),
+                    'vhost' => getenv('RABBITMQ_VHOST'),
+                    'lazy' => false,
                 ],
             ],
         ]];
@@ -109,13 +112,13 @@ public function provideEnqueueConfigs()
             'transport' => [
                 'default' => 'rabbitmq_stomp',
                 'rabbitmq_stomp' => [
-                    'host' => getenv('SYMFONY__RABBITMQ__HOST'),
-                    'port' => getenv('SYMFONY__RABBITMQ__STOMP__PORT'),
-                    'login' => getenv('SYMFONY__RABBITMQ__USER'),
-                    'password' => getenv('SYMFONY__RABBITMQ__PASSWORD'),
-                    'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'),
-                    'management_plugin_installed' => true,
+                    'host' => getenv('RABBITMQ_HOST'),
+                    'port' => getenv('RABBITMQ_STOMP_PORT'),
+                    'login' => getenv('RABBITMQ_USER'),
+                    'password' => getenv('RABBITMQ_PASSWORD'),
+                    'vhost' => getenv('RABBITMQ_VHOST'),
                     'lazy' => false,
+                    'management_plugin_installed' => true,
                 ],
             ],
         ]];
@@ -124,8 +127,8 @@ public function provideEnqueueConfigs()
             'transport' => [
                 'default' => 'redis',
                 'redis' => [
-                    'host' => getenv('SYMFONY__REDIS__HOST'),
-                    'port' => (int) getenv('SYMFONY__REDIS__PORT'),
+                    'host' => getenv('REDIS_HOST'),
+                    'port' => (int) getenv('REDIS_PORT'),
                     'vendor' => 'predis',
                     'lazy' => false,
                 ],
@@ -136,8 +139,8 @@ public function provideEnqueueConfigs()
             'transport' => [
                 'default' => 'redis',
                 'redis' => [
-                    'host' => getenv('SYMFONY__REDIS__HOST'),
-                    'port' => (int) getenv('SYMFONY__REDIS__PORT'),
+                    'host' => getenv('REDIS_HOST'),
+                    'port' => (int) getenv('REDIS_PORT'),
                     'vendor' => 'phpredis',
                     'lazy' => false,
                 ],
@@ -171,12 +174,12 @@ public function provideEnqueueConfigs()
                 'default' => 'dbal',
                 'dbal' => [
                     'connection' => [
-                        'dbname' => getenv('SYMFONY__DB__NAME'),
-                        'user' => getenv('SYMFONY__DB__USER'),
-                        'password' => getenv('SYMFONY__DB__PASSWORD'),
-                        'host' => getenv('SYMFONY__DB__HOST'),
-                        'port' => getenv('SYMFONY__DB__PORT'),
-                        'driver' => getenv('SYMFONY__DB__DRIVER'),
+                        'dbname' => getenv('DOCTRINE_DB_NAME'),
+                        'user' => getenv('DOCTRINE_USER'),
+                        'password' => getenv('DOCTRINE_PASSWORD'),
+                        'host' => getenv('DOCTRINE_HOST'),
+                        'port' => getenv('DOCTRINE_PORT'),
+                        'driver' => getenv('DOCTRINE_DRIVER'),
                     ],
                 ],
             ],
@@ -193,9 +196,9 @@ public function provideEnqueueConfigs()
             'transport' => [
                 'default' => 'sqs',
                 'sqs' => [
-                    'key' => getenv('AWS__SQS__KEY'),
-                    'secret' => getenv('AWS__SQS__SECRET'),
-                    'region' => getenv('AWS__SQS__REGION'),
+                    'key' => getenv('AWS_SQS_KEY'),
+                    'secret' => getenv('AWS_SQS_SECRET'),
+                    'region' => getenv('AWS_SQS_REGION'),
                 ],
             ],
         ]];
diff --git a/pkg/enqueue-bundle/Tests/Unit/Mocks/FooTransportFactory.php b/pkg/enqueue-bundle/Tests/Unit/Mocks/FooTransportFactory.php
index 0a83b6eed..5507d193d 100644
--- a/pkg/enqueue-bundle/Tests/Unit/Mocks/FooTransportFactory.php
+++ b/pkg/enqueue-bundle/Tests/Unit/Mocks/FooTransportFactory.php
@@ -53,7 +53,10 @@ public function createContext(ContainerBuilder $container, array $config)
     {
         $contextId = 'foo.context';
 
-        $container->setDefinition($contextId, new Definition(\stdClass::class, [$config]));
+        $context = new Definition(\stdClass::class, [$config]);
+        $context->setPublic(true);
+
+        $container->setDefinition($contextId, $context);
 
         return $contextId;
     }
@@ -62,7 +65,10 @@ public function createDriver(ContainerBuilder $container, array $config)
     {
         $driverId = 'foo.driver';
 
-        $container->setDefinition($driverId, new Definition(\stdClass::class, [$config]));
+        $driver = new Definition(\stdClass::class, [$config]);
+        $driver->setPublic(true);
+
+        $container->setDefinition($driverId, $driver);
 
         return $driverId;
     }
diff --git a/pkg/enqueue-bundle/Tests/Unit/Mocks/TransportFactoryWithoutDriverFactory.php b/pkg/enqueue-bundle/Tests/Unit/Mocks/TransportFactoryWithoutDriverFactory.php
index 2f8581207..f3a003201 100644
--- a/pkg/enqueue-bundle/Tests/Unit/Mocks/TransportFactoryWithoutDriverFactory.php
+++ b/pkg/enqueue-bundle/Tests/Unit/Mocks/TransportFactoryWithoutDriverFactory.php
@@ -48,7 +48,10 @@ public function createContext(ContainerBuilder $container, array $config)
     {
         $contextId = 'without_driver.context';
 
-        $container->setDefinition($contextId, new Definition(\stdClass::class, [$config]));
+        $context = new Definition(\stdClass::class, [$config]);
+        $context->setPublic(true);
+
+        $container->setDefinition($contextId, $context);
 
         return $contextId;
     }
diff --git a/pkg/enqueue-bundle/composer.json b/pkg/enqueue-bundle/composer.json
index a3b69ee9c..47bc218cf 100644
--- a/pkg/enqueue-bundle/composer.json
+++ b/pkg/enqueue-bundle/composer.json
@@ -7,7 +7,7 @@
     "license": "MIT",
     "require": {
         "php": ">=5.6",
-        "symfony/framework-bundle": "^2.8|^3",
+        "symfony/framework-bundle": "^2.8|^3|^4",
         "enqueue/enqueue": "^0.8@dev",
         "enqueue/null": "^0.8@dev",
         "enqueue/async-event-dispatcher": "^0.8@dev"
@@ -27,9 +27,9 @@
         "enqueue/gps": "^0.8@dev",
         "enqueue/test": "^0.8@dev",
         "doctrine/doctrine-bundle": "~1.2",
-        "symfony/monolog-bundle": "^2.8|^3",
-        "symfony/browser-kit": "^2.8|^3",
-        "symfony/expression-language": "^2.8|^3"
+        "symfony/monolog-bundle": "^2.8|^3|^4",
+        "symfony/browser-kit": "^2.8|^3|^4",
+        "symfony/expression-language": "^2.8|^3|^4"
     },
     "autoload": {
         "psr-4": { "Enqueue\\Bundle\\": "" },
diff --git a/pkg/enqueue/Symfony/AmqpTransportFactory.php b/pkg/enqueue/Symfony/AmqpTransportFactory.php
index 8a2a20ee9..0a749f769 100644
--- a/pkg/enqueue/Symfony/AmqpTransportFactory.php
+++ b/pkg/enqueue/Symfony/AmqpTransportFactory.php
@@ -166,6 +166,7 @@ public function createContext(ContainerBuilder $container, array $config)
         $factoryId = sprintf('enqueue.transport.%s.connection_factory', $this->getName());
 
         $context = new Definition(AmqpContext::class);
+        $context->setPublic(true);
         $context->setFactory([new Reference($factoryId), 'createContext']);
 
         $contextId = sprintf('enqueue.transport.%s.context', $this->getName());
@@ -180,6 +181,7 @@ public function createContext(ContainerBuilder $container, array $config)
     public function createDriver(ContainerBuilder $container, array $config)
     {
         $driver = new Definition(AmqpDriver::class);
+        $driver->setPublic(true);
         $driver->setArguments([
             new Reference(sprintf('enqueue.transport.%s.context', $this->getName())),
             new Reference('enqueue.client.config'),
diff --git a/pkg/enqueue/Symfony/DefaultTransportFactory.php b/pkg/enqueue/Symfony/DefaultTransportFactory.php
index 24972986c..97734b83a 100644
--- a/pkg/enqueue/Symfony/DefaultTransportFactory.php
+++ b/pkg/enqueue/Symfony/DefaultTransportFactory.php
@@ -18,6 +18,7 @@
 use Enqueue\Stomp\Symfony\StompTransportFactory;
 use Interop\Amqp\AmqpConnectionFactory;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
+use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use function Enqueue\dsn_to_connection_factory;
 
@@ -83,8 +84,8 @@ public function createConnectionFactory(ContainerBuilder $container, array $conf
 
         $factoryId = sprintf('enqueue.transport.%s.connection_factory', $this->getName());
 
-        $container->setAlias($factoryId, $aliasId);
-        $container->setAlias('enqueue.transport.connection_factory', $factoryId);
+        $container->setAlias($factoryId, new Alias($aliasId, true));
+        $container->setAlias('enqueue.transport.connection_factory', new Alias($factoryId, true));
 
         return $factoryId;
     }
@@ -104,8 +105,8 @@ public function createContext(ContainerBuilder $container, array $config)
 
         $contextId = sprintf('enqueue.transport.%s.context', $this->getName());
 
-        $container->setAlias($contextId, $aliasId);
-        $container->setAlias('enqueue.transport.context', $contextId);
+        $container->setAlias($contextId, new Alias($aliasId, true));
+        $container->setAlias('enqueue.transport.context', new Alias($contextId, true));
 
         return $contextId;
     }
@@ -125,8 +126,8 @@ public function createDriver(ContainerBuilder $container, array $config)
 
         $driverId = sprintf('enqueue.client.%s.driver', $this->getName());
 
-        $container->setAlias($driverId, $aliasId);
-        $container->setAlias('enqueue.client.driver', $driverId);
+        $container->setAlias($driverId, new Alias($aliasId, true));
+        $container->setAlias('enqueue.client.driver', new Alias($driverId, true));
 
         return $driverId;
     }
diff --git a/pkg/enqueue/Symfony/RabbitMqAmqpTransportFactory.php b/pkg/enqueue/Symfony/RabbitMqAmqpTransportFactory.php
index 2bd98e584..94ee9234e 100644
--- a/pkg/enqueue/Symfony/RabbitMqAmqpTransportFactory.php
+++ b/pkg/enqueue/Symfony/RabbitMqAmqpTransportFactory.php
@@ -55,6 +55,7 @@ public function createConnectionFactory(ContainerBuilder $container, array $conf
     public function createDriver(ContainerBuilder $container, array $config)
     {
         $driver = new Definition(RabbitMqDriver::class);
+        $driver->setPublic(true);
         $driver->setArguments([
             new Reference(sprintf('enqueue.transport.%s.context', $this->getName())),
             new Reference('enqueue.client.config'),
diff --git a/pkg/enqueue/composer.json b/pkg/enqueue/composer.json
index 8b1d0ece2..8c25bb6a7 100644
--- a/pkg/enqueue/composer.json
+++ b/pkg/enqueue/composer.json
@@ -14,11 +14,11 @@
     },
     "require-dev": {
         "phpunit/phpunit": "~5.5",
-        "symfony/console": "^2.8|^3",
-        "symfony/dependency-injection": "^2.8|^3",
-        "symfony/config": "^2.8|^3",
-        "symfony/event-dispatcher": "^2.8|^3",
-        "symfony/http-kernel": "^2.8|^3",
+        "symfony/console": "^2.8|^3|^4",
+        "symfony/dependency-injection": "^2.8|^3|^4",
+        "symfony/config": "^2.8|^3|^4",
+        "symfony/event-dispatcher": "^2.8|^3|^4",
+        "symfony/http-kernel": "^2.8|^3|^4",
         "enqueue/amqp-ext": "^0.8@dev",
         "enqueue/amqp-lib": "^0.8@dev",
         "enqueue/amqp-bunny": "^0.8@dev",
@@ -36,9 +36,9 @@
         "empi89/php-amqp-stubs": "*@dev"
     },
     "suggest": {
-        "symfony/console": "^2.8|^3 If you want to use li commands",
-        "symfony/dependency-injection": "^2.8|^3",
-        "symfony/config": "^2.8|^3",
+        "symfony/console": "^2.8|^3|^4 If you want to use li commands",
+        "symfony/dependency-injection": "^2.8|^3|^4",
+        "symfony/config": "^2.8|^3|^4",
         "enqueue/amqp-ext": "AMQP transport (based on php extension)",
         "enqueue/stomp": "STOMP transport",
         "enqueue/fs": "Filesystem transport",
diff --git a/pkg/fs/Symfony/FsTransportFactory.php b/pkg/fs/Symfony/FsTransportFactory.php
index 9908f8914..da4921305 100644
--- a/pkg/fs/Symfony/FsTransportFactory.php
+++ b/pkg/fs/Symfony/FsTransportFactory.php
@@ -86,6 +86,7 @@ public function createContext(ContainerBuilder $container, array $config)
         $factoryId = sprintf('enqueue.transport.%s.connection_factory', $this->getName());
 
         $context = new Definition(FsContext::class);
+        $context->setPublic(true);
         $context->setFactory([new Reference($factoryId), 'createContext']);
 
         $contextId = sprintf('enqueue.transport.%s.context', $this->getName());
@@ -100,6 +101,7 @@ public function createContext(ContainerBuilder $container, array $config)
     public function createDriver(ContainerBuilder $container, array $config)
     {
         $driver = new Definition(FsDriver::class);
+        $driver->setPublic(true);
         $driver->setArguments([
             new Reference(sprintf('enqueue.transport.%s.context', $this->getName())),
             new Reference('enqueue.client.config'),
diff --git a/pkg/fs/composer.json b/pkg/fs/composer.json
index ea23ac7c3..f9d481dd2 100644
--- a/pkg/fs/composer.json
+++ b/pkg/fs/composer.json
@@ -8,7 +8,7 @@
     "require": {
         "php": ">=5.6",
         "queue-interop/queue-interop": "^0.6",
-        "symfony/filesystem": "^2.8|^3@stable",
+        "symfony/filesystem": "^2.8|^3|^4",
         "makasim/temp-file": "^0.2@stable"
     },
     "require-dev": {
@@ -17,9 +17,9 @@
         "enqueue/null": "^0.7",
         "enqueue/test": "^0.7",
         "queue-interop/queue-spec": "^0.5.3@dev",
-        "symfony/dependency-injection": "^2.8|^3@stable",
-        "symfony/config": "^2.8|^3@stable",
-        "symfony/phpunit-bridge": "^2.8|^3@stable"
+        "symfony/dependency-injection": "^2.8|^3|^4",
+        "symfony/config": "^2.8|^3|^4",
+        "symfony/phpunit-bridge": "^2.8|^3|^4"
     },
     "autoload": {
         "psr-4": { "Enqueue\\Fs\\": "" },
diff --git a/pkg/gearman/composer.json b/pkg/gearman/composer.json
index 555deecab..85b8fc8bd 100644
--- a/pkg/gearman/composer.json
+++ b/pkg/gearman/composer.json
@@ -16,8 +16,8 @@
         "enqueue/enqueue": "^0.8@dev",
         "enqueue/null": "^0.8@dev",
         "queue-interop/queue-spec": "^0.5.3@dev",
-        "symfony/dependency-injection": "^2.8|^3",
-        "symfony/config": "^2.8|^3"
+        "symfony/dependency-injection": "^2.8|^3|^4",
+        "symfony/config": "^2.8|^3|^4"
     },
     "autoload": {
         "psr-4": { "Enqueue\\Gearman\\": "" },
diff --git a/pkg/gps/Symfony/GpsTransportFactory.php b/pkg/gps/Symfony/GpsTransportFactory.php
index 1ad137a12..36c15e39b 100644
--- a/pkg/gps/Symfony/GpsTransportFactory.php
+++ b/pkg/gps/Symfony/GpsTransportFactory.php
@@ -94,6 +94,7 @@ public function createContext(ContainerBuilder $container, array $config)
         $factoryId = sprintf('enqueue.transport.%s.connection_factory', $this->getName());
 
         $context = new Definition(GpsContext::class);
+        $context->setPublic(true);
         $context->setFactory([new Reference($factoryId), 'createContext']);
 
         $contextId = sprintf('enqueue.transport.%s.context', $this->getName());
@@ -108,6 +109,7 @@ public function createContext(ContainerBuilder $container, array $config)
     public function createDriver(ContainerBuilder $container, array $config)
     {
         $driver = new Definition(GpsDriver::class);
+        $driver->setPublic(true);
         $driver->setArguments([
             new Reference(sprintf('enqueue.transport.%s.context', $this->getName())),
             new Reference('enqueue.client.config'),
diff --git a/pkg/gps/composer.json b/pkg/gps/composer.json
index d7cd3fc61..f8cf4729c 100644
--- a/pkg/gps/composer.json
+++ b/pkg/gps/composer.json
@@ -15,8 +15,8 @@
         "enqueue/test": "^0.8@dev",
         "enqueue/enqueue": "^0.8@dev",
         "queue-interop/queue-spec": "^0.5.3@dev",
-        "symfony/dependency-injection": "^2.8|^3",
-        "symfony/config": "^2.8|^3"
+        "symfony/dependency-injection": "^2.8|^3|^4",
+        "symfony/config": "^2.8|^3|^4"
     },
     "autoload": {
         "psr-4": { "Enqueue\\Gps\\": "" },
diff --git a/pkg/job-queue/Tests/Functional/app/AppKernel.php b/pkg/job-queue/Tests/Functional/app/AppKernel.php
index ce21df0b8..0d60c665f 100644
--- a/pkg/job-queue/Tests/Functional/app/AppKernel.php
+++ b/pkg/job-queue/Tests/Functional/app/AppKernel.php
@@ -44,6 +44,21 @@ public function registerContainerConfiguration(LoaderInterface $loader)
         $loader->load(__DIR__.'/config/config.yml');
     }
 
+    protected function getKernelParameters()
+    {
+        $parameters = parent::getKernelParameters();
+
+        // it works in all Symfony version, 2.8, 3.x, 4.x
+        $parameters['db.driver'] = getenv('DOCTRINE_DRIVER');
+        $parameters['db.host'] = getenv('DOCTRINE_HOST');
+        $parameters['db.port'] = getenv('DOCTRINE_PORT');
+        $parameters['db.name'] = getenv('DOCTRINE_DB_NAME');
+        $parameters['db.user'] = getenv('DOCTRINE_USER');
+        $parameters['db.password'] = getenv('DOCTRINE_PASSWORD');
+
+        return $parameters;
+    }
+
     protected function getContainerClass()
     {
         return parent::getContainerClass().'JobQueue';
diff --git a/pkg/job-queue/composer.json b/pkg/job-queue/composer.json
index 89d975736..8bf91d18f 100644
--- a/pkg/job-queue/composer.json
+++ b/pkg/job-queue/composer.json
@@ -7,7 +7,7 @@
     "license": "MIT",
     "require": {
         "php": ">=5.6",
-        "symfony/framework-bundle": "^2.8|^3",
+        "symfony/framework-bundle": "^2.8|^3|^4",
         "enqueue/enqueue": "^0.8@dev",
         "enqueue/null": "^0.8@dev",
         "doctrine/orm": "~2.4"
@@ -16,8 +16,8 @@
         "phpunit/phpunit": "~5.5",
         "enqueue/test": "^0.8@dev",
         "doctrine/doctrine-bundle": "~1.2",
-        "symfony/browser-kit": "^2.8|^3",
-        "symfony/expression-language": "^2.8|^3"
+        "symfony/browser-kit": "^2.8|^3|^4",
+        "symfony/expression-language": "^2.8|^3|^4"
     },
     "autoload": {
         "psr-4": { "Enqueue\\JobQueue\\": "" },
diff --git a/pkg/null/Symfony/NullTransportFactory.php b/pkg/null/Symfony/NullTransportFactory.php
index 2784405d0..7d70b8426 100644
--- a/pkg/null/Symfony/NullTransportFactory.php
+++ b/pkg/null/Symfony/NullTransportFactory.php
@@ -66,7 +66,9 @@ public function createContext(ContainerBuilder $container, array $config)
         $factoryId = sprintf('enqueue.transport.%s.connection_factory', $this->getName());
 
         $contextId = sprintf('enqueue.transport.%s.context', $this->getName());
+
         $context = new Definition(NullContext::class);
+        $context->setPublic(true);
         $context->setFactory([new Reference($factoryId), 'createContext']);
 
         $container->setDefinition($contextId, $context);
@@ -80,6 +82,7 @@ public function createContext(ContainerBuilder $container, array $config)
     public function createDriver(ContainerBuilder $container, array $config)
     {
         $driver = new Definition(NullDriver::class);
+        $driver->setPublic(true);
         $driver->setArguments([
             new Reference(sprintf('enqueue.transport.%s.context', $this->getName())),
             new Reference('enqueue.client.config'),
diff --git a/pkg/null/composer.json b/pkg/null/composer.json
index 4bc6d4fc7..e100496ee 100644
--- a/pkg/null/composer.json
+++ b/pkg/null/composer.json
@@ -14,8 +14,8 @@
         "enqueue/enqueue": "^0.8@dev",
         "enqueue/test": "^0.8@dev",
         "queue-interop/queue-spec": "^0.5.3@dev",
-        "symfony/dependency-injection": "^2.8|^3",
-        "symfony/config": "^2.8|^3"
+        "symfony/dependency-injection": "^2.8|^3|^4",
+        "symfony/config": "^2.8|^3|^4"
     },
     "autoload": {
         "psr-4": { "Enqueue\\Null\\": "" },
diff --git a/pkg/pheanstalk/composer.json b/pkg/pheanstalk/composer.json
index 13e23919d..a24699b49 100644
--- a/pkg/pheanstalk/composer.json
+++ b/pkg/pheanstalk/composer.json
@@ -16,8 +16,8 @@
         "enqueue/enqueue": "^0.8@dev",
         "enqueue/null": "^0.8@dev",
         "queue-interop/queue-spec": "^0.5.3@dev",
-        "symfony/dependency-injection": "^2.8|^3",
-        "symfony/config": "^2.8|^3"
+        "symfony/dependency-injection": "^2.8|^3|^4",
+        "symfony/config": "^2.8|^3|^4"
     },
     "autoload": {
         "psr-4": { "Enqueue\\Pheanstalk\\": "" },
diff --git a/pkg/redis/Symfony/RedisTransportFactory.php b/pkg/redis/Symfony/RedisTransportFactory.php
index df4f462d9..5fcbe7603 100644
--- a/pkg/redis/Symfony/RedisTransportFactory.php
+++ b/pkg/redis/Symfony/RedisTransportFactory.php
@@ -90,6 +90,7 @@ public function createContext(ContainerBuilder $container, array $config)
         $factoryId = sprintf('enqueue.transport.%s.connection_factory', $this->getName());
 
         $context = new Definition(RedisContext::class);
+        $context->setPublic(true);
         $context->setFactory([new Reference($factoryId), 'createContext']);
 
         $contextId = sprintf('enqueue.transport.%s.context', $this->getName());
@@ -104,6 +105,7 @@ public function createContext(ContainerBuilder $container, array $config)
     public function createDriver(ContainerBuilder $container, array $config)
     {
         $driver = new Definition(RedisDriver::class);
+        $driver->setPublic(true);
         $driver->setArguments([
             new Reference(sprintf('enqueue.transport.%s.context', $this->getName())),
             new Reference('enqueue.client.config'),
diff --git a/pkg/redis/composer.json b/pkg/redis/composer.json
index 73981b5c0..26f6dce96 100644
--- a/pkg/redis/composer.json
+++ b/pkg/redis/composer.json
@@ -16,8 +16,8 @@
         "enqueue/enqueue": "^0.8@dev",
         "enqueue/null": "^0.8@dev",
         "queue-interop/queue-spec": "^0.5.3@dev",
-        "symfony/dependency-injection": "^2.8|^3",
-        "symfony/config": "^2.8|^3"
+        "symfony/dependency-injection": "^2.8|^3|^4",
+        "symfony/config": "^2.8|^3|^4"
     },
     "autoload": {
         "psr-4": { "Enqueue\\Redis\\": "" },
diff --git a/pkg/simple-client/SimpleClientContainerExtension.php b/pkg/simple-client/SimpleClientContainerExtension.php
index f10a7b186..7bcb849cf 100644
--- a/pkg/simple-client/SimpleClientContainerExtension.php
+++ b/pkg/simple-client/SimpleClientContainerExtension.php
@@ -18,6 +18,7 @@
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\NodeInterface;
 use Symfony\Component\Config\Definition\Processor;
+use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Reference;
@@ -79,6 +80,7 @@ public function load(array $configs, ContainerBuilder $container)
         ;
 
         $container->register('enqueue.client.config', Config::class)
+            ->setPublic(true)
             ->setArguments([
                 $config['client']['prefix'],
                 $config['client']['app_name'],
@@ -90,33 +92,38 @@ public function load(array $configs, ContainerBuilder $container)
         ]);
 
         $container->register('enqueue.client.rpc_factory', RpcFactory::class)
+            ->setPublic(true)
             ->setArguments([
                 new Reference('enqueue.transport.context'),
             ]);
 
         $container->register('enqueue.client.producer', Producer::class)
+            ->setPublic(true)
             ->setArguments([
                 new Reference('enqueue.client.driver'),
                 new Reference('enqueue.client.rpc_factory'),
         ]);
 
-        $container->setAlias('enqueue.client.producer_v2', 'enqueue.client.producer');
+        $container->setAlias('enqueue.client.producer_v2', new Alias('enqueue.client.producer', true));
 
         $container->register('enqueue.client.meta.topic_meta_registry', TopicMetaRegistry::class)
+            ->setPublic(true)
             ->setArguments([[]]);
 
         $container->register('enqueue.client.meta.queue_meta_registry', QueueMetaRegistry::class)
-            ->setArguments([
-                new Reference('enqueue.client.config'),
-                [],
-        ]);
+            ->setPublic(true)
+            ->setArguments([new Reference('enqueue.client.config'), []]);
 
-        $container->register('enqueue.client.processor_registry', ArrayProcessorRegistry::class);
+        $container->register('enqueue.client.processor_registry', ArrayProcessorRegistry::class)
+            ->setPublic(true)
+        ;
 
         $container->register('enqueue.client.delegate_processor', DelegateProcessor::class)
+            ->setPublic(true)
             ->setArguments([new Reference('enqueue.client.processor_registry')]);
 
         $container->register('enqueue.client.queue_consumer', QueueConsumer::class)
+            ->setPublic(true)
             ->setArguments([
                 new Reference('enqueue.transport.context'),
                 new Reference('enqueue.consumption.extensions'),
@@ -124,6 +131,7 @@ public function load(array $configs, ContainerBuilder $container)
 
         // router
         $container->register('enqueue.client.router_processor', RouterProcessor::class)
+            ->setPublic(true)
             ->setArguments([new Reference('enqueue.client.driver'), []]);
         $container->getDefinition('enqueue.client.processor_registry')
             ->addMethodCall('add', ['enqueue.client.router_processor', new Reference('enqueue.client.router_processor')]);
@@ -134,6 +142,7 @@ public function load(array $configs, ContainerBuilder $container)
         $extensions = [];
         if ($config['client']['redelivered_delay_time']) {
             $container->register('enqueue.client.delay_redelivered_message_extension', DelayRedeliveredMessageExtension::class)
+                ->setPublic(true)
                 ->setArguments([
                     new Reference('enqueue.client.driver'),
                     $config['client']['redelivered_delay_time'],
@@ -143,11 +152,13 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         $container->register('enqueue.client.extension.set_router_properties', SetRouterPropertiesExtension::class)
+            ->setPublic(true)
             ->setArguments([new Reference('enqueue.client.driver')]);
 
         $extensions[] = new Reference('enqueue.client.extension.set_router_properties');
 
         $container->register('enqueue.consumption.extensions', ConsumptionChainExtension::class)
+            ->setPublic(true)
             ->setArguments([$extensions]);
     }
 
diff --git a/pkg/simple-client/Tests/Functional/SimpleClientTest.php b/pkg/simple-client/Tests/Functional/SimpleClientTest.php
index 3281aa274..cedbd11ff 100644
--- a/pkg/simple-client/Tests/Functional/SimpleClientTest.php
+++ b/pkg/simple-client/Tests/Functional/SimpleClientTest.php
@@ -22,7 +22,7 @@ class SimpleClientTest extends TestCase
 
     public function setUp()
     {
-        if (false == getenv('SYMFONY__RABBITMQ__HOST')) {
+        if (false == getenv('RABBITMQ_HOST')) {
             throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment');
         }
 
@@ -36,11 +36,11 @@ public function transportConfigDataProvider()
                 'default' => 'amqp',
                 'amqp' => [
                     'driver' => 'ext',
-                    'host' => getenv('SYMFONY__RABBITMQ__HOST'),
-                    'port' => getenv('SYMFONY__RABBITMQ__AMQP__PORT'),
-                    'user' => getenv('SYMFONY__RABBITMQ__USER'),
-                    'pass' => getenv('SYMFONY__RABBITMQ__PASSWORD'),
-                    'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'),
+                    'host' => getenv('RABBITMQ_HOST'),
+                    'port' => getenv('RABBITMQ_AMQP__PORT'),
+                    'user' => getenv('RABBITMQ_USER'),
+                    'pass' => getenv('RABBITMQ_PASSWORD'),
+                    'vhost' => getenv('RABBITMQ_VHOST'),
                 ],
             ],
         ]];
@@ -65,11 +65,11 @@ public function transportConfigDataProvider()
                 'default' => 'rabbitmq_amqp',
                 'rabbitmq_amqp' => [
                     'driver' => 'ext',
-                    'host' => getenv('SYMFONY__RABBITMQ__HOST'),
-                    'port' => getenv('SYMFONY__RABBITMQ__AMQP__PORT'),
-                    'user' => getenv('SYMFONY__RABBITMQ__USER'),
-                    'pass' => getenv('SYMFONY__RABBITMQ__PASSWORD'),
-                    'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'),
+                    'host' => getenv('RABBITMQ_HOST'),
+                    'port' => getenv('RABBITMQ_AMQP__PORT'),
+                    'user' => getenv('RABBITMQ_USER'),
+                    'pass' => getenv('RABBITMQ_PASSWORD'),
+                    'vhost' => getenv('RABBITMQ_VHOST'),
                 ],
             ],
         ]];
diff --git a/pkg/simple-client/composer.json b/pkg/simple-client/composer.json
index 244a20620..8a781d651 100644
--- a/pkg/simple-client/composer.json
+++ b/pkg/simple-client/composer.json
@@ -8,9 +8,9 @@
     "require": {
         "php": ">=5.6",
         "enqueue/enqueue": "^0.8@dev",
-        "symfony/dependency-injection": "^2.8|^3",
-        "symfony/config": "^2.8|^3",
-        "symfony/console": "^2.8|^3"
+        "symfony/dependency-injection": "^2.8|^3|^4",
+        "symfony/config": "^2.8|^3|^4",
+        "symfony/console": "^2.8|^3|^4"
     },
     "require-dev": {
         "phpunit/phpunit": "~5.5",
diff --git a/pkg/sqs/Symfony/SqsTransportFactory.php b/pkg/sqs/Symfony/SqsTransportFactory.php
index c2ce2a304..e5f843a48 100644
--- a/pkg/sqs/Symfony/SqsTransportFactory.php
+++ b/pkg/sqs/Symfony/SqsTransportFactory.php
@@ -69,6 +69,7 @@ public function createContext(ContainerBuilder $container, array $config)
         $factoryId = sprintf('enqueue.transport.%s.connection_factory', $this->getName());
 
         $context = new Definition(SqsContext::class);
+        $context->setPublic(true);
         $context->setFactory([new Reference($factoryId), 'createContext']);
 
         $contextId = sprintf('enqueue.transport.%s.context', $this->getName());
@@ -83,6 +84,7 @@ public function createContext(ContainerBuilder $container, array $config)
     public function createDriver(ContainerBuilder $container, array $config)
     {
         $driver = new Definition(SqsDriver::class);
+        $driver->setPublic(true);
         $driver->setArguments([
             new Reference(sprintf('enqueue.transport.%s.context', $this->getName())),
             new Reference('enqueue.client.config'),
diff --git a/pkg/sqs/composer.json b/pkg/sqs/composer.json
index c684733c5..5965b56ff 100644
--- a/pkg/sqs/composer.json
+++ b/pkg/sqs/composer.json
@@ -15,8 +15,8 @@
         "enqueue/test": "^0.8@dev",
         "enqueue/enqueue": "^0.8@dev",
         "queue-interop/queue-spec": "^0.5.3@dev",
-        "symfony/dependency-injection": "^2.8|^3",
-        "symfony/config": "^2.8|^3"
+        "symfony/dependency-injection": "^2.8|^3|^4",
+        "symfony/config": "^2.8|^3|^4"
     },
     "autoload": {
         "psr-4": { "Enqueue\\Sqs\\": "" },
diff --git a/pkg/sqs/examples/consume.php b/pkg/sqs/examples/consume.php
index a8914d165..a63f41fba 100644
--- a/pkg/sqs/examples/consume.php
+++ b/pkg/sqs/examples/consume.php
@@ -18,9 +18,9 @@
 use Enqueue\Sqs\SqsConnectionFactory;
 
 $config = [
-    'key' => getenv('AWS__SQS__KEY'),
-    'secret' => getenv('AWS__SQS__SECRET'),
-    'region' => getenv('AWS__SQS__REGION'),
+    'key' => getenv('AWS_SQS_KEY'),
+    'secret' => getenv('AWS_SQS_SECRET'),
+    'region' => getenv('AWS_SQS_REGION'),
 ];
 
 $factory = new SqsConnectionFactory($config);
diff --git a/pkg/sqs/examples/produce.php b/pkg/sqs/examples/produce.php
index 878ba00a4..cb1a4d8e6 100644
--- a/pkg/sqs/examples/produce.php
+++ b/pkg/sqs/examples/produce.php
@@ -18,9 +18,9 @@
 use Enqueue\Sqs\SqsConnectionFactory;
 
 $config = [
-    'key' => getenv('AWS__SQS__KEY'),
-    'secret' => getenv('AWS__SQS__SECRET'),
-    'region' => getenv('AWS__SQS__REGION'),
+    'key' => getenv('AWS_SQS_KEY'),
+    'secret' => getenv('AWS_SQS_SECRET'),
+    'region' => getenv('AWS_SQS_REGION'),
 ];
 
 $factory = new SqsConnectionFactory($config);
diff --git a/pkg/stomp/Symfony/RabbitMqStompTransportFactory.php b/pkg/stomp/Symfony/RabbitMqStompTransportFactory.php
index 48bbb719d..38b43b693 100644
--- a/pkg/stomp/Symfony/RabbitMqStompTransportFactory.php
+++ b/pkg/stomp/Symfony/RabbitMqStompTransportFactory.php
@@ -59,6 +59,7 @@ public function createDriver(ContainerBuilder $container, array $config)
         $container->setDefinition($managementId, $management);
 
         $driver = new Definition(RabbitMqStompDriver::class);
+        $driver->setPublic(true);
         $driver->setArguments([
             new Reference(sprintf('enqueue.transport.%s.context', $this->getName())),
             new Reference('enqueue.client.config'),
diff --git a/pkg/stomp/Symfony/StompTransportFactory.php b/pkg/stomp/Symfony/StompTransportFactory.php
index 6144dd6d8..235752cdd 100644
--- a/pkg/stomp/Symfony/StompTransportFactory.php
+++ b/pkg/stomp/Symfony/StompTransportFactory.php
@@ -68,6 +68,7 @@ public function createContext(ContainerBuilder $container, array $config)
         $factoryId = sprintf('enqueue.transport.%s.connection_factory', $this->getName());
 
         $context = new Definition(StompContext::class);
+        $context->setPublic(true);
         $context->setFactory([new Reference($factoryId), 'createContext']);
 
         $contextId = sprintf('enqueue.transport.%s.context', $this->getName());
@@ -82,6 +83,7 @@ public function createContext(ContainerBuilder $container, array $config)
     public function createDriver(ContainerBuilder $container, array $config)
     {
         $driver = new Definition(StompDriver::class);
+        $driver->setPublic(true);
         $driver->setArguments([
             new Reference(sprintf('enqueue.transport.%s.context', $this->getName())),
             new Reference('enqueue.client.config'),
diff --git a/pkg/stomp/composer.json b/pkg/stomp/composer.json
index 8b680e77b..52f0ef57d 100644
--- a/pkg/stomp/composer.json
+++ b/pkg/stomp/composer.json
@@ -10,6 +10,7 @@
         "stomp-php/stomp-php": "^4",
         "queue-interop/queue-interop": "^0.6@dev",
         "php-http/guzzle6-adapter": "^1.1",
+        "php-http/client-common": "^1.7@dev",
         "richardfullmer/rabbitmq-management-api": "^2.0"
     },
     "require-dev": {
@@ -18,8 +19,8 @@
         "enqueue/enqueue": "^0.8@dev",
         "enqueue/null": "^0.8@dev",
         "queue-interop/queue-spec": "^0.5.3@dev",
-        "symfony/dependency-injection": "^2.8|^3",
-        "symfony/config": "^2.8|^3"
+        "symfony/dependency-injection": "^2.8|^3|^4",
+        "symfony/config": "^2.8|^3|^4"
     },
     "autoload": {
         "psr-4": { "Enqueue\\Stomp\\": "" },
diff --git a/pkg/stomp/examples/consume.php b/pkg/stomp/examples/consume.php
index 36d9e5a34..f6cc2fdff 100644
--- a/pkg/stomp/examples/consume.php
+++ b/pkg/stomp/examples/consume.php
@@ -19,11 +19,11 @@
 use Stomp\Exception\ErrorFrameException;
 
 $config = [
-    'host' => getenv('SYMFONY__RABBITMQ__HOST'),
-    'port' => getenv('SYMFONY__RABBITMQ__STOMP__PORT'),
-    'login' => getenv('SYMFONY__RABBITMQ__USER'),
-    'password' => getenv('SYMFONY__RABBITMQ__PASSWORD'),
-    'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'),
+    'host' => getenv('RABBITMQ_HOST'),
+    'port' => getenv('RABBITMQ_STOMP_PORT'),
+    'login' => getenv('RABBITMQ_USER'),
+    'password' => getenv('RABBITMQ_PASSWORD'),
+    'vhost' => getenv('RABBITMQ_VHOST'),
     'sync' => true,
 ];
 
diff --git a/pkg/stomp/examples/publish.php b/pkg/stomp/examples/publish.php
index 47985885c..a320a40a6 100644
--- a/pkg/stomp/examples/publish.php
+++ b/pkg/stomp/examples/publish.php
@@ -19,11 +19,11 @@
 use Stomp\Exception\ErrorFrameException;
 
 $config = [
-    'host' => getenv('SYMFONY__RABBITMQ__HOST'),
-    'port' => getenv('SYMFONY__RABBITMQ__STOMP__PORT'),
-    'login' => getenv('SYMFONY__RABBITMQ__USER'),
-    'password' => getenv('SYMFONY__RABBITMQ__PASSWORD'),
-    'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'),
+    'host' => getenv('RABBITMQ_HOST'),
+    'port' => getenv('RABBITMQ_STOMP_PORT'),
+    'login' => getenv('RABBITMQ_USER'),
+    'password' => getenv('RABBITMQ_PASSWORD'),
+    'vhost' => getenv('RABBITMQ_VHOST'),
     'sync' => true,
 ];
 
diff --git a/pkg/test/RabbitmqAmqpExtension.php b/pkg/test/RabbitmqAmqpExtension.php
index ad698fcfe..1a4da0e90 100644
--- a/pkg/test/RabbitmqAmqpExtension.php
+++ b/pkg/test/RabbitmqAmqpExtension.php
@@ -12,16 +12,16 @@ trait RabbitmqAmqpExtension
      */
     private function buildAmqpContext()
     {
-        if (false == getenv('SYMFONY__RABBITMQ__HOST')) {
+        if (false == getenv('RABBITMQ_HOST')) {
             throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment');
         }
 
         $config = [
-            'host' => getenv('SYMFONY__RABBITMQ__HOST'),
-            'port' => getenv('SYMFONY__RABBITMQ__AMQP__PORT'),
-            'user' => getenv('SYMFONY__RABBITMQ__USER'),
-            'pass' => getenv('SYMFONY__RABBITMQ__PASSWORD'),
-            'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'),
+            'host' => getenv('RABBITMQ_HOST'),
+            'port' => getenv('RABBITMQ_AMQP__PORT'),
+            'user' => getenv('RABBITMQ_USER'),
+            'pass' => getenv('RABBITMQ_PASSWORD'),
+            'vhost' => getenv('RABBITMQ_VHOST'),
         ];
 
         return (new AmqpConnectionFactory($config))->createContext();
diff --git a/pkg/test/RabbitmqManagmentExtensionTrait.php b/pkg/test/RabbitmqManagmentExtensionTrait.php
index b7c4a4440..660e20d58 100644
--- a/pkg/test/RabbitmqManagmentExtensionTrait.php
+++ b/pkg/test/RabbitmqManagmentExtensionTrait.php
@@ -9,10 +9,10 @@ trait RabbitmqManagmentExtensionTrait
      */
     private function removeQueue($queueName)
     {
-        $rabbitmqHost = getenv('SYMFONY__RABBITMQ__HOST');
-        $rabbitmqUser = getenv('SYMFONY__RABBITMQ__USER');
-        $rabbitmqPassword = getenv('SYMFONY__RABBITMQ__PASSWORD');
-        $rabbitmqVhost = getenv('SYMFONY__RABBITMQ__VHOST');
+        $rabbitmqHost = getenv('RABBITMQ_HOST');
+        $rabbitmqUser = getenv('RABBITMQ_USER');
+        $rabbitmqPassword = getenv('RABBITMQ_PASSWORD');
+        $rabbitmqVhost = getenv('RABBITMQ_VHOST');
 
         $url = sprintf(
             'http://%s:15672/api/queues/%s/%s',
@@ -46,10 +46,10 @@ private function removeQueue($queueName)
      */
     private function removeExchange($exchangeName)
     {
-        $rabbitmqHost = getenv('SYMFONY__RABBITMQ__HOST');
-        $rabbitmqUser = getenv('SYMFONY__RABBITMQ__USER');
-        $rabbitmqPassword = getenv('SYMFONY__RABBITMQ__PASSWORD');
-        $rabbitmqVhost = getenv('SYMFONY__RABBITMQ__VHOST');
+        $rabbitmqHost = getenv('RABBITMQ_HOST');
+        $rabbitmqUser = getenv('RABBITMQ_USER');
+        $rabbitmqPassword = getenv('RABBITMQ_PASSWORD');
+        $rabbitmqVhost = getenv('RABBITMQ_VHOST');
 
         $url = sprintf(
             'http://%s:15672/api/exchanges/%s/%s',
diff --git a/pkg/test/RabbitmqStompExtension.php b/pkg/test/RabbitmqStompExtension.php
index ce3b80312..ae2bf4bda 100644
--- a/pkg/test/RabbitmqStompExtension.php
+++ b/pkg/test/RabbitmqStompExtension.php
@@ -12,16 +12,16 @@ trait RabbitmqStompExtension
      */
     private function buildStompContext()
     {
-        if (false == getenv('SYMFONY__RABBITMQ__HOST')) {
+        if (false == getenv('RABBITMQ_HOST')) {
             throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment');
         }
 
         $config = [
-            'host' => getenv('SYMFONY__RABBITMQ__HOST'),
-            'port' => getenv('SYMFONY__RABBITMQ__STOMP__PORT'),
-            'login' => getenv('SYMFONY__RABBITMQ__USER'),
-            'password' => getenv('SYMFONY__RABBITMQ__PASSWORD'),
-            'vhost' => getenv('SYMFONY__RABBITMQ__VHOST'),
+            'host' => getenv('RABBITMQ_HOST'),
+            'port' => getenv('RABBITMQ_STOMP_PORT'),
+            'login' => getenv('RABBITMQ_USER'),
+            'password' => getenv('RABBITMQ_PASSWORD'),
+            'vhost' => getenv('RABBITMQ_VHOST'),
             'sync' => true,
         ];
 
diff --git a/pkg/test/RedisExtension.php b/pkg/test/RedisExtension.php
index 9b98c5443..0740c8f21 100644
--- a/pkg/test/RedisExtension.php
+++ b/pkg/test/RedisExtension.php
@@ -12,13 +12,13 @@ trait RedisExtension
      */
     private function buildPhpRedisContext()
     {
-        if (false == getenv('SYMFONY__REDIS__HOST')) {
+        if (false == getenv('REDIS_HOST')) {
             throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment');
         }
 
         $config = [
-            'host' => getenv('SYMFONY__REDIS__HOST'),
-            'port' => getenv('SYMFONY__REDIS__PORT'),
+            'host' => getenv('REDIS_HOST'),
+            'port' => getenv('REDIS_PORT'),
             'vendor' => 'phpredis',
             'lazy' => false,
         ];
@@ -31,13 +31,13 @@ private function buildPhpRedisContext()
      */
     private function buildPRedisContext()
     {
-        if (false == getenv('SYMFONY__REDIS__HOST')) {
+        if (false == getenv('REDIS_HOST')) {
             throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment');
         }
 
         $config = [
-            'host' => getenv('SYMFONY__REDIS__HOST'),
-            'port' => getenv('SYMFONY__REDIS__PORT'),
+            'host' => getenv('REDIS_HOST'),
+            'port' => getenv('REDIS_PORT'),
             'vendor' => 'predis',
             'lazy' => false,
         ];
diff --git a/pkg/test/SqsExtension.php b/pkg/test/SqsExtension.php
index 530b0e988..4446c3346 100644
--- a/pkg/test/SqsExtension.php
+++ b/pkg/test/SqsExtension.php
@@ -12,14 +12,14 @@ trait SqsExtension
      */
     private function buildSqsContext()
     {
-        if (false == getenv('AWS__SQS__KEY')) {
+        if (false == getenv('AWS_SQS_KEY')) {
             throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment');
         }
 
         $config = [
-            'key' => getenv('AWS__SQS__KEY'),
-            'secret' => getenv('AWS__SQS__SECRET'),
-            'region' => getenv('AWS__SQS__REGION'),
+            'key' => getenv('AWS_SQS_KEY'),
+            'secret' => getenv('AWS_SQS_SECRET'),
+            'region' => getenv('AWS_SQS_REGION'),
             'lazy' => false,
         ];