diff --git a/arangodb/config.js b/arangodb/config.js
index 1e1b3e0..fd77bc7 100644
--- a/arangodb/config.js
+++ b/arangodb/config.js
@@ -1,17 +1,19 @@
 export default function getConfig(version) {
-  const basePath = 'https://download.arangodb.com/arangodb39/Community';
-  return {
-    Linux: {
-      url: `${basePath}/Linux/arangodb3-linux-${version}.tar.gz`,
-      pathInArchive: `arangodb3-linux-${version}`,
-    },
-    Windows: {
-      url: `${basePath}/Windows/ArangoDB3-${version}_win64.zip`,
-      pathInArchive: `ArangoDB3-${version}_win64`,
-    },
-    macOS: {
-      url: `${basePath}/MacOSX/arangodb3-macos-${version}.tar.gz`,
-      pathInArchive: `arangodb3-macos-${version}`,
-    },
-  };
+    const ver = version.split('.')
+    const shortVersion = `${ver[0]}${ver[1]}`;
+    const basePath = `https://download.arangodb.com/arangodb${shortVersion}/Community`
+    return {
+        Linux: {
+            url: `${basePath}/Linux/arangodb${ver[0]}-linux-${version}.tar.gz`,
+            pathInArchive: `arangodb3-linux-${version}`,
+        },
+        Windows: {
+            url: `${basePath}/Windows/ArangoDB${ver[0]}-${version}_win64.zip`,
+            pathInArchive: `ArangoDB3-${version}_win64`,
+        },
+        macOS: {
+            url: `${basePath}/MacOSX/arangodb${ver[0]}-macos-${version}.tar.gz`,
+            pathInArchive: `arangodb3-macos-${version}`,
+        },
+    };
 }
diff --git a/lib/apps/q-server-config.js b/lib/apps/q-server-config.js
index 773c560..3fece29 100644
--- a/lib/apps/q-server-config.js
+++ b/lib/apps/q-server-config.js
@@ -18,6 +18,8 @@ config.env = {
   Q_REQUESTS_SERVER: `http://127.0.0.1:${global.nginxPort}`,
   Q_HOST: '127.0.0.1',
   Q_PORT: global.qServerPort,
+  Q_QUERY_WAIT_FOR_PERIOD: 10,
+  Q_CHAIN_RANGES_VERIFICATION: arangoEndpoint
 };
 config.ports = [global.qServerPort];