diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml
index 87e066e1c..954e9f024 100644
--- a/.zuul.d/base.yaml
+++ b/.zuul.d/base.yaml
@@ -22,6 +22,7 @@
       - openstack/kuryr-kubernetes
       - openstack/kuryr-tempest-plugin
       - openstack/tempest
+    timeout: 10800
     post-run: playbooks/copy-k8s-logs.yaml
     host-vars:
       controller:
diff --git a/.zuul.d/octavia.yaml b/.zuul.d/octavia.yaml
index a05185eab..4237b6b0c 100644
--- a/.zuul.d/octavia.yaml
+++ b/.zuul.d/octavia.yaml
@@ -30,9 +30,11 @@
           barbican: https://git.openstack.org/openstack/barbican
     vars:
       devstack_localrc:
-        OCTAVIA_AMP_IMAGE_FILE: "/tmp/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2"
+        OCTAVIA_AMP_IMAGE_FILE: "/tmp/test-only-amphora-x64-haproxy-centos-7.qcow2"
         OCTAVIA_AMP_IMAGE_SIZE: 3
-        OCTAVIA_AMP_IMAGE_NAME: "test-only-amphora-x64-haproxy-ubuntu-xenial"
+        OCTAVIA_AMP_IMAGE_NAME: "test-only-amphora-x64-haproxy-centos-7"
+        OCTAVIA_AMP_BASE_OS: centos
+        OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID: 7
       devstack_local_conf:
         post-config:
           $OCTAVIA_CONF:
diff --git a/playbooks/get_amphora_tarball.yaml b/playbooks/get_amphora_tarball.yaml
index 30033f7a1..c32b94bf4 100644
--- a/playbooks/get_amphora_tarball.yaml
+++ b/playbooks/get_amphora_tarball.yaml
@@ -2,5 +2,5 @@
   tasks:
     - name: Download amphora tarball
       get_url:
-        url: "https://tarballs.openstack.org/octavia/test-images/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2"
-        dest: /tmp/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2
+        url: "https://tarballs.openstack.org/octavia/test-images/test-only-amphora-x64-haproxy-centos-7.qcow2"
+        dest: /tmp/test-only-amphora-x64-haproxy-centos-7.qcow2