diff --git a/src/main/scala/com/github/sbt/osgi/SbtOsgi.scala b/src/main/scala/com/github/sbt/osgi/SbtOsgi.scala
index 24da9de..dd82d76 100644
--- a/src/main/scala/com/github/sbt/osgi/SbtOsgi.scala
+++ b/src/main/scala/com/github/sbt/osgi/SbtOsgi.scala
@@ -17,6 +17,7 @@
 package com.github.sbt.osgi
 
 import sbt._
+import sbt.Classpaths.concat
 import sbt.Keys._
 import sbt.plugins.JvmPlugin
 
@@ -45,10 +46,12 @@ object SbtOsgi extends AutoPlugin {
   lazy val defaultOsgiSettings: Seq[Setting[_]] = {
     import OsgiKeys._
     Seq(
+      (Compile / exportJars) := false,
+      (Compile / fullClasspath) := concat(Compile / exportedProducts, Compile / dependencyClasspathAsJars).value,
       bundle := Osgi.bundleTask(
         manifestHeaders.value,
         additionalHeaders.value,
-        (Compile / dependencyClasspathAsJars).value.map(_.data) ++ (Compile / products).value,
+        (Compile / fullClasspath).value.map(_.data),
         (Compile / packageBin / artifactPath).value,
         (Compile / resourceDirectories).value,
         embeddedJars.value,
@@ -78,7 +81,6 @@ object SbtOsgi extends AutoPlugin {
         requireBundle.value,
         requireCapability.value
       ),
-      Compile / sbt.Keys.packageBin := bundle.value,
       bundleSymbolicName := Osgi.defaultBundleSymbolicName(organization.value, normalizedName.value),
       privatePackage := bundleSymbolicName(name => List(name + ".*")).value,
       bundleVersion := version.value
diff --git a/src/sbt-test/sbt-osgi/test-00-defaults/build.sbt b/src/sbt-test/sbt-osgi/test-00-defaults/build.sbt
index f39bb2c..3116f32 100644
--- a/src/sbt-test/sbt-osgi/test-00-defaults/build.sbt
+++ b/src/sbt-test/sbt-osgi/test-00-defaults/build.sbt
@@ -8,6 +8,8 @@ version := "1.2.3"
 
 libraryDependencies += "org.osgi" % "org.osgi.core" % "4.3.0" % "provided"
 
+(Compile / packageBin) := OsgiKeys.bundle.value
+
 osgiSettings
 
 TaskKey[Unit]("verifyBundleActivator") := {
diff --git a/src/sbt-test/sbt-osgi/test-10-multi-project-dependsOn-includePackage-versions/build.sbt b/src/sbt-test/sbt-osgi/test-10-multi-project-dependsOn-includePackage-versions/build.sbt
index b9ad0c3..f74f623 100644
--- a/src/sbt-test/sbt-osgi/test-10-multi-project-dependsOn-includePackage-versions/build.sbt
+++ b/src/sbt-test/sbt-osgi/test-10-multi-project-dependsOn-includePackage-versions/build.sbt
@@ -22,7 +22,8 @@ lazy val proj1 = project
     name := "proj1",
     OsgiKeys.bundleSymbolicName := "proj1",
     OsgiKeys.bundleVersion := version.value,
-    OsgiKeys.exportPackage := Seq("proj1")
+    OsgiKeys.exportPackage := Seq("proj1"),
+    (Compile / packageBin) := OsgiKeys.bundle.value
   )
 
 lazy val proj2 = project
@@ -33,7 +34,8 @@ lazy val proj2 = project
     name := "proj2",
     OsgiKeys.bundleSymbolicName := "proj2",
     OsgiKeys.bundleVersion := version.value,
-    OsgiKeys.exportPackage := Seq("proj2")
+    OsgiKeys.exportPackage := Seq("proj2"),
+    (Compile / packageBin) := OsgiKeys.bundle.value
   )
 
 TaskKey[Unit]("verifyBundle") := {