diff --git a/enqueue/amqp-ext/0.3/etc/packages/enqueue_amqp.yaml b/enqueue/amqp-ext/0.3/etc/packages/enqueue_amqp.yaml
deleted file mode 100644
index 6875e25f..00000000
--- a/enqueue/amqp-ext/0.3/etc/packages/enqueue_amqp.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-enqueue:
-    transport:
-        default: 'amqp'
-        amqp:
-            host: '%env(ENQUEUE_AMQP_HOST)%'
-            port: '%env(ENQUEUE_AMQP_PORT)%'
-            login: '%env(ENQUEUE_AMQP_LOGIN)%'
-            password: '%env(ENQUEUE_AMQP_PASSWORD)%'
-            vhost: '%env(ENQUEUE_AMQP_VHOST)%'
-
-#        If you use RabbitMQ broker you can replace amqp transport with this one. It enables specific features like priorities, delays.
-#        default: 'rabbitmq_amqp'
-#        rabbitmq_amqp:
-#
-#            host: '%env(ENQUEUE_AMQP_HOST)%'
-#            port: '%env(ENQUEUE_AMQP_PORT)%'
-#            login: '%env(ENQUEUE_AMQP_LOGIN)%'
-#            password: '%env(ENQUEUE_AMQP_PASSWORD)%'
-#            vhost: '%env(ENQUEUE_AMQP_VHOST)%'
-#
-#            # The option tells whether RabbitMQ broker has delay plugin installed or not
-#            delay_plugin_installed: false
-
diff --git a/enqueue/amqp-ext/0.3/manifest.json b/enqueue/amqp-ext/0.3/manifest.json
deleted file mode 100644
index 8176ff38..00000000
--- a/enqueue/amqp-ext/0.3/manifest.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "copy-from-recipe": {
-        "etc/": "%ETC_DIR%/"
-    },
-    "env": {
-        "ENQUEUE_AMQP_HOST": "localhost",
-        "ENQUEUE_AMQP_PORT": "5672",
-        "ENQUEUE_AMQP_LOGIN": "guest",
-        "ENQUEUE_AMQP_PASSWORD": "guest",
-        "ENQUEUE_AMQP_VHOST": "/"
-    }
-}
diff --git a/enqueue/amqp-ext/0.4/etc/packages/enqueue_amqp.yaml b/enqueue/amqp-ext/0.4/etc/packages/enqueue_amqp.yaml
new file mode 100644
index 00000000..e98e17b7
--- /dev/null
+++ b/enqueue/amqp-ext/0.4/etc/packages/enqueue_amqp.yaml
@@ -0,0 +1,7 @@
+enqueue:
+    transport:
+        default: 'amqp'
+
+        # If you use RabbitMQ broker rename "amqp" with "rabbitmq_amqp" and the bundle will enable specific features"
+        amqp: '%env(ENQUEUE_AMQP_DSN)%'
+
diff --git a/enqueue/amqp-ext/0.4/manifest.json b/enqueue/amqp-ext/0.4/manifest.json
new file mode 100644
index 00000000..cb6a9a6e
--- /dev/null
+++ b/enqueue/amqp-ext/0.4/manifest.json
@@ -0,0 +1,8 @@
+{
+    "copy-from-recipe": {
+        "etc/": "%ETC_DIR%/"
+    },
+    "env": {
+        "ENQUEUE_AMQP_DSN": "amqp://"
+    }
+}
diff --git a/enqueue/enqueue-bundle/0.3/Makefile b/enqueue/enqueue-bundle/0.3/Makefile
deleted file mode 100644
index f70b3658..00000000
--- a/enqueue/enqueue-bundle/0.3/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-consume:
-	@test -f bin/console && bin/console enqueue:consume --setup-broker || echo "cannot consume messages (needs symfony/console)"
-.PHONY: consume
diff --git a/enqueue/enqueue-bundle/0.3/etc/packages/test/enqueue.yaml b/enqueue/enqueue-bundle/0.4/etc/packages/test/enqueue.yaml
similarity index 100%
rename from enqueue/enqueue-bundle/0.3/etc/packages/test/enqueue.yaml
rename to enqueue/enqueue-bundle/0.4/etc/packages/test/enqueue.yaml
diff --git a/enqueue/enqueue-bundle/0.3/manifest.json b/enqueue/enqueue-bundle/0.4/manifest.json
similarity index 100%
rename from enqueue/enqueue-bundle/0.3/manifest.json
rename to enqueue/enqueue-bundle/0.4/manifest.json
diff --git a/enqueue/fs/0.3/etc/packages/enqueue_fs.yaml b/enqueue/fs/0.3/etc/packages/enqueue_fs.yaml
deleted file mode 100644
index c9a29915..00000000
--- a/enqueue/fs/0.3/etc/packages/enqueue_fs.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-enqueue:
-    transport:
-        default: 'fs'
-        fs:
-            store_dir: '%env(ENQUEUE_FS_STORAGE)%'
diff --git a/enqueue/fs/0.4/etc/packages/enqueue_fs.yaml b/enqueue/fs/0.4/etc/packages/enqueue_fs.yaml
new file mode 100644
index 00000000..5c0fcf1c
--- /dev/null
+++ b/enqueue/fs/0.4/etc/packages/enqueue_fs.yaml
@@ -0,0 +1,4 @@
+enqueue:
+    transport:
+        default: 'fs'
+        fs: '%env(ENQUEUE_FS_DSN)%'
diff --git a/enqueue/fs/0.3/manifest.json b/enqueue/fs/0.4/manifest.json
similarity index 70%
rename from enqueue/fs/0.3/manifest.json
rename to enqueue/fs/0.4/manifest.json
index d204496a..1f9b7b67 100644
--- a/enqueue/fs/0.3/manifest.json
+++ b/enqueue/fs/0.4/manifest.json
@@ -4,6 +4,6 @@
         "var/": "%VAR_DIR%"
     },
     "env": {
-        "ENQUEUE_FS_STORAGE": "%VAR_DIR%/queue"
+        "ENQUEUE_FS_DSN": "%VAR_DIR%/enqueue"
     }
 }
diff --git a/enqueue/fs/0.3/var/queue/.gitkeep b/enqueue/fs/0.4/var/enqueue/.gitkeep
similarity index 100%
rename from enqueue/fs/0.3/var/queue/.gitkeep
rename to enqueue/fs/0.4/var/enqueue/.gitkeep