diff --git a/_briefing/fraese.md b/_briefing/fraese.md
index af0c8bd002dbbec568d8693ed8079360ef5ad450..7809cc775ca950183608bb4b454322a5d1a0bbde 100644
--- a/_briefing/fraese.md
+++ b/_briefing/fraese.md
@@ -1,6 +1,6 @@
 ---
 layout: briefing
-uid: 3fe2ca58-932a-440a-8c1f-b0f9f8db6ade
+inventory_uid: 3fe2ca58-932a-440a-8c1f-b0f9f8db6ade
 ---
 
 Hier stehen demnächst ein paar schlaue Sätze darüber, wie man eine CNC-Fräse bedient.
\ No newline at end of file
diff --git a/_briefing/kf16lvario.md b/_briefing/kf16lvario.md
index 78e6d7ec56f540b2652b92e095556b6da3a1f675..64337e0b7052895d9d6740df0cb058dd47f35cc8 100644
--- a/_briefing/kf16lvario.md
+++ b/_briefing/kf16lvario.md
@@ -1,6 +1,6 @@
 ---
 layout: briefing
-uid: 10992f1f-fb14-491f-9e68-6b1b84154674
+inventory_uid: 10992f1f-fb14-491f-9e68-6b1b84154674
 ---
 
 Hier stehen demnächst ein paar schlaue Sätze darüber, wie man eine Fräse bedient.
\ No newline at end of file
diff --git a/_includes/einweisung.html b/_includes/einweisung.html
index b758aec22c70247bf315a6c1ef6f163ab393e3ff..3713bc75ddd10fd2313c24ea1933e71aa3bbfb96 100644
--- a/_includes/einweisung.html
+++ b/_includes/einweisung.html
@@ -1,3 +1,7 @@
-<div style="line-height: 18pt; margin:10px 0; width: 100%; background-color: #FFF8DC; border-width: thick; border-color: #e67206; border-radius: 10px; min-height: 40pt; ">
-    <span style="float: left; color: #e67206; font-size: 40pt; display:block; width: 50pt; height: 40pt; text-align:center; line-height: 40pt;">⚠</span><p style="vertical-align: middle;">Um dieses Gerät benutzen zu dürfen benötigst du eine <a href="{{ site.baseurl }}{{ tool.url }}briefing/">Einweisung</a>!</p>
-</div>
\ No newline at end of file
+{% for briefing in site.briefing -%}
+    {% if briefing.inventory_uid == tuid -%}
+        <div style="line-height: 18pt; margin:10px 0; width: 100%; background-color: #FFF8DC; border-width: thick; border-color: #e67206; border-radius: 10px; min-height: 40pt; ">
+            <span style="float: left; color: #e67206; font-size: 40pt; display:block; width: 50pt; height: 40pt; text-align:center; line-height: 40pt;">⚠</span><p style="vertical-align: middle;">Um dieses Gerät benutzen zu dürfen benötigst du eine <a href="{{ site.baseurl }}{{ briefing.url}}">Einweisung</a>!</p>
+        </div>
+    {% endif -%}
+{% endfor %}
diff --git a/_includes/tool-list.html b/_includes/tool-list.html
index c47f356bf26d1322cb538ec449d0609988485206..0e4d7b244b7c517ce333c3ee830e878c21e0c7e4 100644
--- a/_includes/tool-list.html
+++ b/_includes/tool-list.html
@@ -1,7 +1,8 @@
-{% for tool in site.inventory %}
+{% assign relevant_tools = site.inventory | where_exp: "rtools", "rtools.sets contains 'werkstatt'" -%}
+{% for tool in relevant_tools %}
 
 {%- if tool.sets contains 'werkstatt' -%}
-{% include {{site.toolinfo}} uid=tool.uid %}
+{% include {{site.toolinfo}} %}
 <hr>
 {%- endif -%}
 {% endfor %}
diff --git a/_includes/tool.html b/_includes/tool.html
index 3990a0678b54e11a9293795bbca2c67aebd065f7..da208b8c83cd5c77be97dc268658351481a71082 100644
--- a/_includes/tool.html
+++ b/_includes/tool.html
@@ -1,5 +1,6 @@
 <a href="{{ site.baseurl }}{{ tool.url }}"><h4 id="{{tool.uid}}">{{tool.name}}</h4></a>
 {% if tool.safetybriefing -%}
-  {% include {{site.einweisung}} %}
+  {% assign tuid = tool.uid %}
+  {% include {{site.einweisung}} tuid = tuid %}
 {% endif -%}
 {{ tool.excerpt | strip_html | markdownify | truncatewords: 60 }}<a href="{{ site.baseurl }}{{ tool.url }}">mehr</a>