diff --git a/Cargo.lock b/Cargo.lock
index 02a0593..9224fae 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2386,7 +2386,7 @@ dependencies = [
 
 [[package]]
 name = "peach-config"
-version = "0.1.24"
+version = "0.1.25"
 dependencies = [
  "clap",
  "env_logger 0.6.2",
@@ -2425,7 +2425,7 @@ dependencies = [
 
 [[package]]
 name = "peach-lib"
-version = "1.3.2"
+version = "1.3.3"
 dependencies = [
  "async-std",
  "chrono",
diff --git a/peach-config/Cargo.toml b/peach-config/Cargo.toml
index d51afdb..e2f226f 100644
--- a/peach-config/Cargo.toml
+++ b/peach-config/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "peach-config"
-version = "0.1.24"
+version = "0.1.25"
 authors = ["Andrew Reid <gnomad@cryptolab.net>", "Max Fowler <max@mfowler.info>"]
 edition = "2018"
 description = "Command line tool for installing, updating and configuring PeachCloud"
diff --git a/peach-config/src/set_permissions.rs b/peach-config/src/set_permissions.rs
index 72ea4a0..26d07f8 100644
--- a/peach-config/src/set_permissions.rs
+++ b/peach-config/src/set_permissions.rs
@@ -6,9 +6,9 @@ use crate::error::PeachConfigError;
 use crate::utils::cmd;
 
 lazy_static! {
-    pub static ref CONFIGS_DIR: String = get_config_value("PEACH_CONFIG_DIR").expect("Failed to load config value for PEACH_CONFIG_DIR");
-    pub static ref PEACH_WEB_DIR: String = "/usr/share/peach-web".to_string();
-    pub static ref PEACH_HOME_DIR: String = "/home/peach".to_string();
+    pub static ref PEACH_CONFIGDIR: String = get_config_value("PEACH_CONFIGDIR").expect("Failed to load config value for PEACH_CONFIGDIR");
+    pub static ref PEACH_WEBDIR: String = get_config_value("PEACH_WEBDIR").expect("Failed to load config value for PEACH_WEBDIR");
+    pub static ref PEACH_HOMEDIR: String = get_config_value("PEACH_HOMEDIR").expect("Failed to load config value for PEACH_HOMEDIR");
 }
 
 /// Utility function to set correct file permissions on the PeachCloud device.
@@ -16,12 +16,12 @@ lazy_static! {
 /// so this is a useful CLI function for quickly correcting anything that may be out of order.
 pub fn set_permissions() -> Result<(), PeachConfigError> {
     println!("[ UPDATING FILE PERMISSIONS ON PEACHCLOUD DEVICE ]");
-    cmd(&["chmod", "-R", "u+rwX,g+rwX", &CONFIGS_DIR])?;
-    cmd(&["chown", "-R", "peach:peach", &CONFIGS_DIR])?;
-    cmd(&["chmod", "-R", "u+rwX,g+rwX", &PEACH_WEB_DIR])?;
-    cmd(&["chown", "-R", "peach:peach", &PEACH_WEB_DIR])?;
-    cmd(&["chmod", "-R", "u+rwX,g+rwX", &PEACH_HOME_DIR])?;
-    cmd(&["chown", "-R", "peach:peach", &PEACH_HOME_DIR])?;
+    cmd(&["chmod", "-R", "u+rwX,g+rwX", &PEACH_CONFIGDIR])?;
+    cmd(&["chown", "-R", "peach:peach", &PEACH_CONFIGDIR])?;
+    cmd(&["chmod", "-R", "u+rwX,g+rwX", &PEACH_WEBDIR])?;
+    cmd(&["chown", "-R", "peach:peach", &PEACH_WEBDIR])?;
+    cmd(&["chmod", "-R", "u+rwX,g+rwX", &PEACH_HOMEDIR])?;
+    cmd(&["chown", "-R", "peach:peach", &PEACH_HOMEDIR])?;
     println!("[ PERMISSIONS SUCCESSFULLY UPDATED ]");
     Ok(())
 }
diff --git a/peach-lib/Cargo.toml b/peach-lib/Cargo.toml
index 370db43..028c61a 100644
--- a/peach-lib/Cargo.toml
+++ b/peach-lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "peach-lib"
-version = "1.3.2"
+version = "1.3.3"
 authors = ["Andrew Reid <glyph@mycelial.technology>"]
 edition = "2018"
 
diff --git a/peach-lib/src/config_manager.rs b/peach-lib/src/config_manager.rs
index 3852dfc..11ae424 100644
--- a/peach-lib/src/config_manager.rs
+++ b/peach-lib/src/config_manager.rs
@@ -61,6 +61,8 @@ pub fn get_peach_config_defaults() -> HashMap<String, String> {
         ("TEMPORARY_PASSWORD_HASH", ""),
         ("GO_SBOT_DATADIR", "/home/peach/.ssb-go"),
         ("PEACH_CONFIGDIR", "/var/lib/peachcloud"),
+        ("PEACH_HOMEDIR", "/home/peach"),
+        ("PEACH_WEBDIR", "/usr/share/peach-web"),
     ]);
     // convert HashMap<&str, &str> to HashMap<String, String> and return
     let pc_defaults: HashMap<String, String> = peach_config_defaults