diff --git a/apriltag/CMakeLists.txt b/apriltag/CMakeLists.txt
index ac90abc126..29dcd2bb42 100644
--- a/apriltag/CMakeLists.txt
+++ b/apriltag/CMakeLists.txt
@@ -6,8 +6,8 @@ include(FetchContent)
 
 FetchContent_Declare(
     apriltaglib
-    GIT_REPOSITORY  https://github.com/photonvision/apriltag.git
-    GIT_TAG         404435205b62c3981569dc837e0051d829181ab3
+    GIT_REPOSITORY  https://github.com/wpilibsuite/apriltag.git
+    GIT_TAG         ad31e33d20f9782b7239cb15cde57c56c91383ad
 )
 
 # Don't use apriltag's CMakeLists.txt due to conflicting naming and JNI
@@ -82,12 +82,9 @@ target_compile_features(apriltag PUBLIC cxx_std_20)
 wpilib_target_warnings(apriltag)
 # disable warnings that apriltaglib can't handle
 if (MSVC)
-  target_compile_options(apriltag PRIVATE /wd4005 /wd4018 /wd4098 /wd4200 /wd4244 /wd4996)
+  target_compile_options(apriltag PRIVATE /wd4018)
 else()
-  target_compile_options(apriltag PRIVATE -Wno-newline-eof -Wno-unused-variable -Wno-sign-compare -Wno-pedantic -Wno-shift-negative-value)
-  if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-    target_compile_options(apriltag PRIVATE -Wno-maybe-uninitialized)
-  endif()
+  target_compile_options(apriltag PRIVATE -Wno-sign-compare -Wno-gnu-zero-variadic-macro-arguments)
 endif()
 
 target_link_libraries(apriltag wpimath)
diff --git a/shared/apriltaglib.gradle b/shared/apriltaglib.gradle
index 3cfddf6842..1b8b37f2a7 100644
--- a/shared/apriltaglib.gradle
+++ b/shared/apriltaglib.gradle
@@ -6,7 +6,7 @@ nativeUtils {
             headerClassifier = "headers"
             sourceClassifier = "sources"
             ext = "zip"
-            version = '3.2.0-1'
+            version = '3.2.0-2'
             targetPlatforms.addAll(nativeUtils.wpi.platforms.allPlatforms)
         }
     }