diff --git a/filter-plugin/logstash-filter-capella-guardium/README.md b/filter-plugin/logstash-filter-capella-guardium/README.md
index fff78f058..fb2dc1016 100644
--- a/filter-plugin/logstash-filter-capella-guardium/README.md
+++ b/filter-plugin/logstash-filter-capella-guardium/README.md
@@ -118,7 +118,7 @@ enforcements. Configure Guardium to read the native audit/data_access logs by cu
   the  [logstash-input-couchbase_capella_input](../../input-plugin/logstash-input-couchbase-capella/logstash-input-couchbase_capella_input.zip)
   plug-in.
 * Download
-  the [logstash-filter-capella_guardium_filter](capellaCouchbaseOverCapellaPackage/capella/logstash-filter-capella_guardium_filter.zip)
+  the [logstash-filter-capella_guardium_filter](logstash-filter-capella_guardium_filter.zip)
   plug-in.
 * Capella-Guardium Logstash filter plug-in is automatically available with Guardium Data Protection versions 12.x, 11.4
   with appliance bundle 11.0p490 or later or Guardium Data Protection version 11.5 with appliance bundle 11.0p540 or
@@ -129,15 +129,15 @@ enforcements. Configure Guardium to read the native audit/data_access logs by cu
 1. On the collector, go to ```Setup``` > ```Tools and Views``` > ```Configure Universal Connector```.
 2. Enable the universal connector if it is disabled.
 3. Click ```Upload File``` and select the
-   offline  [logstash-filter-capella_guardium_filter](capellaCouchbaseOverCapellaPackage/capella/logstash-filter-capella_guardium_filter.zip)
+   offline  [logstash-filter-capella_guardium_filter](logstash-filter-capella_guardium_filter.zip)
    plug-in. After it is uploaded, click ```OK```.
 4. Click the Plus sign to open the Connector Configuration dialog box.
 5. Type a name in the Connector name field.
 6. Update the input section to add the details from
-   the [capellaCouchbase.conf](capellaCouchbaseOverCapellaPackage/capella/capellaCouchbase.conf) file's input part,
+   the [capellaCouchbase.conf](capellaCouchbaseOverCapellaPackage/capellaCouchbase.conf) file's input part,
    omitting the keyword "input{" at the beginning and its corresponding "}" at the end.
 7. Update the filter section to add the details from
-   the [capellaCouchbase.conf](capellaCouchbaseOverCapellaPackage/capella/capellaCouchbase.conf) file's filter part,
+   the [capellaCouchbase.conf](capellaCouchbaseOverCapellaPackage/capellaCouchbase.conf) file's filter part,
    omitting the keyword "filter{" at the beginning and its corresponding "}" at the end.
 8. The 'type' fields should match in the input and filter configuration sections. This field should be unique for every
    individual connector added.
diff --git a/filter-plugin/logstash-filter-capella-guardium/capellaCouchbaseOverCapellaPackage/capella/capellaCouchbase.conf b/filter-plugin/logstash-filter-capella-guardium/capellaCouchbaseOverCapellaPackage/capellaCouchbase.conf
similarity index 100%
rename from filter-plugin/logstash-filter-capella-guardium/capellaCouchbaseOverCapellaPackage/capella/capellaCouchbase.conf
rename to filter-plugin/logstash-filter-capella-guardium/capellaCouchbaseOverCapellaPackage/capellaCouchbase.conf
diff --git a/filter-plugin/logstash-filter-capella-guardium/capellaCouchbaseOverCapellaPackage/capella/logstash-filter-capella_guardium_filter.zip b/filter-plugin/logstash-filter-capella-guardium/logstash-filter-capella_guardium_filter.zip
similarity index 100%
rename from filter-plugin/logstash-filter-capella-guardium/capellaCouchbaseOverCapellaPackage/capella/logstash-filter-capella_guardium_filter.zip
rename to filter-plugin/logstash-filter-capella-guardium/logstash-filter-capella_guardium_filter.zip
diff --git a/input-plugin/logstash-input-couchbase-capella/README.md b/input-plugin/logstash-input-couchbase-capella/README.md
index 5f289f116..a7cbdec6e 100644
--- a/input-plugin/logstash-input-couchbase-capella/README.md
+++ b/input-plugin/logstash-input-couchbase-capella/README.md
@@ -47,8 +47,8 @@ https://docs.couchbase.com/server/current/manage/manage-security/manage-auditing
 3. Click ```Upload File``` and select the offline  [logstash-input-couchbase_capella_input](logstash-input-couchbase_capella_input.zip) plug-in. After it is uploaded, click ```OK```.
 4. Click the Plus sign to open the Connector Configuration dialog box.
 5. Type a name in the Connector name field.
