diff --git a/artifacts/definitions/Server/Utils/CreateCollector.yaml b/artifacts/definitions/Server/Utils/CreateCollector.yaml
index aac08f31ffb..29862c67836 100644
--- a/artifacts/definitions/Server/Utils/CreateCollector.yaml
+++ b/artifacts/definitions/Server/Utils/CreateCollector.yaml
@@ -413,7 +413,7 @@ sources:
       )
 
       LET use_server_cert = encryption_scheme =~ "x509"
-         AND NOT encryption_args.public_key =~ "----BEGIN CERTIFICATE-----"
+         AND NOT encryption_args.public_key =~ "-----BEGIN CERTIFICATE-----"
          AND log(message="Pubkey encryption specified, but no cert/key provided. Defaulting to server frontend cert")
 
       -- For x509, if no public key cert is specified, we use the
diff --git a/bin/offline.go b/bin/offline.go
index 62748b83e48..6a4d44cea76 100644
--- a/bin/offline.go
+++ b/bin/offline.go
@@ -177,6 +177,7 @@ SELECT * FROM Artifact.Server.Utils.CreateCollector(
    target=Spec.Target,
    target_args=Spec.TargetArgs,
    encryption_scheme=Spec.EncryptionScheme,
+   encryption_args=Spec.EncryptionArgs,
    opt_verbose=Spec.OptVerbose,
    opt_banner=Spec.OptBanner,
    opt_prompt=Spec.OptPrompt,
diff --git a/gui/velociraptor/package-lock.json b/gui/velociraptor/package-lock.json
index 28c46d61714..6084d4224bb 100644
--- a/gui/velociraptor/package-lock.json
+++ b/gui/velociraptor/package-lock.json
@@ -18,7 +18,7 @@
                 "@popperjs/core": "^2.11.8",
                 "ace-builds": "1.31.1",
                 "axios": "^1.6.2",
-                "axios-retry": "3.8.1",
+                "axios": ">=1.6.1",
                 "bootstrap": "^4.6.2",
                 "classnames": "^2.3.2",
                 "csv-parse": "4.16.3",
@@ -2123,9 +2123,9 @@
             }
         },
         "node_modules/axios-retry": {
-            "version": "3.8.1",
-            "resolved": "https://registry.npmjs.org/axios-retry/-/axios-retry-3.8.1.tgz",
-            "integrity": "sha512-4XseuArB4CEbfLRtMpUods2q8MLBvD4r8ifKgK4SP2FRgzQIPUDpzZ+cjQ/19eu3w2UpKgkJA+myEh2BYDSjqQ==",
+            "version": "3.9.0",
+            "resolved": "https://registry.npmjs.org/axios-retry/-/axios-retry-3.9.0.tgz",
+            "integrity": "sha512-uK9K/GnlExfShu9dB4GuK0j+iGkIR+LRus3ILhE0zSVXY2q6Dxpemr50NPMs5kP7eOKv9Pz4VvUO40ps1F67dA==",
             "dependencies": {
                 "@babel/runtime": "^7.15.4",
                 "is-retry-allowed": "^2.2.0"
@@ -12589,9 +12589,9 @@
             }
         },
         "axios-retry": {
-            "version": "3.8.1",
-            "resolved": "https://registry.npmjs.org/axios-retry/-/axios-retry-3.8.1.tgz",
-            "integrity": "sha512-4XseuArB4CEbfLRtMpUods2q8MLBvD4r8ifKgK4SP2FRgzQIPUDpzZ+cjQ/19eu3w2UpKgkJA+myEh2BYDSjqQ==",
+            "version": "3.9.0",
+            "resolved": "https://registry.npmjs.org/axios-retry/-/axios-retry-3.9.0.tgz",
+            "integrity": "sha512-uK9K/GnlExfShu9dB4GuK0j+iGkIR+LRus3ILhE0zSVXY2q6Dxpemr50NPMs5kP7eOKv9Pz4VvUO40ps1F67dA==",
             "requires": {
                 "@babel/runtime": "^7.15.4",
                 "is-retry-allowed": "^2.2.0"
diff --git a/gui/velociraptor/package.json b/gui/velociraptor/package.json
index 8d826e1fff2..8209fa1b799 100644
--- a/gui/velociraptor/package.json
+++ b/gui/velociraptor/package.json
@@ -13,7 +13,8 @@
         "@fortawesome/react-fontawesome": "0.2.0",
         "@popperjs/core": "^2.11.8",
         "axios": ">=1.6.2",
-        "axios-retry": "3.8.1",
+        "axios": ">=1.6.1",
+        "axios-retry": "3.9.0",
         "ace-builds": "1.31.1",
         "bootstrap": "^4.6.2",
         "classnames": "^2.3.2",