diff --git a/etc/kayobe/ansible/octavia-amphora-image-build.yml b/etc/kayobe/ansible/octavia-amphora-image-build.yml
index 9688e7617..6ebc589aa 100644
--- a/etc/kayobe/ansible/octavia-amphora-image-build.yml
+++ b/etc/kayobe/ansible/octavia-amphora-image-build.yml
@@ -4,6 +4,14 @@
   vars:
     amphora_dib_upper_constraints_file: "{{ pip_upper_constraints_file }}"
   tasks:
+    - name: Install EPEL
+      package:
+        name: epel-release
+      become: true
+      when:
+        - ansible_facts.os_family == "RedHat"
+        - dnf_custom_repos | falsy
+
     - name: Ensure packages are installed
       become: true
       vars:
diff --git a/etc/kayobe/ansible/octavia-amphora-image-register.yml b/etc/kayobe/ansible/octavia-amphora-image-register.yml
index 68795e2ea..d0da1b55c 100644
--- a/etc/kayobe/ansible/octavia-amphora-image-register.yml
+++ b/etc/kayobe/ansible/octavia-amphora-image-register.yml
@@ -13,14 +13,29 @@
         lookup('env', 'OS_USERNAME') != 'octavia' or
         lookup('env', 'OS_PROJECT_NAME') != 'service'
 
+    - name: Get image checksum
+      stat:
+        path: "{{ image_cache_path }}/amphora-x64-haproxy-{{ openstack_release }}.qcow2"
+        checksum_algorithm: md5
+      changed_when: false
+      register: image_checksum
+
+    - name: Assert that Amphora image exists
+      assert:
+        that: image_checksum.stat.exists
+        fail_msg: |
+          The amphora image: {{ image_cache_path }}/amphora-x64-haproxy-{{ openstack_release }}.qcow2
+          does not exist. Did you build the image?
+
     - name: Set up openstack virtualenv
       pip:
         virtualenv: "{{ venv }}"
+        virtualenv_command: python3 -m venv
         name:
           - openstacksdk
           - python-openstackclient
         state: latest
-        extra_args: "{% if pip_upper_constraints_file %}-c {{ pip_upper_constraints_file }}{% endif %}"
+        extra_args: "{% if openstacksdk_upper_constraints_file %}-c {{ openstacksdk_upper_constraints_file }}{% endif %}"
 
     - name: Query Octavia Amphora image
       vars:
@@ -33,14 +48,6 @@
         image: amphora-x64-haproxy
       register: image_info
 
-    - name: Get image checksum
-      stat:
-        path: "{{ image_cache_path }}/amphora-x64-haproxy-{{ openstack_release }}.qcow2"
-        checksum_algorithm: md5
-      changed_when: false
-      register: image_checksum
-      when: image_info.openstack_image
-
     - name: Ensure Octavia Amphora image is renamed
       vars:
         ansible_python_interpreter: "{{ venv }}/bin/python"
@@ -48,8 +55,8 @@
         cmd: >-
           {{ venv }}/bin/openstack image set amphora-x64-haproxy --name amphora-x64-haproxy-{{ ansible_facts.date_time.iso8601_basic_short }}
       when:
-        - image_info.openstack_image
-        - image_info.openstack_image.checksum != image_checksum.stat.checksum
+        - image_info.image
+        - image_info.image.checksum != image_checksum.stat.checksum
       changed_when: true
       environment: "{{ openstack_auth_env }}"