diff --git a/.github/workflows/publish-docker-image.yml b/.github/workflows/publish-docker-image.yml
index af066035..4563687d 100644
--- a/.github/workflows/publish-docker-image.yml
+++ b/.github/workflows/publish-docker-image.yml
@@ -52,6 +52,8 @@ jobs:
           pull: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
       - uses: actions/attest-build-provenance@v1
         with:
           subject-name: ${{ env.IMAGE_NAME}}
diff --git a/build.sbt b/build.sbt
index c0dfff97..20455839 100644
--- a/build.sbt
+++ b/build.sbt
@@ -63,10 +63,16 @@ def universalDepMappings(deps: Seq[Attributed[File]]): Seq[(File, String)] =
     dep <- deps
   } yield dep.data -> ("lib/" + getJarFullFilename(dep))
 
+Universal / mappings += {
+  val jar = (Compile / packageBin).value
+  val id = projectID.value
+  val art = (Compile / packageBin / artifact).value
+  jar -> ("lib/" + makeJarName(id.organization, id.name, id.revision, art.name, art.classifier))
+}
 Universal / mappings ++= universalDepMappings((Runtime / dependencyClasspath).value.filterNot { p =>
-  p.get(AttributeKey[ModuleID]("moduleID")).exists { m =>
-    m.organization == "org.scala-lang" ||
-    m.organization.startsWith("com.fasterxml.jackson")
+  p.get(AttributeKey[ModuleID]("moduleID")).exists { m => false
+//    m.organization == "org.scala-lang" ||
+//    m.organization.startsWith("com.fasterxml.jackson")
   }
 })