diff --git a/.circleci/config.yml b/.circleci/config.yml
index 639a540b82e..efdcb638dcc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -48,7 +48,7 @@ commands:
     steps:
       - node/install-packages:
           pkg-manager: yarn
-          cache-version: v8
+          cache-version: v9
   run-relay-compiler:
     steps:
       - run:
@@ -73,7 +73,7 @@ commands:
     steps:
       - restore_cache:
           keys:
-            - v9-gems-{{ checksum "Gemfile.lock" }}-{{ arch }}
+            - v10-gems-{{ checksum "Gemfile.lock" }}-{{ arch }}
       - run:
           name: Bundle install
           command: bundle check || bundle install
@@ -81,19 +81,19 @@ commands:
             BUNDLE_JOBS: 4
             BUNDLE_RETRY: 3
       - save_cache:
-          key: v9-gems-{{ checksum "Gemfile.lock" }}-{{ arch }}
+          key: v10-gems-{{ checksum "Gemfile.lock" }}-{{ arch }}
           paths:
             - .vendor
   install-cocoapods:
     steps:
       - restore_cache:
           keys:
-            - v21-pods-{{ checksum ".manifests/cocoapods" }}
+            - v22-pods-{{ checksum ".manifests/cocoapods" }}
       - run:
           name: Install Pods
           command: cd ios; bundle exec pod check --ignore-dev-pods || bundle exec pod install; cd ..;
       - save_cache:
-          key: v21-pods-{{ checksum ".manifests/cocoapods" }}
+          key: v22-pods-{{ checksum ".manifests/cocoapods" }}
           paths:
             - ios/Pods
             # this changes after pod install because we don't install dev tools on CI
@@ -103,7 +103,7 @@ commands:
     steps:
       - restore_cache:
           keys:
-            - v18-app_build_ios-{{ checksum ".manifests/app_build" }}
+            - v19-app_build_ios-{{ checksum ".manifests/app_build" }}
       - run:
           name: Download fonts from s3
           command: ./scripts/setup/download-fonts
@@ -114,7 +114,7 @@ commands:
           name: Build App
           command: ./scripts/ci/ci-ios
       - save_cache:
-          key: v18-app_build_ios-{{ checksum ".manifests/app_build" }}
+          key: v19-app_build_ios-{{ checksum ".manifests/app_build" }}
           paths:
             - derived_data
             - node_modules/react-native-config
@@ -124,9 +124,9 @@ commands:
           at: ../workspace
       - restore_cache:
           keys:
-            - v12-test-success-{{ checksum "../workspace/.manifests/android_native" }}
+            - v13-test-success-{{ checksum "../workspace/.manifests/android_native" }}
       - android/change-java-version:
-          java-version: 11
+          java-version: 17
       - run:
           name: Quit early if possible
           command: |
@@ -153,7 +153,7 @@ commands:
     steps:
       - restore_cache:
           keys:
-            - v6-app_build_android-{{ checksum "../workspace/.manifests/app_build" }}
+            - v7-app_build_android-{{ checksum "../workspace/.manifests/app_build" }}
       - generate-query-map
       - run:
           name: Download fonts from s3
@@ -165,7 +165,7 @@ commands:
           name: Build App
           command: ./scripts/ci/ci-android
       - save_cache:
-          key: v6-app_build_android-{{ checksum "../workspace/.manifests/app_build" }}
+          key: v7-app_build_android-{{ checksum "../workspace/.manifests/app_build" }}
           paths:
             - android/build
             - android/app/build