diff --git a/.zuul.yaml b/.zuul.yaml
index 200746ccfc..bae4c4d8bb 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -29,6 +29,7 @@
       - ^heat/tests/.*$
       - ^releasenotes/.*$
     vars:
+      configure_swap_size: 8192
       disable_convergence: 'false'
       sql: mysql
       use_amqp1: 0
@@ -88,6 +89,7 @@
       - ^releasenotes/.*$
       - ^setup.cfg$
     vars:
+      configure_swap_size: 8192
       topology: aio
       branch_override: default
 
diff --git a/doc/source/getting_started/on_devstack.rst b/doc/source/getting_started/on_devstack.rst
index 6fb850cc95..30840d7cbc 100644
--- a/doc/source/getting_started/on_devstack.rst
+++ b/doc/source/getting_started/on_devstack.rst
@@ -51,8 +51,8 @@ a VM image that heat can launch. To do that add the following to
 `[[local|localrc]]` section of `local.conf`::
 
     IMAGE_URL_SITE="https://download.fedoraproject.org"
-    IMAGE_URL_PATH="/pub/fedora/linux/releases/25/CloudImages/x86_64/images/"
-    IMAGE_URL_FILE="Fedora-Cloud-Base-25-1.3.x86_64.qcow2"
+    IMAGE_URL_PATH="/pub/fedora/linux/releases/31/CloudImages/x86_64/images/"
+    IMAGE_URL_FILE="Fedora-Cloud-Base-31-1.9.x86_64.qcow2"
     IMAGE_URLS+=","$IMAGE_URL_SITE$IMAGE_URL_PATH$IMAGE_URL_FILE
 
 URLs for any cloud image may be specified, but fedora images from F20 contain
diff --git a/heat_integrationtests/cleanup_test_env.sh b/heat_integrationtests/cleanup_test_env.sh
index b8e576e68e..9ae413e51a 100755
--- a/heat_integrationtests/cleanup_test_env.sh
+++ b/heat_integrationtests/cleanup_test_env.sh
@@ -30,4 +30,4 @@ openstack flavor delete m1.heat_int
 openstack flavor delete m1.heat_micro
 
 # delete the image created
-openstack image delete Fedora-Cloud-Base-30-1.2.x86_64
+openstack image delete Fedora-Cloud-Base-31-1.9.x86_64
diff --git a/heat_integrationtests/pre_test_hook.sh b/heat_integrationtests/pre_test_hook.sh
index 9b8126dea9..5e814c4f34 100755
--- a/heat_integrationtests/pre_test_hook.sh
+++ b/heat_integrationtests/pre_test_hook.sh
@@ -44,9 +44,9 @@ echo "[[local|localrc]]" >> $localconf
 #               to network
 if [[ -e /etc/ci/mirror_info.sh ]]; then
 	source /etc/ci/mirror_info.sh
-	echo "IMAGE_URLS+=${NODEPOOL_FEDORA_MIRROR}/releases/30/Cloud/x86_64/images/Fedora-Cloud-Base-30-1.2.x86_64.qcow2" >> $localconf
+	echo "IMAGE_URLS+=${NODEPOOL_FEDORA_MIRROR}/releases/31/Cloud/x86_64/images/Fedora-Cloud-Base-31-1.9.x86_64.qcow2" >> $localconf
 else
-	echo "IMAGE_URLS+=https://download.fedoraproject.org/pub/fedora/linux/releases/30/Cloud/x86_64/images/Fedora-Cloud-Base-30-1.2.x86_64.qcow2" >> $localconf
+	echo "IMAGE_URLS+=https://download.fedoraproject.org/pub/fedora/linux/releases/31/Cloud/x86_64/images/Fedora-Cloud-Base-31-1.9.x86_64.qcow2" >> $localconf
 fi
 
 echo "CEILOMETER_PIPELINE_INTERVAL=60" >> $localconf
diff --git a/heat_integrationtests/prepare_test_env.sh b/heat_integrationtests/prepare_test_env.sh
index 05d7cbafcb..cb38a152f0 100755
--- a/heat_integrationtests/prepare_test_env.sh
+++ b/heat_integrationtests/prepare_test_env.sh
@@ -46,7 +46,7 @@ function _config_iniset {
     iniset $conf_file heat_plugin instance_type m1.heat_int
     iniset $conf_file heat_plugin minimal_instance_type m1.heat_micro
 
-    iniset $conf_file heat_plugin image_ref Fedora-Cloud-Base-30-1.2.x86_64
+    iniset $conf_file heat_plugin image_ref Fedora-Cloud-Base-31-1.9.x86_64
     iniset $conf_file heat_plugin minimal_image_ref $default_image_name
     iniset $conf_file heat_plugin hidden_stack_tag hidden