diff --git a/bin/tag-generator.py b/bin/tag-generator.py
index 9195a16..d04e1ed 100755
--- a/bin/tag-generator.py
+++ b/bin/tag-generator.py
@@ -4,26 +4,25 @@
 ALPINE_VERSIONS = ['3.16', '3.17', '3.18', '3.19']
 
 LTS_VERSIONS = [ "8", "11", "17", "21"]
-UNSUPPORTED_AL2_VERSIONS = [ "22" ] 
+FR_VERSIONS = [ "22" ]
 def generate_tags(key, version):
     update = version.split('.')[1] if (key == '8') else version.split('.')[2]
     expanded_version = f"{key}u{update}" if (key == '8') else f"{key}.0.{update}"
 
     al2023_tags = [f"{key}-al2023",  f"{expanded_version}-al2023" ,f"{key}-al2023-jdk"]
     al2023_generic_tags = [f"{key}-al2023-generic", f"{expanded_version}-al2023-generic", f"{key}-al2023-generic-jdk"]
-    if key not in UNSUPPORTED_AL2_VERSIONS:
+    if int(key) <= 21:
         al2_tags = [f"{key}", f"{expanded_version}", f"{expanded_version}-al2", f"{key}-al2-full", f"{key}-al2-jdk", f"{key}-al2-generic", f"{expanded_version}-al2-generic", f"{key}-al2-generic-jdk"]
+        print("Tags: " + ", ".join(al2_tags) + "")
+        print("Architectures: amd64, arm64v8")
+        print(f"Directory: {key}/jdk/al2-generic\n")
     else:
         al2_tags = []
     if key == '8':
         al2_tags.append('latest')
 
 
-    print("Tags: " + ", ".join(al2_tags) + "")
-    print("Architectures: amd64, arm64v8")
-    print(f"Directory: {key}/jdk/al2-generic\n")
-
-    if key in LTS_VERSIONS:
+    if key in LTS_VERSIONS or key in FR_VERSIONS:
         print("Tags: " + ", ".join(al2023_tags) + "")
         print("Architectures: amd64, arm64v8")
         print(f"Directory: {key}/jdk/al2023\n")