diff --git a/fail.just b/fail.just
index 23fc5c4..919a824 100644
--- a/fail.just
+++ b/fail.just
@@ -61,7 +61,14 @@ import module:
 [doc("Start the FAIL* campaign server")]
 [group("fail")]
 server module:
-    {{ FAIL_SERVER }} --database-option-file ./db.conf -v {{ module }} -b % --inject-single-bit --inject-registers &
+    {{ FAIL_SERVER }} \
+        --port {{FAIL_SERVER_PORT}} \
+        --database-option-file ./db.conf \
+        -v {{ module }} \
+        -b % \
+        --inject-single-bit \
+        --inject-registers \
+        &
     @echo "Next step: \"just client {{ module }}\""
 
 [doc("Stop the FAIL* campaign server")]
@@ -80,6 +87,7 @@ client module:
         -i {{ BUILD_DIR }}-{{ module }}/system.iso \
         -j {{ num_cpus() }} \
         -- \
+        -Wf,--server-port={{FAIL_SERVER_PORT}} \
         -Wf,--state-dir={{ BUILD_DIR }}-{{ module }}/state \
         -Wf,--trap \
         -Wf,--timeout=500000 \
@@ -104,4 +112,4 @@ result module:
 [doc("Start the FAIL* resultbrowser")]
 [group("fail")]
 resultbrowser:
-    {{ RESULT_BROWSER }} -c ./db.conf --host=0.0.0.0 --port=5000
+    {{ RESULT_BROWSER }} -c ./db.conf --host=0.0.0.0 --port={{RESULTBROWSER_PORT}}
diff --git a/mars.just b/mars.just
index b3e21ec..8855295 100644
--- a/mars.just
+++ b/mars.just
@@ -4,6 +4,8 @@ BUILD_DIR := "build"
 
 # FAIL* variables
 
+FAIL_SERVER_PORT := "22941"
+RESULTBROWSER_PORT := "22941"
 FAIL_BIN := "bin"
 FAIL_SHARE := "share"
 BOCHS_RUNNER := f"{{FAIL_BIN}}/bochs-experiment-runner.py"
@@ -23,3 +25,11 @@ RESULT_BROWSER := f"{{FAIL_BIN}}/resultbrowser.py"
 [private]
 list:
     @./just --list --unsorted
+
+# Create a database:
+# - mysql -u smchurla -p
+# - CREATE DATABASE database_name;
+# - SHOW DATABASES;
+
+procs:
+    ps -u smchurla
diff --git a/nixos.just b/nixos.just
index 6138fe4..a7a3324 100644
--- a/nixos.just
+++ b/nixos.just
@@ -16,6 +16,8 @@ LINUX_CC := env("LINUX_CC")
 
 # FAIL* variables
 
+FAIL_SERVER_PORT := "1111"
+RESULTBROWSER_PORT := "5000"
 BOCHS_RUNNER := "bochs-experiment-runner.py"
 FAIL_TRACE := "fail-x86-tracing"
 FAIL_DUMP := "dump-trace"