diff --git a/home/modules/aerospace/work.nix b/home/modules/aerospace/work.nix
new file mode 100644
index 0000000..561d119
--- /dev/null
+++ b/home/modules/aerospace/work.nix
@@ -0,0 +1,65 @@
+{
+  services.aerospace = {
+    enable = true;
+    settings = {
+      accordion-padding = 25;
+      gaps = {
+        inner.horizontal = 6;
+        inner.vertical = 6;
+        outer.left = 6;
+        outer.bottom = 6;
+        outer.top = 6;
+        outer.right = 6;
+      };
+      workspace-to-monitor-force-assignment = {
+        "1" = "main";
+        "2" = "main";
+        "3" = "main";
+        "4" = "main";
+        "5" = "secondary";
+        "6" = "secondary";
+      };
+      mode.main.binding = {
+        alt-h = "focus left";
+        alt-j = "focus down";
+        alt-k = "focus up";
+        alt-l = "focus right";
+        alt-shift-h = "move left";
+        alt-shift-j = "move down";
+        alt-shift-k = "move up";
+        alt-shift-l = "move right";
+        alt-comma = "layout tiles horizontal vertical";
+        alt-period = "layout accordion horizontal vertical";
+        alt-f = "fullscreen";
+        alt-1 = "workspace 1";
+        alt-2 = "workspace 2";
+        alt-3 = "workspace 3";
+        alt-4 = "workspace 4";
+        alt-5 = "workspace 5";
+        alt-6 = "workspace 6";
+        alt-shift-1 = [ "move-node-to-workspace 1" "workspace 1" ];
+        alt-shift-2 = [ "move-node-to-workspace 2" "workspace 2" ];
+        alt-shift-3 = [ "move-node-to-workspace 3" "workspace 3" ];
+        alt-shift-4 = [ "move-node-to-workspace 4" "workspace 4" ];
+        alt-shift-5 = [ "move-node-to-workspace 5" "workspace 5" ];
+        alt-shift-6 = [ "move-node-to-workspace 6" "workspace 6" ];
+        alt-tab = "workspace-back-and-forth";
+        alt-shift-tab = "move-workspace-to-monitor --wrap-around next";
+      };
+      on-window-detected = [
+        {
+          "if".app-id = "company.thebrowser.Browser";
+          run = "move-node-to-workspace 1";
+        }
+        {
+          "if".app-id = "com.github.wez.wezterm";
+          run = "move-node-to-workspace 2";
+        }
+        {
+          "if".app-id = "com.microsoft.teams2";
+          run = "move-node-to-workspace 5";
+        }
+      ];
+    };
+  };
+}
diff --git a/hosts/dnsc-work/default.nix b/hosts/dnsc-work/default.nix
index 06b5f7c..f85750c 100644
--- a/hosts/dnsc-work/default.nix
+++ b/hosts/dnsc-work/default.nix
@@ -8,7 +8,7 @@
 }: {
   imports = [
     inputs.home-manager.darwinModules.home-manager
-    ../../home/modules/aerospace
+    ../../home/modules/aerospace/work.nix
   ];
 
   # Setting the user
@@ -102,6 +102,7 @@
       "1password"
       "android-studio"
       "zulu@17"
+      "postman"
     ];
   };
 
@@ -130,6 +131,7 @@
         persistent-apps = [
           "/Applications/Arc.app"
           "/Applications/WezTerm.app"
+          "/Applications/Microsoft Teams.app"
           "/System/Applications/System Settings.app/"
         ];
         persistent-others = [