diff --git a/playbooks/Windows.yaml b/playbooks/Windows.yaml
index d59c96c..49720bd 100644
--- a/playbooks/Windows.yaml
+++ b/playbooks/Windows.yaml
@@ -1,29 +1,9 @@
 ---
+- import_playbook: WindowsCLI.yaml
 - hosts: windows
   vars_files:
     - vars/environment.yaml
   roles:
-    - role: python
-    - role: git
-    - role: powershell
-    - role: neovim
-    - role: system-info
-
-    - role: ag
-    - role: bat
-    - role: curl
-    - role: fd
-    - role: fzf
-    - role: gh
-    - role: glab
-    - role: jq
-    - role: ripgrep
-    - role: tree
-    - role: yq
-
-    - role: llvm
-    - role: nodejs
-
     - role: 1password
     - role: autohotkey
     - role: cider
@@ -33,3 +13,4 @@
     - role: obsidian
     - role: powertoys
     - role: windows-terminal
+    # TODO: wezterm
diff --git a/playbooks/WindowsCLI.yaml b/playbooks/WindowsCLI.yaml
new file mode 100644
index 0000000..31223cf
--- /dev/null
+++ b/playbooks/WindowsCLI.yaml
@@ -0,0 +1,26 @@
+---
+- hosts: windows
+  vars_files:
+    - vars/environment.yaml
+  roles:
+    - role: scoop
+    - role: python
+    - role: git
+    - role: powershell
+    - role: neovim
+    - role: system-info
+
+    - role: ag
+    - role: bat
+    - role: curl
+    - role: fd
+    - role: fzf
+    - role: gh
+    - role: glab
+    - role: jq
+    - role: ripgrep
+    - role: tree
+    - role: yq
+
+    - role: llvm
+    - role: nodejs