diff --git a/.circleci/config.yml b/.circleci/config.yml
index c00d5aeac..3d1ef16ed 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 defaults: &defaults
   macos:
-    xcode: 12.4.0
+    xcode: 12.5.1
   parallelism: 1
   shell: /bin/bash --login    
   environment:
diff --git a/Rakefile b/Rakefile
index 9311304ef..700680454 100644
--- a/Rakefile
+++ b/Rakefile
@@ -57,14 +57,14 @@ end
 def device_names
   return {
     ios: "iPhone 8",
-    tvos: "Apple TV 4K (at 1080p)"
+    tvos: "Apple TV 4K (at 1080p) (2nd generation)"
   }
 end
 
 def device_os
   return {
-    ios: "14.4",
-    tvos: "14.3"
+    ios: "14.5",
+    tvos: "14.5"
   }
 end