diff --git a/dist/db.base.tar.gz b/dist/db.base.tar.gz
index b615db1..ce3339b 100644
Binary files a/dist/db.base.tar.gz and b/dist/db.base.tar.gz differ
diff --git a/dist/db.sample.tar.gz b/dist/db.sample.tar.gz
index 3818f47..4ce286c 100644
Binary files a/dist/db.sample.tar.gz and b/dist/db.sample.tar.gz differ
diff --git a/src/sampleDB/addConsumerCORSOrigins.cy.js b/src/sampleDB/addConsumerCORSOrigins.cy.js
index 457afb3..885a3a9 100644
--- a/src/sampleDB/addConsumerCORSOrigins.cy.js
+++ b/src/sampleDB/addConsumerCORSOrigins.cy.js
@@ -2,41 +2,41 @@ describe("Add CORS origins to the farm consumer", () => {
   it("Add CORS origins", () => {
     cy.login("admin", "admin");
     cy.visit(
-      "admin/config/services/consumer/2/edit?destination=/admin/config/services/consumer"
+      "admin/config/services/consumer/34/edit?destination=/admin/config/services/consumer"
     );
     cy.get("#edit-allowed-origins-0-value").clear();
     cy.get("#edit-allowed-origins-0-value").type("http://localhost:5173");
     cy.get("#edit-submit").click();
     cy.visit(
-      "admin/config/services/consumer/2/edit?destination=/admin/config/services/consumer"
+      "admin/config/services/consumer/34/edit?destination=/admin/config/services/consumer"
     );
 
     cy.get("#edit-allowed-origins-1-value").clear();
     cy.get("#edit-allowed-origins-1-value").type("http://localhost:5174");
     cy.get("#edit-submit").click();
     cy.visit(
-      "admin/config/services/consumer/2/edit?destination=/admin/config/services/consumer"
+      "admin/config/services/consumer/34/edit?destination=/admin/config/services/consumer"
     );
 
     cy.get("#edit-allowed-origins-2-value").clear();
     cy.get("#edit-allowed-origins-2-value").type("http://localhost:5175");
     cy.get("#edit-submit").click();
     cy.visit(
-      "admin/config/services/consumer/2/edit?destination=/admin/config/services/consumer"
+      "admin/config/services/consumer/34/edit?destination=/admin/config/services/consumer"
     );    
     
     cy.get("#edit-allowed-origins-3-value").clear();
     cy.get("#edit-allowed-origins-3-value").type("http://localhost:4173");
     cy.get("#edit-submit").click();
     cy.visit(
-      "admin/config/services/consumer/2/edit?destination=/admin/config/services/consumer"
+      "admin/config/services/consumer/34/edit?destination=/admin/config/services/consumer"
     );
 
     cy.get("#edit-allowed-origins-4-value").clear();
     cy.get("#edit-allowed-origins-4-value").type("http://localhost:4174");
     cy.get("#edit-submit").click();
     cy.visit(
-      "admin/config/services/consumer/2/edit?destination=/admin/config/services/consumer"
+      "admin/config/services/consumer/34/edit?destination=/admin/config/services/consumer"
     );
 
     cy.get("#edit-allowed-origins-5-value").clear();
diff --git a/src/sampleDB/buildSampleDB.bash b/src/sampleDB/buildSampleDB.bash
index 83f1995..be7027b 100755
--- a/src/sampleDB/buildSampleDB.bash
+++ b/src/sampleDB/buildSampleDB.bash
@@ -25,7 +25,8 @@ echo ""
 error_check
 echo ""
 
-# Enable the FarmData2 modules in farmos
+# Enable the farmOS modules needed for FarmData2, including
+# the FarmData2 modules themselves.
 "$SCRIPT_DIR/enableFarmData2Modules.bash"
 error_check
 echo ""
@@ -39,6 +40,15 @@ error_check
 safe_cd "$CUR_DIR"
 echo "Added."
 
+# Generate the API keys
+echo "Generating API keys..."
+CUR_DIR=$(pwd)
+safe_cd "$REPO_DIR"
+npx cypress run --spec=src/sampleDB/generateAPIKeys.cy.js
+error_check 
+safe_cd "$CUR_DIR"
+echo "Generated."
+
 # Add the users and assign their roles
 "$SCRIPT_DIR/addUsers.bash"
 error_check
diff --git a/src/sampleDB/enableFarmData2Modules.bash b/src/sampleDB/enableFarmData2Modules.bash
index fd37841..d5e1310 100755
--- a/src/sampleDB/enableFarmData2Modules.bash
+++ b/src/sampleDB/enableFarmData2Modules.bash
@@ -8,6 +8,16 @@ source "$REPO_DIR/bin/preflight.bash"
 
 echo "Enabling FarmData2 modules..."
 
+echo "  Enabling the farmOS Simple Auth Password Grant Module..."
+docker exec -it fd2_farmos drush en simple_oauth_password_grant -y
+error_check
+echo "  Enabled."
+
+echo "  Enabling the farmOS Default API Consumer Module..."
+docker exec -it fd2_farmos drush en farm_api_default_consumer -y
+error_check
+echo "  Enabled."
+
 echo "  Enabling the farmOS Inventory Module..."
 docker exec -it fd2_farmos drush en farm_inventory -y
 error_check
diff --git a/src/sampleDB/generateAPIKeys.cy.js b/src/sampleDB/generateAPIKeys.cy.js
new file mode 100644
index 0000000..056c525
--- /dev/null
+++ b/src/sampleDB/generateAPIKeys.cy.js
@@ -0,0 +1,12 @@
+describe("Generate the farmOS API keys", () => {
+  it("Generate the keys", () => {
+    cy.login("admin", "admin");
+    cy.visit("admin/config/people/simple_oauth");
+
+    cy.get("#edit-keys").click();
+    cy.get("#dir_path").clear();
+    cy.get("#dir_path").type("../keys");
+
+    cy.get("[value='Generate']").click();
+  });
+});