diff --git a/BUILD b/BUILD
index df580a106..6db8e6580 100644
--- a/BUILD
+++ b/BUILD
@@ -6,50 +6,50 @@ cc_shared_library(
     #user_link_flags = [
     #    "-Wl,--no-undefined",
     #],
-    deps = [
-        "//implementation",
-    ],
+    deps = ["//implementation"],
 )
 
 cc_shared_library(
     name = "vsomeip3_config_plugin",
-    dynamic_deps = [
-        ":vsomeip3_shared",
-    ],
+    dynamic_deps = [":vsomeip3_shared"],
     shared_lib_name = "libvsomeip3-cfg.so.3",
     tags = ["same-ros-pkg-as: vsomeip3"],
     # Disabled due to linking problem when used as an external repository with sanitizers enabled.
     #user_link_flags = [
     #    "-Wl,--no-undefined",
     #],
-    deps = [
-        "//implementation:configuration",
-    ],
+    deps = ["//implementation:configuration"],
 )
 
 cc_shared_library(
     name = "vsomeip3_sd_plugin",
-    dynamic_deps = [
-        ":vsomeip3_shared",
-    ],
+    dynamic_deps = [":vsomeip3_shared"],
     shared_lib_name = "libvsomeip3-sd.so.3",
     tags = ["same-ros-pkg-as: vsomeip3"],
     # Disabled due to linking problem when used as an external repository with sanitizers enabled.
     #user_link_flags = [
     #    "-Wl,--no-undefined",
     #],
-    deps = [
-        "//implementation:service_discovery",
-    ],
+    deps = ["//implementation:service_discovery"],
 )
 
 cc_import(
     name = "vsomeip3_import",
     shared_library = ":vsomeip3_shared",
     tags = ["same-ros-pkg-as: vsomeip3"],
-    deps = [
-        "//interface",
-    ],
+    deps = ["//interface"],
+)
+
+cc_import(
+    name = "vsomeip3_configuration_plugin_import",
+    shared_library = ":vsomeip3_config_plugin",
+    tags = ["same-ros-pkg-as: vsomeip3"],
+)
+
+cc_import(
+    name = "vsomeip3_sd_plugin_import",
+    shared_library = ":vsomeip3_sd_plugin",
+    tags = ["same-ros-pkg-as: vsomeip3"],
 )
 
 # interface library, use this target to depend on vsomeip
@@ -67,5 +67,8 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":vsomeip3_import",
+        ":vsomeip3_configuration_plugin_import",
+        ":vsomeip3_sd_plugin_import",
+        "//interface",
     ],
 )
diff --git a/examples/hello_world/BUILD b/examples/hello_world/BUILD
index c9485587a..328db02e7 100644
--- a/examples/hello_world/BUILD
+++ b/examples/hello_world/BUILD
@@ -12,12 +12,7 @@ cc_library(
 
 cc_binary(
     name = "hello_world_service",
-    srcs = [
-        "hello_world_service_main.cpp",
-    ],
-    linkopts = [
-        "-Wl,-rpath=\\$$ORIGIN/../..,--disable-new-dtags",
-    ],
+    srcs = ["hello_world_service_main.cpp"],
     deps = [
         ":vsomeip_hello_world_service",
         "//:vsomeip3",
@@ -26,12 +21,7 @@ cc_binary(
 
 cc_binary(
     name = "hello_world_client",
-    srcs = [
-        "hello_world_client_main.cpp",
-    ],
-    linkopts = [
-        "-Wl,-rpath=\\$$ORIGIN/../..,--disable-new-dtags",
-    ],
+    srcs = ["hello_world_client_main.cpp"],
     deps = [
         ":vsomeip_hello_world_client",
         "//:vsomeip3",