diff --git a/homes/common.nix b/homes/common.nix
index de9f4a0..24902c3 100644
--- a/homes/common.nix
+++ b/homes/common.nix
@@ -152,7 +152,8 @@ in {
         add_newline = false;
         format = lib.concatStrings [
           "$os"
-          "$container"
+          " "
+          "($container )"
           "\\["
           "([$username](bold yellow)@[$hostname](bold red))"
           "[$directory](cyan)"
@@ -173,6 +174,7 @@ in {
           # Remove trailing space from format string
           format = "([\\[$all_status$ahead_behind\\]]($style))";
         };
+        hostname = { format = "[$hostname]($style)"; };
         shell = {
           # Show which shell if not using zsh (the default)
           disabled = false;
@@ -190,6 +192,7 @@ in {
             Macos = "";
           };
         };
+        username = { format = "[$user]($style)"; };
       };
 
     };