diff --git a/devstack/lib/zun b/devstack/lib/zun
index bb2a7e71a..6e651431e 100644
--- a/devstack/lib/zun
+++ b/devstack/lib/zun
@@ -183,9 +183,7 @@ function create_zun_conf {
     iniset $ZUN_CONF DEFAULT default_cpu 0
     iniset $ZUN_CONF DEFAULT default_memory 0
     iniset $ZUN_CONF DEFAULT default_disk 0
-    iniset $ZUN_CONF oslo_messaging_rabbit rabbit_userid $RABBIT_USERID
-    iniset $ZUN_CONF oslo_messaging_rabbit rabbit_password $RABBIT_PASSWORD
-    iniset $ZUN_CONF oslo_messaging_rabbit rabbit_host $RABBIT_HOST
+    iniset_rpc_backend zun $ZUN_CONF
     iniset $ZUN_CONF database connection `database_connection_url zun`
     iniset $ZUN_CONF etcd etcd_host "$SERVICE_HOST"
     iniset $ZUN_CONF etcd etcd_port "$ZUN_ETCD_PORT"