diff --git a/application/apps/indexer/Cargo.lock b/application/apps/indexer/Cargo.lock
index c13056c8d..9e072f98e 100644
--- a/application/apps/indexer/Cargo.lock
+++ b/application/apps/indexer/Cargo.lock
@@ -652,7 +652,7 @@ dependencies = [
 [[package]]
 name = "dlt-core"
 version = "0.16.0"
-source = "git+https://github.com/kruss/dlt-core.git?branch=dlt_network_traces#525f591862437ca15c56639143f205a956d01b6a"
+source = "git+https://github.com/esrlabs/dlt-core#4299e9fa352b49cf21c5c867c835e18f4cc4a6cd"
 dependencies = [
  "buf_redux 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder",
@@ -1478,6 +1478,7 @@ dependencies = [
  "log",
  "memchr",
  "rand",
+ "regex",
  "serde",
  "someip-messages",
  "someip-payload",
@@ -2063,8 +2064,8 @@ dependencies = [
 
 [[package]]
 name = "someip-payload"
-version = "0.1.2"
-source = "git+https://github.com/kruss/someip-payload.git?branch=fix_someip_array_parsing#8d0a5a5d61604d559970ef4d6a717ad536ece1fc"
+version = "0.1.3"
+source = "git+https://github.com/esrlabs/someip-payload#7e0e5150081aea7acb96cc2964af7b597685f816"
 dependencies = [
  "byteorder",
  "log",
diff --git a/application/apps/rustcore/rs-bindings/Cargo.lock b/application/apps/rustcore/rs-bindings/Cargo.lock
index 3eb6636b7..1de421536 100644
--- a/application/apps/rustcore/rs-bindings/Cargo.lock
+++ b/application/apps/rustcore/rs-bindings/Cargo.lock
@@ -699,7 +699,7 @@ dependencies = [
 [[package]]
 name = "dlt-core"
 version = "0.16.0"
-source = "git+https://github.com/kruss/dlt-core.git?branch=dlt_network_traces#525f591862437ca15c56639143f205a956d01b6a"
+source = "git+https://github.com/esrlabs/dlt-core#4299e9fa352b49cf21c5c867c835e18f4cc4a6cd"
 dependencies = [
  "buf_redux 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder",
@@ -1841,6 +1841,7 @@ dependencies = [
  "log",
  "memchr",
  "rand",
+ "regex",
  "serde",
  "someip-messages",
  "someip-payload",
@@ -2475,8 +2476,8 @@ dependencies = [
 
 [[package]]
 name = "someip-payload"
-version = "0.1.2"
-source = "git+https://github.com/kruss/someip-payload.git?branch=fix_someip_array_parsing#8d0a5a5d61604d559970ef4d6a717ad536ece1fc"
+version = "0.1.3"
+source = "git+https://github.com/esrlabs/someip-payload#7e0e5150081aea7acb96cc2964af7b597685f816"
 dependencies = [
  "byteorder",
  "log",
diff --git a/cli/codesign_config/macos.toml b/cli/codesign_config/macos.toml
index 2c8782b7b..fb57689a9 100644
--- a/cli/codesign_config/macos.toml
+++ b/cli/codesign_config/macos.toml
@@ -28,7 +28,7 @@ single_paths = [
     "chipmunk.app",
 ]
 # Patterns to be used with glob to retrieve all matching files under that patterns.
-glob_patterns = ["chipmunk.app/Contents/Frameworks/*.framework/Versions/A/**/**"]
+glob_patterns = ["chipmunk.app/Contents/Frameworks/*.framework/Versions/A/**/*"]
 
 # Represents the components for the final sign command (Command for deep and strict code signing)
 [final_sign_command]
diff --git a/cli/src/release/codesign/macos.rs b/cli/src/release/codesign/macos.rs
index 9c3a5ba80..622c925f2 100644
--- a/cli/src/release/codesign/macos.rs
+++ b/cli/src/release/codesign/macos.rs
@@ -104,40 +104,48 @@ pub fn apply_codesign(config: &MacOsConfig) -> anyhow::Result<()> {
     let app_root = Target::App.cwd();
     let release_build_path = release_build_path();
 
+    let release_build_path_str = release_build_path.to_string_lossy();
+
     // Retrieve sign paths
-    // First: single paths.
-    let mut sign_paths: Vec<_> = config
-        .sign_paths
-        .single_paths
-        .iter()
-        .map(|p| release_build_path.join(p))
-        .collect();
+    let mut sign_paths: Vec<_> = Vec::new();
 
-    // Second: glob paths.
+    // First: glob paths.
     for glob_path in config
         .sign_paths
         .glob_patterns
         .iter()
-        .map(|p| release_build_path.join(p))
+        .map(|p| format!("{release_build_path_str}/{p}"))
     {
-        sign_paths.extend(
-            glob::glob(&glob_path.to_string_lossy())
-                .context("Error while retrieving file paths via glob")?
-                .flat_map(|p| p.ok())
-                .filter(|p| p.is_file())
-                .filter(|p| !p.is_symlink()),
-        );
+        let paths: Vec<_> = glob::glob(&glob_path)
+            .context("Error while retrieving file paths via glob")?
+            .flat_map(|p| p.ok())
+            .filter(|p| p.is_file())
+            .filter(|p| !p.is_symlink())
+            .collect();
+
+        sign_paths.extend(paths);
     }
 
+    // Second: single paths.
+    sign_paths.extend(
+        config
+            .sign_paths
+            .single_paths
+            .iter()
+            .map(|p| release_build_path.join(p))
+    );
+
+
     // Start signing files
     let sign_id = env::var(&config.env_vars.signing_id)
         .context("Error while retrieving signing ID environment variable")?;
     for path in sign_paths {
         let cmd = format!(
-            "codesign --sign \"{sign_id}\" {} {}",
+            "codesign --sign \"{sign_id}\" {} \"{}\"",
             config.sign_cmd_options,
             path.to_string_lossy()
         );
+        println!("DEBUG: CodeSign CMD: '{cmd}'");
         let cmd_status = std::process::Command::new("sh")
             .arg("-c")
             .arg(&cmd)
@@ -198,7 +206,7 @@ pub fn notarize(config: &MacOsConfig) -> anyhow::Result<()> {
     let release_file_path = release_path().join(archname);
 
     let cmd = format!(
-        "{} {}  --apple-id {apple_id} --team-id {team_id} --password {team_id} --password {password}",
+        "{} \"{}\"  --apple-id \"{apple_id}\" --team-id \"{team_id}\" --password \"{password}\"",
         config.notarize_command.command,
         release_file_path.to_string_lossy()
     );