diff --git a/local-pkgs-gnu/packages/actual-server-installer.scm b/local-pkgs-gnu/packages/actual-server-installer.scm
index 4ecd2bc..b13e538 100644
--- a/local-pkgs-gnu/packages/actual-server-installer.scm
+++ b/local-pkgs-gnu/packages/actual-server-installer.scm
@@ -77,9 +77,9 @@
 
 (mkdir-p directory)
 
-(run-and-display-command (string-append "guix shell --container --network --pure --no-cwd --emulate-fhs --share=" directory "=/actual-server --user=build actual-server-installer -- bash -c 'guile $GUIX_ENVIRONMENT/lib/actual-server-installer/build.scm'"))
-
-(run-and-display-command (string-append "cd " directory))
+(run-and-display-command (string-append "guix shell --container --network --pure --no-cwd --emulate-fhs --share="
+directory
+"=/actual-server actual-server-installer -- bash -c 'guile $GUIX_ENVIRONMENT/lib/actual-server-installer/build.scm'"))
 
 ))
 
@@ -134,14 +134,14 @@
 
 (delete-directory-contents "/actual-server")
 
-(mkdir-p "/actual-server-build/lib")
+(mkdir-p "/actual-server-build/lib/actual-server")
 
 (copy-recursively (string-append (getenv "GUIX_ENVIRONMENT") "/lib/actual-server-installer/repo")
-"/actual-server-build/lib/actual-server")
+"/actual-server-build/lib/actual-server/proj")
 
-(chmod-r "/actual-server-build/lib/actual-server" #o755)
+(chmod-r "/actual-server-build/lib/actual-server/proj" #o755)
 
-(chdir "/actual-server-build/lib/actual-server")
+(chdir "/actual-server-build/lib/actual-server/proj")
 
 ;; Enable corepack and install yarn
 (run-and-display-command "corepack enable")
@@ -149,10 +149,11 @@
 (run-and-display-command "yarn install")
 
 ;; Create the necessary directory
-(mkdir-p "/actual-server-build/lib/actual-server-node")
+(mkdir-p "/actual-server-build/lib/actual-server/node")
 
-;; Copy directory
-(copy-recursively "~/.cache" "/actual-server-build/lib/actual-server-node/.cache")
+(copy-recursively
+    (string-append (getenv "HOME") "/.cache")
+    "/actual-server-build/lib/actual-server/node/.cache")
 
 ;; Create tar.gz archive
 (run-and-display-command "tar -czvf /actual-server/actual-server.tar.gz -C /actual-server-build .")