diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index dfa7e57..7c7650b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -25,8 +25,8 @@ android {
         applicationId = "es.chiteroman.playintegrityfix"
         minSdk = 26
         targetSdk = 35
-        versionCode = 18100
-        versionName = "v18.1"
+        versionCode = 18200
+        versionName = "v18.2"
         multiDexEnabled = false
 
         externalNativeBuild {
diff --git a/app/src/main/cpp/main.cpp b/app/src/main/cpp/main.cpp
index a737280..59082a4 100644
--- a/app/src/main/cpp/main.cpp
+++ b/app/src/main/cpp/main.cpp
@@ -468,7 +468,10 @@ static void companion(int fd) {
         xwrite(fd, json.data(), jsonSize * sizeof(uint8_t));
     }
 
-    bool trickyStore = std::filesystem::exists(TS_PATH);
+    std::string ts(TS_PATH);
+    bool trickyStore = std::filesystem::exists(ts) &&
+                       !std::filesystem::exists(ts + "/disable") &&
+                       !std::filesystem::exists(ts + "/remove");
     xwrite(fd, &trickyStore, sizeof(trickyStore));
 
     bool testSignedRom = checkOtaZip();
diff --git a/changelog.md b/changelog.md
index ba29792..b3a5a51 100644
--- a/changelog.md
+++ b/changelog.md
@@ -11,6 +11,9 @@ If you are using TrickyStore and you have a valid keybox, but Strong
 isn't passing, maybe you should change the ROM.
 Stock ROMs gives the best results.
 
-# v18.1
+# v18.2
 
 - Update fingerprint
+- Add action.sh (to auto update fingerprint to latest beta)
+
+Thanks to osm0sis, backslashxx and KOWX712
diff --git a/module/customize.sh b/module/customize.sh
index fcd6446..a608063 100644
--- a/module/customize.sh
+++ b/module/customize.sh
@@ -62,7 +62,6 @@ fi
 
 # Check custom fingerprint
 if [ -f "/data/adb/pif.json" ]; then
-    ui_print "!!! WARNING !!!"
-    ui_print "- You are using custom pif.json (/data/adb/pif.json)"
-    ui_print "- Remove that file if you can't pass attestation test!"
+    ui_print "- Backup custom pif.json"
+    mv -f /data/adb/pif.json /data/adb/pif.json.old
 fi
diff --git a/module/module.prop b/module/module.prop
index e41e13b..a0d5954 100644
--- a/module/module.prop
+++ b/module/module.prop
@@ -1,7 +1,7 @@
 id=playintegrityfix
 name=Play Integrity Fix
-version=v18.1
-versionCode=18100
+version=v18.2
+versionCode=18200
 author=chiteroman
 description=Universal modular fix for Play Integrity (and SafetyNet) on devices running Android 8-15
 updateJson=https://raw.githubusercontent.com/chiteroman/PlayIntegrityFix/main/update.json
diff --git a/module/pif.json b/module/pif.json
index 1ccd615..8b9b56d 100644
--- a/module/pif.json
+++ b/module/pif.json
@@ -1,7 +1,7 @@
 {
-  "FINGERPRINT": "google/tokay_beta/tokay:15/BP11.241025.006/12620009:user/release-keys",
+  "FINGERPRINT": "google/oriole_beta/oriole:Baklava/BP21.241121.009/12787338:user/release-keys",
   "MANUFACTURER": "Google",
-  "MODEL": "Pixel 9",
-  "SECURITY_PATCH": "2024-11-05",
+  "MODEL": "Pixel 6",
+  "SECURITY_PATCH": "2024-12-05",
   "DEVICE_INITIAL_SDK_INT": 21
 }
diff --git a/update.json b/update.json
index e84e0b6..57e1f24 100644
--- a/update.json
+++ b/update.json
@@ -1,6 +1,6 @@
 {
-  "version": "v18.1",
-  "versionCode": 18100,
-  "zipUrl": "https://github.com/chiteroman/PlayIntegrityFix/releases/download/v18.1/PlayIntegrityFix_v18.1.zip",
+  "version": "v18.2",
+  "versionCode": 18200,
+  "zipUrl": "https://github.com/chiteroman/PlayIntegrityFix/releases/download/v18.2/PlayIntegrityFix_v18.2.zip",
   "changelog": "https://raw.githubusercontent.com/chiteroman/PlayIntegrityFix/main/changelog.md"
 }