diff --git a/src/keys.rs b/src/keys.rs
index b6dc717..160a6b6 100644
--- a/src/keys.rs
+++ b/src/keys.rs
@@ -54,10 +54,11 @@ pub(crate) fn get_keys(machine: Option<&PathBuf>) -> Result<WireguardKeyPair, an
         hostname = PathBuf::from(gethostname());
         &hostname
     };
-    let key_path = get_data_dir().join("keys").join(machine_subdir);
+    let key_path = get_data_dir().join("keys");
     debug!("key path = {:?}", &key_path);
     std::fs::create_dir_all(&key_path)?;
-    let private_key_path = key_path.join("key");
+
+    let private_key_path = key_path.join(machine_subdir);
     let private_key = if private_key_path.is_file() {
         Key::load(&private_key_path)?
     } else {
@@ -65,14 +66,9 @@ pub(crate) fn get_keys(machine: Option<&PathBuf>) -> Result<WireguardKeyPair, an
         key.save(&private_key_path)?;
         key
     };
-    let public_key_path = key_path.join("pubkey");
-    let public_key = if public_key_path.is_file() {
-        Key::load(&public_key_path)?
-    } else {
-        let key = generate_public_key(&private_key);
-        key.save(&public_key_path)?;
-        key
-    };
+
+    let public_key = generate_public_key(&private_key);
+
     Ok(WireguardKeyPair {
         private_key,
         public_key,