diff --git a/cloudrun-malware-scanner/bootstrap.sh b/cloudrun-malware-scanner/bootstrap.sh
index 453b1b7..8a81936 100755
--- a/cloudrun-malware-scanner/bootstrap.sh
+++ b/cloudrun-malware-scanner/bootstrap.sh
@@ -112,15 +112,15 @@ function updateClamConfigFile {
 # https://manpages.debian.org/bullseye/clamav-daemon/clamd.conf.5.en.html
 updateClamConfigFile /etc/clamav/clamd.conf << EOF
 # This option allows you to specify the upper limit for data size that will be transfered to remote daemon when scanning a single file.
-StreamMaxLength 521M
+StreamMaxLength 1024M
 
 # Sets the maximum amount of data to be scanned for each input file.
 # Archives and other containers are recursively extracted and scanned up to this value.
-MaxScanSize 512M
+MaxScanSize 1024M
 
 # Files larger than this limit won't be scanned.
 # Affects the input file itself as well as files contained inside it (when the input file is an archive, a document or some other kind of container).
-MaxFileSize 512M
+MaxFileSize 1024M
 
 # Nested archives are scanned recursively, e.g. if a Zip archive contains a RAR file, all files within it will also be scanned.
 # This options specifies how deeply the process should be continued.
diff --git a/cloudrun-malware-scanner/config.json b/cloudrun-malware-scanner/config.json
index e21fcf0..ffeb45f 100644
--- a/cloudrun-malware-scanner/config.json
+++ b/cloudrun-malware-scanner/config.json
@@ -1,15 +1,15 @@
 {
   "buckets": [
     {
-      "unscanned": "dev-b12-private",
-      "clean": "dev-b12-private",
-      "quarantined": "quarantined-b12-dev"
+      "unscanned": "b12-private",
+      "clean": "b12-private",
+      "quarantined": "quarantined-b12"
     },
     {
-      "unscanned": "dev-b12-public",
-      "clean": "dev-b12-public",
-      "quarantined": "quarantined-b12-dev"
+      "unscanned": "b12-public",
+      "clean": "b12-public",
+      "quarantined": "quarantined-b12"
     }
   ],
-  "ClamCvdMirrorBucket": "cvd-mirror-b12-dev"
+  "ClamCvdMirrorBucket": "cvd-mirror-b12"
 }
diff --git a/cloudrun-malware-scanner/server.js b/cloudrun-malware-scanner/server.js
index 9f79d22..d424455 100644
--- a/cloudrun-malware-scanner/server.js
+++ b/cloudrun-malware-scanner/server.js
@@ -30,8 +30,8 @@ const PORT = process.env.PORT || 8080;
 const CLAMD_HOST = "127.0.0.1";
 const CLAMD_PORT = 3310;
 
-// 10 min timeout for scanning.
-const CLAMD_TIMEOUT = 600000;
+// 20 min timeout for scanning.
+const CLAMD_TIMEOUT = 1200000;
 
 // Note: MAX_FILE_SIZE limits the size of files which are sent to th
 // ClamAV Daemon.
@@ -42,7 +42,7 @@ const CLAMD_TIMEOUT = 600000;
 //
 // Note scanning a 500MiB file can take 5 minutes, so ensure timeout is
 // large enough.
-const MAX_FILE_SIZE = 500000000; // 500MiB
+const MAX_FILE_SIZE = 1000000000; // 1000MiB
 
 const CONFIG_FILE = "./config.json";