diff --git a/g2p/mappings/langs/atj/config-g2p.yaml b/g2p/mappings/langs/atj/config-g2p.yaml
index 38e66b20..f337b9ff 100644
--- a/g2p/mappings/langs/atj/config-g2p.yaml
+++ b/g2p/mappings/langs/atj/config-g2p.yaml
@@ -10,6 +10,7 @@ mappings:
       - David Huggins-Daines
       - Patrick Littell
     rules_path: atj_to_ipa.json
+    rule_ordering: apply-longest-first
     <<: *shared
   - display_name: Atikamekw IPA to English IPA
     in_lang: atj-ipa
diff --git a/g2p/mappings/langs/langs.json.gz b/g2p/mappings/langs/langs.json.gz
index 0fbf41ed..7e6aeda8 100644
Binary files a/g2p/mappings/langs/langs.json.gz and b/g2p/mappings/langs/langs.json.gz differ
diff --git a/g2p/tests/public/data/atj.psv b/g2p/tests/public/data/atj.psv
new file mode 100644
index 00000000..cbda22c3
--- /dev/null
+++ b/g2p/tests/public/data/atj.psv
@@ -0,0 +1,4 @@
+atj|atj-ipa|matcaci|mad͡ʒaʃi
+atj|atj-ipa|amiskw|amisɡw
+atj|atj-ipa|awesisak|aweːsisaɡ
+