diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8850580..c22f805 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,6 @@
 stages:
   - build
+  - test
 
 cache: &global_cache
   key:
@@ -17,3 +18,6 @@ build:
     <<: *global_cache
   script:
     - nix --experimental-features 'nix-command flakes' flake check
+
+include:
+  - template: Jobs/Secret-Detection.gitlab-ci.yml
diff --git a/README.md b/README.md
index e50c1d3..8214bea 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ The below installation example is for a fresh `eirene-vm` virtual machine.
    ```sh
    mkdir -p /mnt/persist/etc/ssh
    ssh-keygen -t ed25519 -f /mnt/persist/etc/ssh/ssh_host_ed25519_key
-   cp /mnt/persist/etc/ssh/ssh_host_ed25519_key /host/hosts/eirene/vm/secrets/ssh_host_ed25519_key
+   cp /mnt/persist/etc/ssh/ssh_host_ed25519_key /host/hosts/eirene/secrets/ssh_host_ed25519_key
    ```
 
 4. Update `sops` Configuration
@@ -49,18 +49,18 @@ The below installation example is for a fresh `eirene-vm` virtual machine.
 
    - Known Hosts
 
-   ```sh
-   # Add to hosts/common/default.nix.programs.ssh.knownHosts
-   cp /mnt/persist/etc/ssh/ssh_host_ed25519_key.pub /host/hosts/eirene/vm/secrets/ssh_host_ed25519_key.pub
-   ```
+     ```sh
+     # Add to hosts/common/default.nix.programs.ssh.knownHosts
+     cp /mnt/persist/etc/ssh/ssh_host_ed25519_key.pub /host/hosts/eirene/secrets/ssh_host_ed25519_key.pub
+     ```
 
    - SSH Keys
 
-   ```sh
-   # Generate a new SSH key pair for every user in the current system for every existing host that will connect to the new host
-   # Add to hosts/eirene/vm/default.nix.users.users.nick.openssh.authorizedKeys.keyFiles
-   ssh-keygen -t ed25519 -f ~/.ssh/id_ed25519_eirene-vm_nick
-   ```
+     ```sh
+     # Generate a new SSH key pair for every user that will connect to the newly added user@host combinations
+     # Add to hosts/eirene/default.nix.users.users.nick.openssh.authorizedKeys.keyFiles
+     ssh-keygen -t ed25519 -f ~/.ssh/id_ed25519_eirene_nick
+     ```
 
 6. Install NixOS
 
diff --git a/hosts/common/default.nix b/hosts/common/default.nix
index 8a54d1a..def73f6 100644
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -68,7 +68,7 @@
       libraries = [ ];
     };
     ssh.knownHosts = {
-      eirene-vm.publicKeyFile = ../eirene/vm/secrets/ssh_host_ed25519_key.pub;
+      eirene.publicKeyFile = ../eirene/secrets/ssh_host_ed25519_key.pub;
     };
   };
 
diff --git a/hosts/eirene/vm/secrets/ssh_host_ed25519_key.pub b/hosts/eirene/secrets/ssh_host_ed25519_key.pub
similarity index 100%
rename from hosts/eirene/vm/secrets/ssh_host_ed25519_key.pub
rename to hosts/eirene/secrets/ssh_host_ed25519_key.pub