diff --git a/appmgr/src/bin/embassy-init.rs b/appmgr/src/bin/embassy-init.rs
index 1c00eb0e4..2dd146358 100644
--- a/appmgr/src/bin/embassy-init.rs
+++ b/appmgr/src/bin/embassy-init.rs
@@ -71,9 +71,14 @@ async fn init(cfg_path: Option<&str>) -> Result<(), Error> {
         .arg(&tmp_docker)
         .invoke(embassy::ErrorKind::Filesystem)
         .await?;
+    Command::new("systemctl")
+        .arg("stop")
+        .arg("docker")
+        .invoke(embassy::ErrorKind::Journald)
+        .await?;
     embassy::disk::util::bind(&tmp_docker, "/var/lib/docker", false).await?;
     Command::new("systemctl")
-        .arg("restart")
+        .arg("start")
         .arg("docker")
         .invoke(embassy::ErrorKind::Journald)
         .await?;
diff --git a/appmgr/src/config/spec.rs b/appmgr/src/config/spec.rs
index 482438740..b05237278 100644
--- a/appmgr/src/config/spec.rs
+++ b/appmgr/src/config/spec.rs
@@ -1980,9 +1980,9 @@ mod test {
                 "lan-address": {
                   "name": "LAN Address",
                   "type": "pointer",
-                  "subtype": "app",
+                  "subtype": "package",
                   "target": "lan-address",
-                  "app-id": "bitcoind",
+                  "package-id": "bitcoind",
                   "description": "the lan address"
                 }
               },
diff --git a/appmgr/src/install/mod.rs b/appmgr/src/install/mod.rs
index 382b365b8..9115b943f 100644
--- a/appmgr/src/install/mod.rs
+++ b/appmgr/src/install/mod.rs
@@ -96,7 +96,7 @@ pub async fn install(
         }
         _ => {
             return Err(Error::new(
-                anyhow!("Cannot install over an app in a transient state"),
+                anyhow!("Cannot install over a package in a transient state"),
                 crate::ErrorKind::InvalidRequest,
             ))
         }
diff --git a/appmgr/src/lib.rs b/appmgr/src/lib.rs
index 049ac7175..a5b87f4b5 100644
--- a/appmgr/src/lib.rs
+++ b/appmgr/src/lib.rs
@@ -1,21 +1,11 @@
 pub const CONFIG_PATH: &'static str = "/etc/embassy/config.toml";
-pub const TOR_RC: &'static str = "/root/appmgr/tor/torrc";
 pub const SERVICES_YAML: &'static str = "tor/services.yaml";
 pub const VOLUMES: &'static str = "/root/volumes";
-pub const PERSISTENCE_DIR: &'static str = "/root/appmgr";
-pub const TMP_DIR: &'static str = "/root/tmp/appmgr";
 pub const BACKUP_MOUNT_POINT: &'static str = "/mnt/backup_drive";
 pub const BACKUP_DIR: &'static str = "Embassy Backups";
 pub const BUFFER_SIZE: usize = 1024;
 pub const HOST_IP: [u8; 4] = [172, 18, 0, 1];
 
-lazy_static::lazy_static! {
-    pub static ref REGISTRY_URL: String = std::env::var("REGISTRY_URL").unwrap_or_else(|_| "https://registry.start9labs.com".to_owned());
-    pub static ref SYS_REGISTRY_URL: String = format!("{}/sys", *REGISTRY_URL);
-    pub static ref APP_REGISTRY_URL: String = format!("{}/apps", *REGISTRY_URL);
-    pub static ref QUIET: tokio::sync::RwLock<bool> = tokio::sync::RwLock::new(!std::env::var("APPMGR_QUIET").map(|a| a == "0").unwrap_or(true));
-}
-
 pub mod action;
 pub mod auth;
 pub mod backup;
diff --git a/appmgr/src/manager/mod.rs b/appmgr/src/manager/mod.rs
index fcb1cfbca..e1fa1cc35 100644
--- a/appmgr/src/manager/mod.rs
+++ b/appmgr/src/manager/mod.rs
@@ -305,10 +305,10 @@ impl Manager {
                             .unwrap(); // recv is still in scope, cannot fail
                     }
                     Ok(Err(e)) => {
-                        log::error!("application crashed: {}: {}", e.0, e.1)
+                        log::error!("service crashed: {}: {}", e.0, e.1)
                     }
                     Err(e) => {
-                        log::error!("failed to start application: {}", e)
+                        log::error!("failed to start service: {}", e)
                     }
                 }
             }
diff --git a/appmgr/src/net/mdns.rs b/appmgr/src/net/mdns.rs
index cfa6ea642..121dd438e 100644
--- a/appmgr/src/net/mdns.rs
+++ b/appmgr/src/net/mdns.rs
@@ -70,8 +70,6 @@ impl MdnsControllerInner {
     }
     fn init() -> Self {
         unsafe {
-            // let app_list = crate::apps::list_info().await?;
-
             let simple_poll = avahi_sys::avahi_simple_poll_new();
             let poll = avahi_sys::avahi_simple_poll_get(simple_poll);
             let mut stack_err = 0;
diff --git a/appmgr/src/shutdown.rs b/appmgr/src/shutdown.rs
index b02f7ece6..d137d56e8 100644
--- a/appmgr/src/shutdown.rs
+++ b/appmgr/src/shutdown.rs
@@ -24,6 +24,13 @@ impl Shutdown {
             .unwrap()
             .wait()
             .unwrap();
+        Command::new("systemctl")
+            .arg("stop")
+            .arg("docker")
+            .spawn()
+            .unwrap()
+            .wait()
+            .unwrap();
         if let Err(e) = export_blocking(&self.zfs_pool) {
             log::error!("Error Exporting ZFS Pool: {}", e);
         }