diff --git a/defaults/both/content_rating_au.yml b/defaults/both/content_rating_au.yml
index c90e45201..cd1b1f0f0 100644
--- a/defaults/both/content_rating_au.yml
+++ b/defaults/both/content_rating_au.yml
@@ -141,13 +141,13 @@ dynamic_collections:
         - R - 17+ (violence & profanity)
         - no/18
         - R18
-        - gb/R18
         - gb/X
         - X
         - NC-17
         - R+ - Mild Nudity
         - Rx - Hentai
       X18+:
+        - gb/R18
         - au/X 18+
         - de/BPjM Restricted
         - BPjM Restricted
\ No newline at end of file
diff --git a/defaults/both/content_rating_uk.yml b/defaults/both/content_rating_uk.yml
index 2a186d80d..d6896190a 100644
--- a/defaults/both/content_rating_uk.yml
+++ b/defaults/both/content_rating_uk.yml
@@ -144,12 +144,12 @@ dynamic_collections:
         - R
         - 16
         - 17
+        - NC-17
         - R - 17+ (violence & profanity)
+        - gb/X
         - no/18
       R18:
         - gb/R18
-        - gb/X
         - X
-        - NC-17
         - R+ - Mild Nudity
         - Rx - Hentai
\ No newline at end of file
diff --git a/defaults/overlays/content_rating_au.yml b/defaults/overlays/content_rating_au.yml
index a0e183902..c213281ac 100644
--- a/defaults/overlays/content_rating_au.yml
+++ b/defaults/overlays/content_rating_au.yml
@@ -69,12 +69,12 @@ overlays:
   r:
     template:
       - name: standard
-      - {name: cr_au, rating: "au/R 18+, de/18, gb/18, M, 18, R - 17+ (violence & profanity), no/18, R18, gb/R18, gb/X, X, NC-17, R+ - Mild Nudity, Rx - Hentai"}
+      - {name: cr_au, rating: "au/R 18+, de/18, gb/18, M, 18, R - 17+ (violence & profanity), no/18, R18, gb/X, X, NC-17, R+ - Mild Nudity, Rx - Hentai"}
 
   x:
     template:
       - name: standard
-      - {name: cr_au, rating: "au/X 18+, de/BPjM Restricted, BPjM Restricted"}
+      - {name: cr_au, rating: "au/X 18+, de/BPjM Restricted, BPjM Restricted, gb/R18"}
   nr:
     template:
       - {name: standard, key: nr}
diff --git a/defaults/overlays/content_rating_uk.yml b/defaults/overlays/content_rating_uk.yml
index efe0064d8..4f1bcec50 100644
--- a/defaults/overlays/content_rating_uk.yml
+++ b/defaults/overlays/content_rating_uk.yml
@@ -73,12 +73,12 @@ overlays:
   18:
     template:
       - name: standard
-      - {name: cr_uk, rating: "gb/18, gb/18+, MA-17, TVMA, TV-MA, R, 16, 17, 18, R - 17+ (violence & profanity), no/18"}
+      - {name: cr_uk, rating: "gb/18, gb/18+, MA-17, TVMA, TV-MA, R, 16, 17, NC-17, 18, R - 17+ (violence & profanity), no/18, gb/X"}
 
   r18:
     template:
       - name: standard
-      - {name: cr_uk, rating: "R18, gb/R18, gb/X, X, NC-17, R+ - Mild Nudity, Rx - Hentai"}
+      - {name: cr_uk, rating: "R18, gb/R18, X, R+ - Mild Nudity, Rx - Hentai"}
 
   nr:
     template: