diff --git a/.github/workflows/keras_unit_test_ci.yml b/.github/workflows/keras_unit_test_ci.yml
index a8b35f67b..9250e940d 100644
--- a/.github/workflows/keras_unit_test_ci.yml
+++ b/.github/workflows/keras_unit_test_ci.yml
@@ -62,6 +62,55 @@ jobs:
           name: Test Results (Py310-TF2.15-ubuntu)
           path: ./**/test-results-*.xml
 
+  Test_py311_py_with_latest_tf:
+    strategy:
+      fail-fast: false
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Run Tests (Py311-TF2.18)
+        uses: ./.github/actions/keras_unit_test
+        with:
+          tf_version: '2.18.0'
+          python_version: '3.11'
+          ort_version: '1.16.3'
+          onnx_version: '1.16.1'
+
+      - name: Upload Test Results
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: Test Results (Py311-TF2.15-ubuntu)
+          path: ./**/test-results-*.xml
+
+
+  Test_py312_py_with_tf1_18: # Do not change this name because it is used in Ruleset of this repo.
+    strategy:
+      fail-fast: false
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Run Tests (Py312-TF2.18)
+        uses: ./.github/actions/keras_unit_test
+        with:
+          tf_version: '2.18.0'
+          python_version: '3.12'
+          ort_version: '1.16.3'
+          onnx_version: '1.16.1'
+
+      - name: Upload Test Results
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: Test Results (Py312-TF2.15-ubuntu)
+          path: ./**/test-results-*.xml
+
   Test_py37_with_tf1_15: # Do not change this name because it is used in Ruleset of this repo.
     strategy:
       fail-fast: false
diff --git a/.github/workflows/pretrained_model_test_ci.yml b/.github/workflows/pretrained_model_test_ci.yml
index 57e4409be..073b3c1f0 100644
--- a/.github/workflows/pretrained_model_test_ci.yml
+++ b/.github/workflows/pretrained_model_test_ci.yml
@@ -102,12 +102,20 @@ jobs:
         name:
           - 'py38-tf2.13'
           - 'py39-tf2.15'
+          - 'py311-tf2.18'
+          - 'py312-tf2.18
         os: ['ubuntu-latest', 'windows-2022']
         opset_version: ['18', '15']
         ort_version: ['1.16.3']
         onnx_version: ['1.16.1']
         skip_tflite: ['False']
         include:
+          - name: 'py311-tf2.18'
+            tf_version: '2.18.0'
+            python_version: '3.11'
+          - name: 'py312-tf2.18'
+            tf_version: '2.18.0'
+            python_version: '3.12'
           - name: 'py38-tf2.13'
             tf_version: '2.13.0'
             python_version: '3.8'
@@ -154,4 +162,4 @@ jobs:
       - name: Publish Test Results
         uses: EnricoMi/publish-unit-test-result-action@v2
         with:
-          files: "**/pytest*.xml"
\ No newline at end of file
+          files: "**/pytest*.xml"
diff --git a/.github/workflows/unit_test_ci.yml b/.github/workflows/unit_test_ci.yml
index 1143963dc..8c161da21 100644
--- a/.github/workflows/unit_test_ci.yml
+++ b/.github/workflows/unit_test_ci.yml
@@ -76,12 +76,20 @@ jobs:
         name:
           - 'py38-tf2.13'
           - 'py39-tf2.15'
+          - 'py312-tf2.18'
+          - 'py311-tf2.18'
         os: ['ubuntu-latest', 'windows-2022']
         opset_version: ['18', '15']
         ort_version: ['1.16.3']
         onnx_version: ['1.16.1']
         skip_tflite: ['False']
         include:
+          - name: 'py312-tf2.18'
+            tf_version: '2.18.0'
+            python_version: '3.12'
+          - name: 'py311-tf2.18'
+            tf_version: '2.18.0'
+            python_version: '3.11'
           - name: 'py38-tf2.13'
             tf_version: '2.13.0'
             python_version: '3.8'
@@ -137,4 +145,4 @@ jobs:
       - name: Publish Test Results
         uses: EnricoMi/publish-unit-test-result-action@v2
         with:
-          files: "artifacts/**/*.xml"
\ No newline at end of file
+          files: "artifacts/**/*.xml"
diff --git a/setup.py b/setup.py
index 85fece3a2..332fadaa0 100644
--- a/setup.py
+++ b/setup.py
@@ -98,5 +98,7 @@ def run(self):
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: 3.10']
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12']
 )