diff --git a/renovate.json b/renovate.json
index b7098e522..86bbfcec1 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,7 +1,9 @@
 {
   "extends": ["config:base"],
   "prHourlyLimit": 1,
-  "rebaseStalePrs": false,
+  "prCreation": "not-pending",
+  "prNotPendingHours": 12,
+  "rebaseWhen": "conflicted",
   "dependencyDashboard": true,
   "postUpdateOptions": ["gomodTidy"],
   "packageRules": [
diff --git a/ui/e2e/demo.test.js b/ui/e2e/demo.test.js
index 73aef8cd4..bd2c33e1f 100644
--- a/ui/e2e/demo.test.js
+++ b/ui/e2e/demo.test.js
@@ -5,7 +5,7 @@ let page;
 
 describe("Demo", () => {
   beforeAll(async () => {
-    jest.setTimeout(10000);
+    jest.setTimeout(30000);
 
     browser = await puppeteer.launch();
   });