diff --git a/ATMobileAnalytics/Tracker/build.gradle b/ATMobileAnalytics/Tracker/build.gradle
index 89ab3b6d..f9434508 100644
--- a/ATMobileAnalytics/Tracker/build.gradle
+++ b/ATMobileAnalytics/Tracker/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'jacoco'
 apply from: './publish-mavencentral.gradle'
 
 group = 'com.atinternet'
-version = '2.21.0'
+version = '2.21.1'
 
 android {
     compileSdkVersion 30
diff --git a/ATMobileAnalytics/Tracker/publish-mavencentral.gradle b/ATMobileAnalytics/Tracker/publish-mavencentral.gradle
index e897e162..5a7821d7 100644
--- a/ATMobileAnalytics/Tracker/publish-mavencentral.gradle
+++ b/ATMobileAnalytics/Tracker/publish-mavencentral.gradle
@@ -15,7 +15,7 @@ publishing {
         release(MavenPublication) {
             groupId 'com.atinternet'
             artifactId 'Tracker'
-            version '2.21.0'
+            version '2.21.1'
 
             artifact(project.buildDir.absolutePath + "/outputs/aar/${project.getName()}-release.aar")
             artifact androidSourcesJar
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Core.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Core.java
index 994d4161..7d3fa00c 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Core.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Core.java
@@ -1061,7 +1061,7 @@ class TechnicalContext {
     static final Closure VTAG = new Closure() {
         @Override
         public String execute() {
-            return "2.21.0";
+            return "2.21.1";
         }
     };
 
diff --git a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Privacy.java b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Privacy.java
index 295c1477..30c090d7 100644
--- a/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Privacy.java
+++ b/ATMobileAnalytics/Tracker/src/main/java/com/atinternet/tracker/Privacy.java
@@ -74,7 +74,7 @@ private static Map<String, Set<String>> initIncludeBufferByModeMap() {
         m.put(VisitorMode.OptIn.name(), new HashSet<>(Collections.singletonList("*")));
         m.put(VisitorMode.OptOut.name(), new HashSet<>(Arrays.asList("idclient", "ts", "olt", "cn", "click", "type")));
         m.put(VisitorMode.NoConsent.name(), new HashSet<>(Arrays.asList("idclient", "ts", "olt", "cn", "click", "type")));
-        m.put(VisitorMode.Exempt.name(), new HashSet<>(Arrays.asList("idclient", "p", "olt", "vtag", "ptag", "ts", "click", "type", "cn", "dg", "apvr", "mfmd", "model", "manufacturer", "os", "ref", "stc/crash/*")));
+        m.put(VisitorMode.Exempt.name(), new HashSet<>(Arrays.asList("idclient", "p", "olt", "vtag", "ptag", "ts", "click", "type", "cn", "dg", "apvr", "mfmd", "model", "manufacturer", "os", "ref", "stc/crash/*", "pclick", "s2click")));
         return m;
     }
 
diff --git a/ATMobileAnalytics/build.gradle b/ATMobileAnalytics/build.gradle
index 136ab584..46ab99b6 100644
--- a/ATMobileAnalytics/build.gradle
+++ b/ATMobileAnalytics/build.gradle
@@ -13,7 +13,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
         classpath 'io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.22.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'