diff --git a/CLIENT_DATA/opsi-sourcefire.immunet.ini b/CLIENT_DATA/opsi-sourcefire.immunet.ini
index 022c858..345c080 100644
--- a/CLIENT_DATA/opsi-sourcefire.immunet.ini
+++ b/CLIENT_DATA/opsi-sourcefire.immunet.ini
@@ -6,5 +6,5 @@ MsiId64={82CD33B2-1DE6-4663-B6F0-1592B2376F78}
 
 [COMMON]
 PN=sourcefire.immunet
-VERSION=3.0.8.9055
+VERSION=3.0.8.9025
 uVersion=3.0.8
diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins
index 4fc8bbd..95c09c3 100644
--- a/CLIENT_DATA/setup3264.ins
+++ b/CLIENT_DATA/setup3264.ins
@@ -50,6 +50,8 @@ DefVar $agent_driver_protmode_active$
 DefVar $agent_driver_protmode_file$
 DefVar $agent_driver_protmode_process$
 DefVar $agent_cloud_upload_enable$
+DefVar $agent_cloud_upload-telemetry_enable$
+DefVar $agent_cloud_upload-metadata_enable$
 DefVar $ui_notification_verbose$
 DefVar $ui_notification_gaming$
 DefVar $ui_notification_cloud$
