diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml
index 848a9c5306..632f7dc4d5 100644
--- a/docker/services/nova-api.yaml
+++ b/docker/services/nova-api.yaml
@@ -238,14 +238,14 @@ outputs:
                 TRANSPORTURL:
                   list_join:
                   - ''
-                  - - 'rabbit'
+                  - - '$(hiera -c /etc/puppet/hiera.yaml oslo_messaging_rpc_scheme rabbit)'
                     - '://'
                     - '{username}'
                     - ':'
                     - '{password}'
                     - '@'
                     - '{hostname}'
-                    - ':5672'
+                    - ':$(hiera -c /etc/puppet/hiera.yaml oslo_messaging_rpc_port 5672)'
                     - '/'
                     - '?'
                     - '{query}'
@@ -493,7 +493,7 @@ outputs:
             - name: Setup cell_v2 (map cell0)
               shell:
                 str_replace:
-                  template: nova-manage cell_v2 map_cell0 --database_connection='CELL0DB' --transport-url='TRANSPORTURL'
+                  template: nova-manage cell_v2 map_cell0 --database_connection='CELL0DB' --transport-url="'TRANSPORTURL'"
                   params:
                     CELL0DB:
                       list_join:
@@ -516,14 +516,14 @@ outputs:
                     TRANSPORTURL:
                       list_join:
                       - ''
-                      - - 'rabbit'
+                      - - '$(hiera -c /etc/puppet/hiera.yaml oslo_messaging_rpc_scheme rabbit)'
                         - '://'
                         - '{username}'
                         - ':'
                         - '{password}'
                         - '@'
                         - '{hostname}'
-                        - ':5672'
+                        - ':$(hiera -c /etc/puppet/hiera.yaml oslo_messaging_rpc_port 5672)'
                         - '/'
                         - '?'
                         - '{query}'