diff --git a/roles/octavia/defaults/main.yml b/roles/octavia/defaults/main.yml
index 7aa9366..b3e588b 100644
--- a/roles/octavia/defaults/main.yml
+++ b/roles/octavia/defaults/main.yml
@@ -29,4 +29,9 @@
 octavia_management_subnet_cidr: "172.24.0.0/22"
 
 # Octavia amphora image url
-octavia_amphora_image_url: "https://tarballs.opendev.org/openstack/octavia/test-images/test-only-amphora-x64-haproxy-ubuntu-focal.qcow2"
+octavia_amphora_image_name: amphora-x64-haproxy
+octavia_amphora_image_url: https://tarballs.opendev.org/openstack/octavia/test-images/test-only-amphora-x64-haproxy-ubuntu-focal.qcow2
+octavia_amphora_image_container_format: bare
+octavia_amphora_image_disk_format: raw
+octavia_amphora_image_tags:
+  - amphora
diff --git a/roles/octavia/tasks/main.yml b/roles/octavia/tasks/main.yml
index 7ccbd0a..a28dede 100644
--- a/roles/octavia/tasks/main.yml
+++ b/roles/octavia/tasks/main.yml
@@ -133,21 +133,20 @@
     is_public: false
   register: _octavia_amphora_flavor
 
-- name: Download amphora image
-  ansible.builtin.get_url:
-    url: "{{ octavia_amphora_image_url }}"
-    dest: "/tmp/{{ octavia_amphora_image_url | basename }}"
-    mode: 0644
+- name: Upload Amphora image
+  ansible.builtin.include_role:
+    name: glance_image
+  vars:
+    glance_image_name: "{{ octavia_amphora_image_name }}"
+    glance_image_url: "{{ octavia_amphora_image_url }}"
+    glance_image_container_format: "{{ octavia_amphora_image_container_format }}"
+    glance_image_disk_format: "{{ octavia_amphora_image_disk_format }}"
+    glance_image_tags: "{{ octavia_amphora_image_tags }}"
 
-- name: Upload images
-  openstack.cloud.image:
+- name: Get Amphora image information
+  openstack.cloud.image_info:
     cloud: atmosphere
-    name: "amphora-x64-haproxy"
-    filename: "/tmp/{{ octavia_amphora_image_url | basename }}"
-    container_format: "bare"
-    disk_format: "qcow2"
-    tags:
-      - "amphora"
+    image: "{{ octavia_amphora_image_name }}"
   register: _octavia_amphora_image
 
 - name: Create CAs & Issuers
diff --git a/roles/octavia/vars/main.yml b/roles/octavia/vars/main.yml
index af3c061..be4639f 100644
--- a/roles/octavia/vars/main.yml
+++ b/roles/octavia/vars/main.yml
@@ -92,7 +92,7 @@
       controller_worker:
         amp_boot_network_list: "{{ _octavia_management_network.id }}"
         amp_flavor_id: "{{ _octavia_amphora_flavor.id }}"
-        amp_image_owner_id: "{{ _octavia_amphora_image.image.owner }}"
+        amp_image_owner_id: "{{ _octavia_amphora_image.openstack_image.owner }}"
         amp_secgroup_list: "{{ _octavia_amphora_sg.id }}"
         amp_ssh_key_name: null
         client_ca: /etc/octavia/certs/client/ca.crt