diff --git a/.zuul.yaml b/.zuul.yaml
index f8c88a17..ca96990b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -16,7 +16,7 @@
       - ^.*\.rst$
       - ^doc/.*$
       - ^tox.ini$
-    timeout: 7200
+    timeout: 10800
     vars:
       configure_swap_size: 8192
       tempest_concurrency: 3
diff --git a/devstack/lib/cephadm b/devstack/lib/cephadm
index c570f780..43127d5b 100755
--- a/devstack/lib/cephadm
+++ b/devstack/lib/cephadm
@@ -662,6 +662,14 @@ function set_min_client_version {
     fi
 }
 
+function set_memory_config {
+    $SUDO "$CEPHADM" shell --fsid $FSID --config $CEPH_CONFIG \
+        --keyring $CEPH_KEYRING -- ceph config get osd osd_memory_target
+    $SUDO "$CEPHADM" shell --fsid $FSID --config $CEPH_CONFIG \
+        --keyring $CEPH_KEYRING -- ceph config set osd osd_memory_target \
+        2147483648
+}
+
 # import_libvirt_secret_ceph() - Imports Cinder user key into libvirt
 # so it can connect to the Ceph cluster while attaching a Cinder block device
 function import_libvirt_secret_ceph {
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index e6a251ab..53a5d2df 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -15,6 +15,7 @@ elif [[ "$1" == "stack" && "$2" == "install" ]]; then
         # Perform installation of service source
         echo_summary "[cephadm] Installing ceph"
         install_ceph
+        set_memory_config
         set_min_client_version
     else
         echo "[CEPHADM] Remote Ceph: Skipping install"