diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/PersonTypeClassifier.java b/backend/src/main/java/org/raddatz/familienarchiv/service/PersonTypeClassifier.java
index b3b5c094..839560b1 100644
--- a/backend/src/main/java/org/raddatz/familienarchiv/service/PersonTypeClassifier.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/service/PersonTypeClassifier.java
@@ -12,7 +12,7 @@ public class PersonTypeClassifier {
             "Firma", "Architekt");
 
     private static final List<String> INSTITUTION_END = List.of(
-            "GmbH");
+            "GmbH", "amt", "schule");
 
     private static final List<String> GROUP_START = List.of(
             "Familie", "Comité", "Comite", "Geschwister", "Gesellschafter",
diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/PersonTypeClassifierTest.java b/backend/src/test/java/org/raddatz/familienarchiv/service/PersonTypeClassifierTest.java
index 20746379..1dcaec73 100644
--- a/backend/src/test/java/org/raddatz/familienarchiv/service/PersonTypeClassifierTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/service/PersonTypeClassifierTest.java
@@ -28,7 +28,9 @@ class PersonTypeClassifierTest {
             "'Arthur Collignon GmbH', INSTITUTION",
             "'Firma Auschrath', INSTITUTION",
             "'Westermann u Co', INSTITUTION",
-            "'Architekt Korschelt u Renker', INSTITUTION"
+            "'Architekt Korschelt u Renker', INSTITUTION",
+            "'Steuerfinanzamt', INSTITUTION",
+            "'Reichsfechtschule', INSTITUTION"
     })
     void classify_institutionEntries(String input, PersonType expected) {
         assertThat(PersonTypeClassifier.classify(input)).isEqualTo(expected);