diff --git a/.pubkeys/guix/cuirass-genenetwork-org.pub b/.guix/.pubkeys/guix/cuirass-genenetwork-org.pub
similarity index 100%
rename from .pubkeys/guix/cuirass-genenetwork-org.pub
rename to .guix/.pubkeys/guix/cuirass-genenetwork-org.pub
diff --git a/.pubkeys/guix/cuirass-nonguix-org.pub b/.guix/.pubkeys/guix/cuirass-nonguix-org.pub
similarity index 100%
rename from .pubkeys/guix/cuirass-nonguix-org.pub
rename to .guix/.pubkeys/guix/cuirass-nonguix-org.pub
diff --git a/.pubkeys/guix/guix-ci-home-rekahsoft-ca.pub b/.guix/.pubkeys/guix/guix-ci-home-rekahsoft-ca.pub
similarity index 100%
rename from .pubkeys/guix/guix-ci-home-rekahsoft-ca.pub
rename to .guix/.pubkeys/guix/guix-ci-home-rekahsoft-ca.pub
diff --git a/.pubkeys/ssh/ed25519-861CD08E.pub b/.guix/.pubkeys/ssh/ed25519-861CD08E.pub
similarity index 100%
rename from .pubkeys/ssh/ed25519-861CD08E.pub
rename to .guix/.pubkeys/ssh/ed25519-861CD08E.pub
diff --git a/.pubkeys/ssh/rsa2048-ED51AB07.pub b/.guix/.pubkeys/ssh/rsa2048-ED51AB07.pub
similarity index 100%
rename from .pubkeys/ssh/rsa2048-ED51AB07.pub
rename to .guix/.pubkeys/ssh/rsa2048-ED51AB07.pub
diff --git a/.pubkeys/ssh/rsa4096-6765FB18.pub b/.guix/.pubkeys/ssh/rsa4096-6765FB18.pub
similarity index 100%
rename from .pubkeys/ssh/rsa4096-6765FB18.pub
rename to .guix/.pubkeys/ssh/rsa4096-6765FB18.pub
diff --git a/.guix/rekahsoft/guix-config/desktop.scm b/.guix/rekahsoft/guix-config/desktop.scm
index 35c8fc2..3d8b31a 100644
--- a/.guix/rekahsoft/guix-config/desktop.scm
+++ b/.guix/rekahsoft/guix-config/desktop.scm
@@ -23,14 +23,14 @@
 
 (define %guix-signing-keys
   (list
-   (local-file "../../../.pubkeys/guix/cuirass-genenetwork-org.pub")
-   (local-file "../../../.pubkeys/guix/cuirass-nonguix-org.pub")
-   (local-file "../../../.pubkeys/guix/guix-ci-home-rekahsoft-ca.pub")))
+   (local-file "../../.pubkeys/guix/cuirass-genenetwork-org.pub")
+   (local-file "../../.pubkeys/guix/cuirass-nonguix-org.pub")
+   (local-file "../../.pubkeys/guix/guix-ci-home-rekahsoft-ca.pub")))
 
 ;; Keys used for ssh access
-(define collin-ed25519-key (local-file "../../../.pubkeys/ssh/ed25519-861CD08E.pub"))
-(define collin-rsa4096-key (local-file "../../../.pubkeys/ssh/rsa4096-6765FB18.pub"))
-(define collin-rsa-key (local-file "../../../.pubkeys/ssh/rsa2048-ED51AB07.pub"))
+(define collin-ed25519-key (local-file "../../.pubkeys/ssh/ed25519-861CD08E.pub"))
+(define collin-rsa4096-key (local-file "../../.pubkeys/ssh/rsa4096-6765FB18.pub"))
+(define collin-rsa-key (local-file "../../.pubkeys/ssh/rsa2048-ED51AB07.pub"))
 
 (define %rkd-desktop-services
   (append
diff --git a/.guix/rekahsoft/guix-config/home.scm b/.guix/rekahsoft/guix-config/home.scm
index 8542146..045bd31 100644
--- a/.guix/rekahsoft/guix-config/home.scm
+++ b/.guix/rekahsoft/guix-config/home.scm
@@ -496,9 +496,9 @@ single certifcate used for local development with caddy.")
         (".guile" ,(local-file "../../../user-config/guile/.guile" "guilerc"))
         (".ghci" ,(local-file "../../../user-config/haskell/.ghci" "ghci"))
 
-        (".ssh/id_ed25519.pub" ,(local-file "../../../.pubkeys/ed25519-861CD08E.pub" "id_ed25519.pub"))
-        (".ssh/id_rsa4096.pub" ,(local-file "../../../.pubkeys/rsa4096-6765FB18.pub" "id_rsa4096.pub"))
-        (".ssh/id_rsa.pub" ,(local-file "../../../.pubkeys/rsa2048-ED51AB07.pub" "id_rsa.pub"))
+        (".ssh/id_ed25519.pub" ,(local-file "../../.pubkeys/ssh/ed25519-861CD08E.pub" "id_ed25519.pub"))
+        (".ssh/id_rsa4096.pub" ,(local-file "../../.pubkeys/ssh/rsa4096-6765FB18.pub" "id_rsa4096.pub"))
+        (".ssh/id_rsa.pub" ,(local-file "../../.pubkeys/ssh/rsa2048-ED51AB07.pub" "id_rsa.pub"))
 
         (".gnupg/gpg.conf" ,(local-file "../../../user-config/gnupg/gpg.conf" "gpg.conf"))
         (".bin/emacs-mail.sh" ,(local-file "../../../user-config/emacs/.bin/emacs-mail.sh" "emacs-mail.sh" #:recursive? #t))