diff --git a/src/main/resources/assets/caffeinated/lang/en_us.json b/src/main/resources/assets/caffeinated/lang/en_us.json
index 1f1c469..3fdeb39 100644
--- a/src/main/resources/assets/caffeinated/lang/en_us.json
+++ b/src/main/resources/assets/caffeinated/lang/en_us.json
@@ -1,8 +1,10 @@
 {
-  "advancements.husbandry.brew_coffee.title": "Wake Up and Smell the Coffee",
-  "advancements.husbandry.brew_coffee.description": "Add Ground Coffee to Water in a Campfire with Cauldron to brew Coffee",
-  "advancements.husbandry.eat_tiramisu.title": "I Tira-Miss-U",
-  "advancements.husbandry.eat_tiramisu.description": "Bake and take a bite of a Tiramisu",
+  "advancements.husbandry.brew_all_coffee.description": "Brew every type of Coffee Bottle",
+  "advancements.husbandry.brew_all_coffee.title": "Caffeinated",
+  "advancements.husbandry.brew_coffee.description": "Add Ground Coffee to Water in a Campfire with Cauldron to brew Black Coffee",
+  "advancements.husbandry.brew_coffee.title": "Stop and Smell the Coffee",
+  "advancements.husbandry.eat_tiramisu.description": "Prepare a dish of Tiramisu",
+  "advancements.husbandry.eat_tiramisu.title": "Pick Me Up Buttercup",
 
   "block.caffeinated.cauldron_campfire": "Campfire with Cauldron",
   "block.caffeinated.coffee_bean_block": "Coffee Bean Block",
diff --git a/src/main/resources/data/caffeinated/advancements/husbandry/brew_all_coffee.json b/src/main/resources/data/caffeinated/advancements/husbandry/brew_all_coffee.json
new file mode 100644
index 0000000..52d88dc
--- /dev/null
+++ b/src/main/resources/data/caffeinated/advancements/husbandry/brew_all_coffee.json
@@ -0,0 +1,52 @@
+{
+  "parent": "caffeinated:husbandry/brew_coffee",
+  "criteria": {
+    "coffee_bottle": {
+      "trigger": "caffeinated:brew_coffee",
+      "conditions": {
+        "item": {
+          "items": [
+            "caffeinated:coffee_bottle"
+          ]
+        }
+      }
+    },
+    "latte_coffee_bottle": {
+      "trigger": "caffeinated:brew_coffee",
+      "conditions": {
+        "item": {
+          "items": [
+            "caffeinated:latte_coffee_bottle"
+          ]
+        }
+      }
+    }
+  },
+  "display": {
+    "icon": {
+      "item": "caffeinated:latte_coffee_bottle"
+    },
+    "title": {
+      "translate": "advancements.husbandry.brew_all_coffee.title"
+    },
+    "description": {
+      "translate": "advancements.husbandry.brew_all_coffee.description"
+    },
+    "frame": "challenge",
+    "show_toast": true,
+    "announce_to_chat": true,
+    "hidden": false
+  },
+  "requirements": [
+    [
+      "coffee_bottle"
+    ],
+    [
+      "latte_coffee_bottle"
+    ]
+  ],
+  "rewards": {
+    "experience": 100
+  },
+  "sends_telemetry_event": true
+}
\ No newline at end of file