@@ -124,6 +126,8 @@ Set $agent_driver_protmode_process$ = GetProductProperty("agent_driver_protmode_
 comment "Flag_NoWindowsTour"
 comment "description: No Windows Tour"
 Set $agent_cloud_upload_enable$ = GetProductProperty("agent_cloud_upload_enable", "1")
+Set $agent_cloud_upload-telemetry_enable$ = GetProductProperty("agent_cloud_upload-telemetry_enable", "1")
+Set $agent_cloud_upload-metadata_enable$ = GetProductProperty("agent_cloud_upload-metadata_enable", "1")
 
 comment "Flag_NoWindowsTour"
 comment "description: No Windows Tour"
@@ -243,6 +247,14 @@ else
 		if ( $agent_cloud_upload_enable$ = "1")
 			Dosbatch_agent_cloud_upload_enable_32
 		endif
+		
+		if ( $agent_cloud_upload-telemetry_enable$ = "1")
+			Dosbatch_agent_cloud_upload-telemetry_enable_32
+		endif
+		
+		if ( $agent_cloud_upload-metadata_enable$ = "1")
+			Dosbatch_agent_cloud_upload-metadata_enable_32
+		endif
 
 		if ( $ui_notification_verbose$ = "1")
 			Dosbatch_ui_notification_verbose_32
@@ -335,6 +347,14 @@ else
 		if ( $agent_cloud_upload_enable$ = "1")
 			Dosbatch_agent_cloud_upload_enable_64
 		endif
+		
+		if ( $agent_cloud_upload-telemetry_enable$ = "1")
+			Dosbatch_agent_cloud_upload-telemetry_enable_64
+		endif
+		
+		if ( $agent_cloud_upload-metadata_enable$ = "1")
+			Dosbatch_agent_cloud_upload-metadata_enable_64
+		endif
 
 		if ( $ui_notification_verbose$ = "1")
 			Dosbatch_ui_notification_verbose_64
@@ -436,6 +456,14 @@ xml ed -O -u "/config/agent/driver/protmode/process" -v $agent_driver_protmode_p
 copy "$InstallDir32$\local.xml" "$InstallDir32$\local.xml.old"
 xml ed -O -u "/config/agent/cloud/upload/enabled" -v $agent_cloud_upload_enable$ "$InstallDir32$\local.xml.old" > "$InstallDir32$\local.xml"
 
+[Dosbatch_agent_cloud_upload-telemetry_enable_32]
+copy "$InstallDir32$\local.xml" "$InstallDir32$\local.xml.old"
+xml ed -O -u "/config/janus/upload/event/enabled" -v $agent_cloud_upload-telemetry_enable$ "$InstallDir32$\local.xml.old" > "$InstallDir32$\local.xml"
+
+[Dosbatch_agent_cloud_upload-metadata_enable_32]
+copy "$InstallDir32$\local.xml" "$InstallDir32$\local.xml.old"
+xml ed -O -u "/config/agent/fmd/enabled" -v $agent_cloud_upload-metadata_enable$ "$InstallDir32$\local.xml.old" > "$InstallDir32$\local.xml"
+
 [Dosbatch_ui_notification_verbose_32]
 copy "$InstallDir32$\local.xml" "$InstallDir32$\local.xml.old"
 xml ed -O -u "/config/ui/notification/verbose" -v $ui_notification_verbose$ "$InstallDir32$\local.xml.old" > "$InstallDir32$\local.xml"
@@ -519,6 +547,14 @@ xml ed -O -u "/config/agent/driver/protmode/process" -v $agent_driver_protmode_p
 copy "$InstallDir64$\local.xml" "$InstallDir64$\local.xml.old"
 xml ed -O -u "/config/agent/cloud/upload/enabled" -v $agent_cloud_upload_enable$ "$InstallDir64$\local.xml.old" > "$InstallDir64$\local.xml"
 
+[Dosbatch_agent_cloud_upload-telemetry_enable_64]
+copy "$InstallDir64$\local.xml" "$InstallDir64$\local.xml.old"
+xml ed -O -u "/config/janus/upload/event/enabled" -v $agent_cloud_upload-telemetry_enable$ "$InstallDir64$\local.xml.old" > "$InstallDir64$\local.xml"
+
+[Dosbatch_agent_cloud_upload-metadata_enable_64]
+copy "$InstallDir64$\local.xml" "$InstallDir64$\local.xml.old"
+xml ed -O -u "/config/agent/fmd/enabled" -v $agent_cloud_upload-metadata_enable$ "$InstallDir64$\local.xml.old" > "$InstallDir64$\local.xml"
+
 [Dosbatch_ui_notification_verbose_64]
 copy "$InstallDir64$\local.xml" "$InstallDir64$\local.xml.old"
 xml ed -O -u "/config/ui/notification/verbose" -v $ui_notification_verbose$ "$InstallDir64$\local.xml.old" > "$InstallDir64$\local.xml"
diff --git a/IMPLogo_full_aspect_medium.jpg.sha1sum b/IMPLogo_full_aspect_medium.jpg.sha1sum
index a37bbba..a0423dc 100644
--- a/IMPLogo_full_aspect_medium.jpg.sha1sum
+++ b/IMPLogo_full_aspect_medium.jpg.sha1sum
@@ -1 +1 @@
-708a8a4f0b2763c93c68059402e44f56537f7bf5  /home/mario/.opsi-dist-cache/immunet-3.0.5.7688//IMPLogo_full_aspect_medium.jpg
+708a8a4f0b2763c93c68059402e44f56537f7bf5  /home/opsiproducts/.opsi-dist-cache/sourcefire.immunet-3.0.8.9025//IMPLogo_full_aspect_medium.jpg
diff --git a/OPSI/control b/OPSI/control
index 1fd57f5..4e572b3 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -177,6 +177,24 @@ description: Enable Upload to Cloud
 values: ["0", "1"]
 default: ["1"]
 
+[ProductProperty]
+type: unicode
+name: agent_cloud_upload-telemetry_enable
+multivalue: False
+editable: False
+description: Enable Upload to Cloud telemetry data
+values: ["0", "1"]
+default: ["1"]
+
+[ProductProperty]
+type: unicode
+name: agent_cloud_upload-metadata_enable
+multivalue: False
+editable: False
+description: Enable Upload to Cloud file metadata
+values: ["0", "1"]
+default: ["1"]
+
 [ProductProperty]
 type: unicode
 name: ui_notification_verbose
diff --git a/builder-product.cfg b/builder-product.cfg
index 109087c..0b0734f 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -3,9 +3,9 @@
 ############################
 VENDOR="immunet.com"
 PN="sourcefire.immunet"
-VERSION="3.0.8.9055"
+VERSION="3.0.8.9025"
 DVERSION="latest"
-RELEASE="3"
+RELEASE="1"
 PRIORITY="0"
 ADVICE=""
 
diff --git a/protect-en-us-3.0.8.9025-32-tcp.exe.sha1sum b/protect-en-us-3.0.8.9025-32-tcp.exe.sha1sum
new file mode 100644
index 0000000..5b84770
--- /dev/null
+++ b/protect-en-us-3.0.8.9025-32-tcp.exe.sha1sum
@@ -0,0 +1 @@
+e219141b7f24438bdfce17406bd47b4869bda177  /home/opsiproducts/.opsi-dist-cache/sourcefire.immunet-3.0.8.9025/X86/protect-en-us-3.0.8.9025-32-tcp.exe
diff --git a/protect-en-us-3.0.8.9025-64-tcp.exe.sha1sum b/protect-en-us-3.0.8.9025-64-tcp.exe.sha1sum
new file mode 100644
index 0000000..a17add4
--- /dev/null
+++ b/protect-en-us-3.0.8.9025-64-tcp.exe.sha1sum
@@ -0,0 +1 @@
+0e86e905ef81398723bc1d5fe67b8a6b499d4756  /home/opsiproducts/.opsi-dist-cache/sourcefire.immunet-3.0.8.9025/X86_64/protect-en-us-3.0.8.9025-64-tcp.exe
diff --git a/protect-en-us-3.0.8.9055-32-tcp.exe.sha1sum b/protect-en-us-3.0.8.9055-32-tcp.exe.sha1sum
deleted file mode 100644
index 1bca7d4..0000000
--- a/protect-en-us-3.0.8.9055-32-tcp.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-e219141b7f24438bdfce17406bd47b4869bda177  /home/mario/.opsi-dist-cache/sourcefire.immunet-3.0.8.9055/X86/protect-en-us-3.0.8.9055-32-tcp.exe
diff --git a/protect-en-us-3.0.8.9055-64-tcp.exe.sha1sum b/protect-en-us-3.0.8.9055-64-tcp.exe.sha1sum
deleted file mode 100644
index 7e89d2f..0000000
--- a/protect-en-us-3.0.8.9055-64-tcp.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-0e86e905ef81398723bc1d5fe67b8a6b499d4756  /home/mario/.opsi-dist-cache/sourcefire.immunet-3.0.8.9055/X86_64/protect-en-us-3.0.8.9055-64-tcp.exe