diff --git a/shopbot.sls b/shopbot.sls
index 2447734..8d4e408 100644
--- a/shopbot.sls
+++ b/shopbot.sls
@@ -9,8 +9,3 @@ shopbot:
 
 # TODO: shopbot ini file
 
-vcarve-pro-trial:
-  chocolatey.installed:
-    - name: vcarve-pro-trial
-    - require:
-      - sls: chocolatey
diff --git a/top.sls b/top.sls
index bc9909c..46fd25d 100644
--- a/top.sls
+++ b/top.sls
@@ -1,6 +1,12 @@
 base:
-  'G@os:Windows and *Laptop*':
+  'G@os:Windows and ( TSMS-Laptop* or TSMS-Desktop12 )':
     - shopbot
+  # Laptops 1-4 and Desktop 12
+  'G@os:Windows and ( E@TSMS-Laptop[1-4]$ or TSMS-Desktop12 )':
+    - vcarve-pro-makerspace
+  # Other laptops
+  'G@os:Windows and TSMS-Laptop* and not E@TSMS-Laptop[1-4]$':
+    - vcarve-pro-trial
   # 'TSMS-TWO-DTPC':
   #   - winHiDPI
   'G@os:Windows and TSMS-Desktop11':
diff --git a/vcarve-pro-makerspace.sls b/vcarve-pro-makerspace.sls
new file mode 100644
index 0000000..1aefe23
--- /dev/null
+++ b/vcarve-pro-makerspace.sls
@@ -0,0 +1,14 @@
+include:
+  - chocolatey
+
+uninstall vcarve-pro-trial:
+  chocolatey.uninstalled:
+    - name: vcarve-pro-trial
+    - require:
+      - sls: chocolatey
+
+vcarve-pro-makerspace:
+  chocolatey.installed:
+    - name: vcarve-pro-makerspace
+    - require:
+      - sls: chocolatey
diff --git a/vcarve-pro-trial.sls b/vcarve-pro-trial.sls
new file mode 100644
index 0000000..e929ddc
--- /dev/null
+++ b/vcarve-pro-trial.sls
@@ -0,0 +1,8 @@
+include:
+  - chocolatey
+
+vcarve-pro-trial:
+  chocolatey.installed:
+    - name: vcarve-pro-trial
+    - require:
+      - sls: chocolatey