-6. Update the input section to add the details from the [capellaCouchbase.conf](../../filter-plugin/logstash-filter-capella-guardium/capellaCouchbaseOverCapellaPackage/capella/capellaCouchbase.conf) file's input part, omitting the keyword "input{" at the beginning and its corresponding "}" at the end.
-7. Update the filter section to add the details from the [capellaCouchbase.conf](../../filter-plugin/logstash-filter-capella-guardium/capellaCouchbaseOverCapellaPackage/capella/capellaCouchbase.conf) file's filter part, omitting the keyword "filter{" at the beginning and its corresponding "}" at the end.
+6. Update the input section to add the details from the [capellaCouchbase.conf](../../filter-plugin/logstash-filter-capella-guardium/capellaCouchbaseOverCapellaPackage/capellaCouchbase.conf) file's input part, omitting the keyword "input{" at the beginning and its corresponding "}" at the end.
+7. Update the filter section to add the details from the [capellaCouchbase.conf](../../filter-plugin/logstash-filter-capella-guardium/capellaCouchbaseOverCapellaPackage/capellaCouchbase.conf) file's filter part, omitting the keyword "filter{" at the beginning and its corresponding "}" at the end.
 8. The 'type' fields should match in the input and filter configuration sections. This field should be unique for every individual connector added.
 9. Click ```Save```. Guardium validates the new connector and displays it in the Configure Universal Connector page.
 10. After the offline plug-in is installed and the configuration is uploaded and saved in the Guardium machine, restart the Universal Connector using the ```Disable/Enable``` button.
