diff --git a/appmgr/src/bin/embassy-init.rs b/appmgr/src/bin/embassy-init.rs
index aee291c0e..4ac600c4d 100644
--- a/appmgr/src/bin/embassy-init.rs
+++ b/appmgr/src/bin/embassy-init.rs
@@ -114,7 +114,7 @@ async fn init(cfg_path: Option<&str>) -> Result<(), Error> {
         .invoke(embassy::ErrorKind::Docker)
         .await?;
     log::info!("Mounted Docker Data");
-    embassy::install::load_images().await?;
+    embassy::install::load_images(cfg.datadir()).await?;
     log::info!("Loaded Docker Images");
     embassy::ssh::sync_keys_from_db(&secret_store, "/root/.ssh/authorized_keys").await?;
     log::info!("Synced SSH Keys");
@@ -241,7 +241,6 @@ fn main() {
         _ => log::LevelFilter::Trace,
     });
     let cfg_path = matches.value_of("config");
-
     let res = {
         let rt = tokio::runtime::Builder::new_multi_thread()
             .enable_all()
diff --git a/appmgr/src/install/mod.rs b/appmgr/src/install/mod.rs
index 8688d9dbf..a91155d01 100644
--- a/appmgr/src/install/mod.rs
+++ b/appmgr/src/install/mod.rs
@@ -714,8 +714,8 @@ pub async fn install_s9pk<R: AsyncRead + AsyncSeek + Unpin>(
     Ok(())
 }
 
-pub async fn load_images(ctx: RpcContext) -> Result<(), Error> {
-    let docker_dir = ctx.datadir.join(PKG_DOCKER_DIR);
+pub async fn load_images<P: AsRef<Path>>(datadir: P) -> Result<(), Error> {
+    let docker_dir = datadir.as_ref().join(PKG_DOCKER_DIR);
     if tokio::fs::metadata(&docker_dir).await.is_ok() {
         ReadDirStream::new(tokio::fs::read_dir(&docker_dir).await?)
             .map_err(|e| {