diff --git a/CHANGELOG.md b/CHANGELOG.md
index a56e03a..1914ad0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.4.4]
+- Fix issue with AMQP >= 3.9.0 refusing to start with deprecated ENV variable names
+
 ## [1.4.3]
 ### Fixed
 - Issue resolve issue where newest version after 8.0.28-19.
diff --git a/templates/magento-2/.env.dev b/templates/magento-2/.env.dev
index 2b0d049..f10f8c1 100644
--- a/templates/magento-2/.env.dev
+++ b/templates/magento-2/.env.dev
@@ -52,11 +52,11 @@ NGINX_PHP_FPM_HOST=nginx-php-fpm
 NGINX_PHP_FPM_PORT=80
 
 # RabbitMQ
-RABBITMQ_HOST=amqp
-RABBITMQ_PORT=5672
-RABBITMQ_DEFAULT_USER=rabbitmq
-RABBITMQ_DEFAULT_PASS=rabbitmq
-RABBITMQ_DEFAULT_VHOST="/"
+RMQ_HOST=amqp
+RMQ_PORT=5672
+RMQ_DEFAULT_USER=rabbitmq
+RMQ_DEFAULT_PASS=rabbitmq
+RMQ_DEFAULT_VHOST="/"
 
 # Redis
 REDIS_HOST=redis
@@ -92,11 +92,11 @@ DB__CONNECTION__INDEXER__PASSWORD="${DB_PASS}"
 HTTPS_CACHE_HOSTS__0__HOST="${VARNISH_HOST}"
 HTTPS_CACHE_HOSTS__0__PORT="${VARNISH_PORT}"
 
-QUEUE__AMQP__HOST="${RABBITMQ_HOST}"
-QUEUE__AMQP__PORT="${RABBITMQ_PORT}"
-QUEUE__AMQP__USER="${RABBITMQ_DEFAULT_USER}"
-QUEUE__AMQP__PASSWORD="${RABBITMQ_DEFAULT_PASS}"
-QUEUE__AMQP__VIRTUALHOST="${RABBITMQ_DEFAULT_VHOST}"
+QUEUE__AMQP__HOST="${RMQ_HOST}"
+QUEUE__AMQP__PORT="${RMQ_PORT}"
+QUEUE__AMQP__USER="${RMQ_DEFAULT_USER}"
+QUEUE__AMQP__PASSWORD="${RMQ_DEFAULT_PASS}"
+QUEUE__AMQP__VIRTUALHOST="${RMQ_DEFAULT_VHOST}"
 
 SESSION__REDIS__HOST="${REDIS_HOST}"
 SESSION__REDIS__PORT="${REDIS_PORT}"
diff --git a/templates/magento-2/docker-compose.yml b/templates/magento-2/docker-compose.yml
index df5a3bd..1099cc9 100644
--- a/templates/magento-2/docker-compose.yml
+++ b/templates/magento-2/docker-compose.yml
@@ -91,14 +91,15 @@ services:
     networks:
       - backend
     environment:
-      - RABBITMQ_DEFAULT_USER
-      - RABBITMQ_DEFAULT_PASS
-      - RABBITMQ_DEFAULT_VHOST
+      - RMQ_DEFAULT_USER
+      - RMQ_DEFAULT_PASS
+      - RMQ_DEFAULT_VHOST
     ports:
       - "127.0.0.1:5672:5672"
       - "127.0.0.1:15672:15672"
     volumes:
       - amqp-data:/var/lib/rabbitmq/
+      - ./rabbitmq.conf:/etc/rabbitmq/conf.d/99-dev.conf:ro
 
   console:
     image: "eu.gcr.io/mct-deployments/magento-2-console-php${PHP_VERSION}:latest"
diff --git a/templates/magento-2/rabbitmq.conf b/templates/magento-2/rabbitmq.conf
new file mode 100644
index 0000000..b8b3305
--- /dev/null
+++ b/templates/magento-2/rabbitmq.conf
@@ -0,0 +1,3 @@
+default_vhost = $(RMQ_DEFAULT_VHOST)
+default_user = $(RMQ_DEFAULT_USER)
+default_pass = $(RMQ_DEFAULT_USER)