diff --git a/octavia/manager.sls b/octavia/manager.sls
index 8676f58..a348b70 100644
--- a/octavia/manager.sls
+++ b/octavia/manager.sls
@@ -6,7 +6,7 @@
   - octavia._ssl.mysql
   - octavia._ssl.rabbitmq
 {%- set ssh_dir = salt['file.dirname'](manager.ssh.private_key_file) %}
-{%- set image_mine_data = salt['mine.get']('glance:client', 'glanceng.get_image_owner_id', 'pillar').values() %}
+{%- set image_mine_data = salt['mine.get']('glance:client', 'octavia_amphora_image', 'pillar').values() %}
 {%- set network_mine_data = salt['mine.get']('neutron:client', 'list_octavia_networks', 'pillar').values() %}
 {%- set secgroup_mine_data = salt['mine.get']('neutron:client', 'list_octavia_mgmt_security_groups', 'pillar').values() %}
 {%- set port_mine_data = salt['mine.get']('neutron:client', 'list_octavia_hm_ports', 'pillar').values() %}
@@ -29,7 +29,7 @@
     - sls: octavia._ssl.mysql
     - sls: octavia._ssl.rabbitmq
   - context:
-    amp_image_owner_id: {{ image_mine_data|first }}
+    amp_image_owner_id: {{ (image_mine_data|first)['owner'] }}
     amp_boot_network_list: {{ (network_mine_data|first)['networks'][0]['id'] }}
     amp_secgroup_list: {{ (secgroup_mine_data|first)['lb-mgmt-sec-grp']['id'] }}
 {%- endif %}
diff --git a/octavia/upgrade/render_config.sls b/octavia/upgrade/render_config.sls
index 837657a..3cb5082 100644
--- a/octavia/upgrade/render_config.sls
+++ b/octavia/upgrade/render_config.sls
@@ -17,7 +17,7 @@
 
 {%- if manager.get('enabled', False) %}
 {%- set ssh_dir = salt['file.dirname'](manager.ssh.private_key_file) %}
-{%- set image_mine_data = salt['mine.get']('glance:client', 'glanceng.get_image_owner_id', 'pillar').values() %}
+{%- set image_mine_data = salt['mine.get']('glance:client', 'octavia_amphora_image', 'pillar').values() %}
 {%- set network_mine_data = salt['mine.get']('neutron:client', 'list_octavia_networks', 'pillar').values() %}
 {%- set secgroup_mine_data = salt['mine.get']('neutron:client', 'list_octavia_mgmt_security_groups', 'pillar').values() %}
 
@@ -27,7 +27,7 @@
   - source: salt://octavia/files/{{ manager.version }}/octavia_manager.conf
   - template: jinja
   - context:
-    amp_image_owner_id: {{ image_mine_data|first }}
+    amp_image_owner_id: {{ (image_mine_data|first)['owner'] }}
     amp_boot_network_list: {{ (network_mine_data|first)['networks'][0]['id'] }}
     amp_secgroup_list: {{ (secgroup_mine_data|first)['lb-mgmt-sec-grp']['id'] }}
 {%- endif %}