diff --git a/input-plugin/logstash-input-couchbase-capella/logstash-input-couchbase_capella_input.zip b/input-plugin/logstash-input-couchbase-capella/logstash-input-couchbase_capella_input.zip
index 1cd342369..a6fb2a014 100644
Binary files a/input-plugin/logstash-input-couchbase-capella/logstash-input-couchbase_capella_input.zip and b/input-plugin/logstash-input-couchbase-capella/logstash-input-couchbase_capella_input.zip differ
diff --git a/input-plugin/logstash-input-couchbase-capella/src/test/java/org/logstashplugins/CouchbaseCapellaInputTest.java b/input-plugin/logstash-input-couchbase-capella/src/test/java/org/logstashplugins/CouchbaseCapellaInputTest.java
index c847edc82..350bf8493 100644
--- a/input-plugin/logstash-input-couchbase-capella/src/test/java/org/logstashplugins/CouchbaseCapellaInputTest.java
+++ b/input-plugin/logstash-input-couchbase-capella/src/test/java/org/logstashplugins/CouchbaseCapellaInputTest.java
@@ -60,7 +60,7 @@ public void testCouchbaseCapellaInputTest() {
         var baseUrl = String.format("http://%s:%d/%s", mockServerHost, mockServerPort, mockServerApiBasePath);
         Map<String, Object> configValues = new HashMap<>();
         configValues.put(CouchbaseCapellaInput.INTERVAL_CONFIG.name(), 2L);
-        configValues.put(CouchbaseCapellaInput.QUERY_LENGTH_CONFIG.name(), 1L);
+        configValues.put(CouchbaseCapellaInput.QUERY_LENGTH_CONFIG.name(), 20 * 60L);
         configValues.put(CouchbaseCapellaInput.API_BASE_URL_CONFIG.name(), baseUrl);
         configValues.put(CouchbaseCapellaInput.ORG_ID_CONFIG.name(), "success-org");
         configValues.put(CouchbaseCapellaInput.PROJECT_ID_CONFIG.name(), "success-project");
@@ -109,7 +109,7 @@ public void testCouchbaseCapellaInput_EpochToISO8601() {
         var baseUrl = String.format("http://%s:%d/%s", mockServerHost, mockServerPort, mockServerApiBasePath);
         Map<String, Object> configValues = new HashMap<>();
         configValues.put(CouchbaseCapellaInput.INTERVAL_CONFIG.name(), 2L);
-        configValues.put(CouchbaseCapellaInput.QUERY_LENGTH_CONFIG.name(), 1L);
+        configValues.put(CouchbaseCapellaInput.QUERY_LENGTH_CONFIG.name(), 20 * 60L);
         configValues.put(CouchbaseCapellaInput.API_BASE_URL_CONFIG.name(), baseUrl);
         configValues.put(CouchbaseCapellaInput.ORG_ID_CONFIG.name(), "success-org");
         configValues.put(CouchbaseCapellaInput.PROJECT_ID_CONFIG.name(), "success-project");
@@ -128,7 +128,7 @@ public void testCouchbaseCapellaInput_EmptyBaseUrl() {
 
         Map<String, Object> configValues = new HashMap<>();
         configValues.put(CouchbaseCapellaInput.INTERVAL_CONFIG.name(), 2L);
-        configValues.put(CouchbaseCapellaInput.QUERY_LENGTH_CONFIG.name(), 1L);
+        configValues.put(CouchbaseCapellaInput.QUERY_LENGTH_CONFIG.name(), 20 * 60L);
         configValues.put(CouchbaseCapellaInput.API_BASE_URL_CONFIG.name(), "");
         configValues.put(CouchbaseCapellaInput.ORG_ID_CONFIG.name(), "success-org");
         configValues.put(CouchbaseCapellaInput.PROJECT_ID_CONFIG.name(), "success-project");
@@ -147,7 +147,7 @@ public void testCouchbaseCapellaInput_EmptyOrgID() {
         var baseUrl = String.format("http://%s:%d/%s", mockServerHost, mockServerPort, mockServerApiBasePath);
         Map<String, Object> configValues = new HashMap<>();
         configValues.put(CouchbaseCapellaInput.INTERVAL_CONFIG.name(), 2L);
-        configValues.put(CouchbaseCapellaInput.QUERY_LENGTH_CONFIG.name(), 1L);
+        configValues.put(CouchbaseCapellaInput.QUERY_LENGTH_CONFIG.name(), 20 * 60L);
         configValues.put(CouchbaseCapellaInput.API_BASE_URL_CONFIG.name(), baseUrl);
         configValues.put(CouchbaseCapellaInput.ORG_ID_CONFIG.name(), "");
         configValues.put(CouchbaseCapellaInput.PROJECT_ID_CONFIG.name(), "success-project");
@@ -166,7 +166,7 @@ public void testCouchbaseCapellaInput_EmptyProjectID() {
         var baseUrl = String.format("http://%s:%d/%s", mockServerHost, mockServerPort, mockServerApiBasePath);
         Map<String, Object> configValues = new HashMap<>();
         configValues.put(CouchbaseCapellaInput.INTERVAL_CONFIG.name(), 2L);
-        configValues.put(CouchbaseCapellaInput.QUERY_LENGTH_CONFIG.name(), 1L);
+        configValues.put(CouchbaseCapellaInput.QUERY_LENGTH_CONFIG.name(), 20 * 60L);
         configValues.put(CouchbaseCapellaInput.API_BASE_URL_CONFIG.name(), baseUrl);
         configValues.put(CouchbaseCapellaInput.ORG_ID_CONFIG.name(), "success-org");
         configValues.put(CouchbaseCapellaInput.PROJECT_ID_CONFIG.name(), "");
@@ -185,7 +185,7 @@ public void testCouchbaseCapellaInput_EmptyClusterID() {
         var baseUrl = String.format("http://%s:%d/%s", mockServerHost, mockServerPort, mockServerApiBasePath);
         Map<String, Object> configValues = new HashMap<>();
         configValues.put(CouchbaseCapellaInput.INTERVAL_CONFIG.name(), 2L);
-        configValues.put(CouchbaseCapellaInput.QUERY_LENGTH_CONFIG.name(), 1L);
+        configValues.put(CouchbaseCapellaInput.QUERY_LENGTH_CONFIG.name(), 20 * 60L);
         configValues.put(CouchbaseCapellaInput.API_BASE_URL_CONFIG.name(), baseUrl);
         configValues.put(CouchbaseCapellaInput.ORG_ID_CONFIG.name(), "success-org");
         configValues.put(CouchbaseCapellaInput.PROJECT_ID_CONFIG.name(), "success-project");
@@ -204,7 +204,7 @@ public void testCouchbaseCapellaInput_EmptyAuthToken() {
         var baseUrl = String.format("http://%s:%d/%s", mockServerHost, mockServerPort, mockServerApiBasePath);
         Map<String, Object> configValues = new HashMap<>();
         configValues.put(CouchbaseCapellaInput.INTERVAL_CONFIG.name(), 2L);
-        configValues.put(CouchbaseCapellaInput.QUERY_LENGTH_CONFIG.name(), 1L);
+        configValues.put(CouchbaseCapellaInput.QUERY_LENGTH_CONFIG.name(), 20 * 60L);
         configValues.put(CouchbaseCapellaInput.API_BASE_URL_CONFIG.name(), baseUrl);
         configValues.put(CouchbaseCapellaInput.ORG_ID_CONFIG.name(), "success-org");
         configValues.put(CouchbaseCapellaInput.PROJECT_ID_CONFIG.name(), "success-project");
diff --git a/input-plugin/logstash-input-couchbase-capella/src/test/resources/mocks/mock-audit-log.tar.gz b/input-plugin/logstash-input-couchbase-capella/src/test/resources/mocks/mock-audit-log.tar.gz
index 010185ed7..438d2d38a 100644
Binary files a/input-plugin/logstash-input-couchbase-capella/src/test/resources/mocks/mock-audit-log.tar.gz and b/input-plugin/logstash-input-couchbase-capella/src/test/resources/mocks/mock-audit-log.tar.gz differ