diff --git a/build.sbt b/build.sbt
index 11d6307fd0..9a9596b56f 100644
--- a/build.sbt
+++ b/build.sbt
@@ -201,7 +201,6 @@ lazy val D_Castor = new {
       D.circeCore,
       D.circeGeneric,
       D.circeParser,
-      prismCrypto,
       prismIdentity,
       scalaUri
     )
@@ -789,12 +788,12 @@ lazy val prismAgentServer = project
     Docker / dockerUsername := Some("input-output-hk"),
     Docker / dockerRepository := Some("ghcr.io"),
     dockerExposedPorts := Seq(8080, 8085, 8090),
-    dockerBaseImage := "openjdk:11",
+    dockerBaseImage := "amazoncorretto:21.0.0-alpine3.18",
     buildInfoKeys := Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion),
     buildInfoPackage := "io.iohk.atala.agent.server.buildinfo",
     Compile / packageDoc / publishArtifact := false
   )
-  .enablePlugins(JavaAppPackaging, DockerPlugin)
+  .enablePlugins(JavaAppPackaging, DockerPlugin, AshScriptPlugin)
   .enablePlugins(BuildInfoPlugin)
   .dependsOn(prismAgentWalletAPI % "compile->compile;test->test")
   .dependsOn(
diff --git a/infrastructure/local/.env b/infrastructure/local/.env
index 00710460b2..bf0f27606c 100644
--- a/infrastructure/local/.env
+++ b/infrastructure/local/.env
@@ -1,3 +1,3 @@
-PRISM_AGENT_VERSION=1.16.0
+PRISM_AGENT_VERSION=1.16.4-SNAPSHOT
 PRISM_NODE_VERSION=2.2.1
 VAULT_DEV_ROOT_TOKEN_ID=root
diff --git a/infrastructure/shared/docker-compose-demo.yml b/infrastructure/shared/docker-compose-demo.yml
index 2021606da1..770ff351bb 100644
--- a/infrastructure/shared/docker-compose-demo.yml
+++ b/infrastructure/shared/docker-compose-demo.yml
@@ -53,7 +53,7 @@ services:
       prism-node:
         condition: service_started
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://prism-agent:8085/_system/health"]
+      test: ["CMD", "wget", "--timeout=5", "--tries=3", "-O", "/dev/null", "http://prism-agent:8085/_system/health"]
       interval: 30s
       timeout: 10s
       retries: 5
diff --git a/infrastructure/shared/docker-compose.yml b/infrastructure/shared/docker-compose.yml
index 8b626ea58c..acc00622e3 100644
--- a/infrastructure/shared/docker-compose.yml
+++ b/infrastructure/shared/docker-compose.yml
@@ -121,7 +121,7 @@ services:
       vault-server:
         condition: service_healthy
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://prism-agent:8085/_system/health"]
+      test: ["CMD", "wget", "--timeout=5", "--tries=3", "-O", "/dev/null", "http://prism-agent:8085/_system/health"]
       interval: 30s
       timeout: 10s
       retries: 5