diff --git a/.github/workflows/gitlab.yml b/.github/workflows/gitlab.yml
index 8babfdf..c351af7 100644
--- a/.github/workflows/gitlab.yml
+++ b/.github/workflows/gitlab.yml
@@ -12,7 +12,7 @@ permissions: {}
 
 jobs:
   trigger-gitlab-pipeline:
-    uses: NordSecurity/trigger-gitlab-pipeline/.github/workflows/trigger-gitlab-pipeline.yml@272b0b859016b5c0ff2c3b7d70799270b0a047fb
+    uses: NordSecurity/trigger-gitlab-pipeline/.github/workflows/trigger-gitlab-pipeline.yml@22c73479b495367b1c8e6ee40145c75a3b4b6706
     secrets:
       ci-api-v4-url: ${{ secrets.CI_API_V4_URL }}
       access-token: ${{ secrets.GITLAB_API_TOKEN }}
diff --git a/MOOSE_RELEASE_TAG b/MOOSE_RELEASE_TAG
index f123590..716a57b 100644
--- a/MOOSE_RELEASE_TAG
+++ b/MOOSE_RELEASE_TAG
@@ -1 +1 @@
-v17.0.0-libDropApp
+v18.0.0-libDropApp
diff --git a/changelog.md b/changelog.md
index dfd659b..e11ce99 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,11 @@
+### UNRELEASED
+### **UNRELEASED**
+---
+* Bump moose to v18.0.0
+
+---
+<br>
+
 ### v9.0.0
 ### **Deck of Cards**
 ---
diff --git a/drop-analytics/src/moose_impl.rs b/drop-analytics/src/moose_impl.rs
index 228551c..5e78d97 100644
--- a/drop-analytics/src/moose_impl.rs
+++ b/drop-analytics/src/moose_impl.rs
@@ -150,15 +150,19 @@ impl super::Moose for MooseImpl {
     }
 
     fn event_transfer_intent(&self, data: crate::TransferIntentEventData) {
+        let params = moose::TransferParams {
+            file_extension: data.extensions,
+            mime_type: data.mime_types,
+            no_of_files: data.file_count,
+            size_of_files_list: data.file_sizes,
+            transfer_id: data.transfer_id,
+            transfer_size: data.transfer_size,
+        };
+
         moose!(
             self.logger,
             send_serviceQuality_transfer_intent,
-            data.transfer_id,
-            data.file_count,
-            data.transfer_size,
-            data.file_sizes,
-            data.extensions,
-            data.mime_types,
+            params,
             data.path_ids,
             None
         );
@@ -185,18 +189,17 @@ impl super::Moose for MooseImpl {
     }
 
     fn event_transfer_file(&self, data: crate::TransferFileEventData) {
-        moose!(
-            self.logger,
-            send_serviceQuality_transfer_file,
-            data.transfer_id,
-            data.transfer_time,
-            data.result,
-            data.direction.into(),
-            data.path_id,
-            data.phase.into(),
-            data.transferred,
-            None
-        );
+        let params = moose::FileTransferParams {
+            errno: data.result,
+            file_phase: data.phase.into(),
+            path_ids: data.path_id,
+            transfer_direction: data.direction.into(),
+            transfer_id: data.transfer_id,
+            transfer_time: data.transfer_time,
+            transferred: data.transferred,
+        };
+
+        moose!(self.logger, send_serviceQuality_transfer_file, params, None);
     }
 
     fn developer_exception(&self, data: crate::DeveloperExceptionEventData) {