diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8b5230c48..9f7a25722 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -126,7 +126,7 @@ jobs:
           DD_CLIENT_TOKEN: ${{ secrets.DD_CLIENT_TOKEN }}
           DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
           DATADOG_SITE: datadoghq.eu
-          INTERSTITIAL_AD_UNIT_ID: "${{ secrets.INTERSTITIAL_AD_UNIT_ID }}"
+          INTERSTITIAL_AD_UNIT: "${{ secrets.INTERSTITIAL_AD_UNIT_ID }}"
           VERSION: "${{ env.version }}"
 
       - uses: actions/upload-artifact@v3
diff --git a/.run/main.dart.run.xml b/.run/main.dart.run.xml
index fe5d595ad..0d0028752 100644
--- a/.run/main.dart.run.xml
+++ b/.run/main.dart.run.xml
@@ -1,7 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="main.dart" type="FlutterRunConfigurationType" factoryName="Flutter">
     <option name="additionalArgs" value="--dart-define=INTERSTITIAL_AD_UNIT_ID=ca-app-pub-2685698271254859/9922829329 --dart-define=DD_APPLICATION_ID=f8eabf3c-5db3-4f7e-8e6a-5a72433b46d2 --dart-define=DD_CLIENT_TOKEN=puba617ab01333a95a25a9d3709f04e1654" />
-    <option name="attachArgs" value="--profile" />
     <option name="buildFlavor" value="prod" />
     <option name="filePath" value="$PROJECT_DIR$/lib/main.dart" />
     <method v="2" />
diff --git a/Makefile b/Makefile
index 9e2f7bf3d..8fc007f89 100644
--- a/Makefile
+++ b/Makefile
@@ -87,6 +87,8 @@ BINARIES_BRANCH ?= main
 BETA_BASE_NAME ?= $(INSTALLER_NAME)-preview
 PROD_BASE_NAME ?= $(INSTALLER_NAME)
 
+## secrets Keys
+INTERSTITIAL_AD_UNIT=ca-app-pub-2685698271254859/9922829329
 ## vault secrets
 VAULT_DD_SECRETS_PATH ?= secret/apps/datadog/android
 VAULT_ADS_SECRETS_PATH ?= secret/googleAds
@@ -155,13 +157,13 @@ MOBILE_DEBUG_APK := $(INSTALLER_NAME)-$(ANDROID_ARCH)-debug.apk
 MOBILE_BUNDLE := $(INSTALLER_NAME).aab
 MOBILE_TEST_APK := $(BASE_MOBILE_DIR)/build/app/outputs/apk/androidTest/autoTest/debug/app-autoTest-debug-androidTest.apk
 MOBILE_TESTS_APK := $(BASE_MOBILE_DIR)/build/app/outputs/apk/autoTest/debug/app-autoTest-debug.apk
-
+CI_APK_PATH := $(BASE_MOBILE_DIR)/build/app/outputs/flutter-apk/app-prod-debug.apk
 BUILD_TAGS ?=
 BUILD_TAGS += ' lantern'
-
 GO_SOURCES := go.mod go.sum $(shell find internalsdk -type f -name "*.go")
 MOBILE_SOURCES := $(shell find Makefile android assets go.mod go.sum lib protos* -type f -not -path "*/libs/$(ANDROID_LIB_BASE)*" -not -iname "router.gr.dart")
 
+
 .PHONY: dumpvars packages vendor android-debug do-android-release android-release do-android-bundle android-bundle android-debug-install android-release-install android-test android-cloud-test package-android
 
 # dumpvars prints out all variables defined in the Makefile, useful for debugging environment
@@ -281,7 +283,6 @@ $(MOBILE_ANDROID_LIB): $(ANDROID_LIB)
 .PHONY: android-lib
 android-lib: $(MOBILE_ANDROID_LIB)
 
-
 $(MOBILE_TEST_APK) $(MOBILE_TESTS_APK): $(MOBILE_SOURCES) $(MOBILE_ANDROID_LIB)
 	@$(GRADLE) -PandroidArch=$(ANDROID_ARCH) \
 		-PandroidArchJava="$(ANDROID_ARCH_JAVA)" \
@@ -293,19 +294,24 @@ vault-secret-%:
 	printf "$$SECRET"
 
 vault-secret-base64:
-	@SECRET=$(shell cd $(LANTERN_CLOUD) && bin/vault kv get -field=$(VAULT_FIELD) $(VAULT_PATH)); \
+	@set -e; \
+	trap 'echo "An error occurred while fetching the vault secret. Exiting..." >&2; exit 1' ERR; \
+	SECRET=$$(cd $(LANTERN_CLOUD) && bin/vault kv get -field=$(VAULT_FIELD) $(VAULT_PATH)); \
+	if [ -z "$$SECRET" ]; then echo "Error: Secret is empty or not set for VAULT_FIELD=$(VAULT_FIELD) and VAULT_PATH=$(VAULT_PATH)."; exit 1; fi; \
 	echo "Retrieved secret: $$SECRET" 1>&2; \
 	printf "$$VAULT_FIELD=$$SECRET" | ${BASE64}
 
 dart-defines-debug:
-	@DART_DEFINES=$(shell make vault-secret-base64 VAULT_FIELD=INTERSTITIAL_AD_UNIT_ID VAULT_PATH=secret/googleAds); \
-	DART_DEFINES+=$(shell printf ',' && make vault-secret-base64 VAULT_FIELD=DD_APPLICATION_ID VAULT_PATH=secret/apps/datadog/android); \
-	DART_DEFINES+=$(shell printf ',' && make vault-secret-base64 VAULT_FIELD=DD_CLIENT_TOKEN VAULT_PATH=secret/apps/datadog/android); \
+	@set -e; \
+	trap 'echo "An error occurred while setting DART_DEFINES. Exiting..." >&2; exit 1' ERR; \
+	DART_DEFINES=$$(printf "INTERSTITIAL_AD_UNIT_ID=$(INTERSTITIAL_AD_UNIT)" | ${BASE64}); \
 	DART_DEFINES+=",$(CIBASE)"; \
 	echo "$$DART_DEFINES"
 
 do-android-debug: $(MOBILE_SOURCES) $(MOBILE_ANDROID_LIB)
-	@ln -fs $(MOBILE_DIR)/gradle.properties . && \
+	@set -e; \
+	trap 'echo "An error occurred during the android debug build process. Exiting..." >&2; exit 1' ERR; \
+	ln -fs $(MOBILE_DIR)/gradle.properties . && \
 	DART_DEFINES=`make dart-defines-debug` && \
 	CI="$$CI" && $(GRADLE) -Pdart-defines="$$DART_DEFINES" -PlanternVersion=$(DEBUG_VERSION) -PddClientToken=$$DD_CLIENT_TOKEN -PddApplicationID=$$DD_APPLICATION_ID \
 	-PproServerUrl=$(PRO_SERVER_URL) -PpaymentProvider=$(PAYMENT_PROVIDER) -Pcountry=$(COUNTRY) \
@@ -322,14 +328,16 @@ $(MOBILE_DEBUG_APK): $(MOBILE_SOURCES) $(GO_SOURCES)
 	make do-android-debug && \
 	cp $(MOBILE_ANDROID_DEBUG) $(MOBILE_DEBUG_APK)
 
-env-secret-%:
-	@SECRET=$(shell echo "$(${*})"); \
-	printf ${*}=$$SECRET | ${BASE64}
-
 dart-defines-release:
-	@DART_DEFINES=`make env-secret-INTERSTITIAL_AD_UNIT_ID`; \
+	@set -e; \
+	trap 'echo "An error occurred while setting DART_DEFINES. Exiting..." >&2; exit 1' ERR; \
+	if [ -z "$(INTERSTITIAL_AD_UNIT)" ]; then \
+    		echo "Error: INTERSTITIAL_AD_UNIT is not found." >&2; \
+    		exit 1; \
+    	fi; \
+	DART_DEFINES=$$(printf "INTERSTITIAL_AD_UNIT_ID=$(INTERSTITIAL_AD_UNIT)" | ${BASE64}); \
 	DART_DEFINES+=`printf ',' && $(CIBASE)`; \
-	printf $$DART_DEFINES
+	echo $$DART_DEFINES
 
 $(MOBILE_RELEASE_APK): $(MOBILE_SOURCES) $(GO_SOURCES) $(MOBILE_ANDROID_LIB) require-datadog-ci
 	echo $(MOBILE_ANDROID_LIB) && \
@@ -351,6 +359,7 @@ $(MOBILE_RELEASE_APK): $(MOBILE_SOURCES) $(GO_SOURCES) $(MOBILE_ANDROID_LIB) req
 	cp $(MOBILE_ANDROID_RELEASE) $(MOBILE_RELEASE_APK) && \
 	cat $(MOBILE_RELEASE_APK) | bzip2 > lantern_update_android_arm.bz2
 
+
 $(MOBILE_BUNDLE): $(MOBILE_SOURCES) $(GO_SOURCES) $(MOBILE_ANDROID_LIB) require-datadog-ci
 	@mkdir -p ~/.gradle && \
 	ln -fs $(MOBILE_DIR)/gradle.properties . && \
@@ -372,6 +381,9 @@ android-bundle: $(MOBILE_BUNDLE)
 android-debug-install: $(MOBILE_DEBUG_APK)
 	$(ADB) uninstall $(MOBILE_APPID) ; $(ADB) install -r $(MOBILE_DEBUG_APK)
 
+#android-debug-install: $(MOBILE_DEBUG_APK)
+#	$(ADB) uninstall $(MOBILE_APPID) ; $(ADB) install -r $(MOBILE_DEBUG_APK)
+
 android-release-install: $(MOBILE_RELEASE_APK)
 	$(ADB) install -r $(MOBILE_RELEASE_APK)
 
diff --git a/android/app/libs/liblantern-all.aar b/android/app/libs/liblantern-all.aar
deleted file mode 100644
index f9d72a574..000000000
--- a/android/app/libs/liblantern-all.aar
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:07b53368d7a8fe85f6e10eb8eab68bb824301cc44ad79ead89593d749e7d63d0
-size 78256609
diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro
index 26cdad8d0..71f6295fa 100644
--- a/android/app/proguard-rules.pro
+++ b/android/app/proguard-rules.pro
@@ -197,7 +197,7 @@
 -keep public class com.google.android.gms.ads.** {
     public *;
 }
-
 -keep public class com.google.ads.** {
     public *;
-}
\ No newline at end of file
+}
+-keep public class com.google.android.gms.** { public protected *; }
\ No newline at end of file
diff --git a/android/app/src/main/kotlin/io/lantern/model/SessionModel.kt b/android/app/src/main/kotlin/io/lantern/model/SessionModel.kt
index 37f0f9281..1ad9ca633 100644
--- a/android/app/src/main/kotlin/io/lantern/model/SessionModel.kt
+++ b/android/app/src/main/kotlin/io/lantern/model/SessionModel.kt
@@ -97,6 +97,15 @@ class SessionModel(
     }
 
     fun checkAdsAvailability() {
+        //This check is just safe guard
+        //So if something goes wrong in backend we should not show ads to pro users at any case
+        if(LanternApp.getSession().isProUser){
+            db.mutate { tx ->
+                tx.put(SHOULD_SHOW_GOOGLE_ADS, false)
+                tx.put(SHOULD_SHOW_CAS_ADS, false)
+            }
+            return
+        }
         Logger.debug(TAG, "checkAdsAvailability called")
         val googleAds = shouldShowAdsBasedRegion { LanternApp.getSession().shouldShowAdsEnabled() }
         Logger.debug(TAG, "checkAdsAvailability with googleAds values $googleAds enable ${LanternApp.getSession().shouldShowAdsEnabled()}")
diff --git a/lib/ad_helper.dart b/lib/ad_helper.dart
index b3ff4a2d6..32fbbce0d 100644
--- a/lib/ad_helper.dart
+++ b/lib/ad_helper.dart
@@ -12,6 +12,7 @@ import 'package:flutter/foundation.dart';
 import 'package:google_mobile_ads/google_mobile_ads.dart';
 import 'package:logger/logger.dart';
 import 'package:lantern/common/datadog.dart';
+import 'package:lantern/replica/common.dart';
 
 enum AdType { Google, CAS }
 
diff --git a/lib/main.dart b/lib/main.dart
index ebb60f19f..d53e6cbc2 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -19,8 +19,8 @@ Future<void> main() async {
 Future<void> _initGoogleMobileAds() async {
   await MobileAds.instance.initialize();
   await MobileAds.instance.setAppMuted(true);
-  await MobileAds.instance.updateRequestConfiguration(RequestConfiguration(testDeviceIds: ['D79728264130CE0918737B5A2178D362']));
-  MobileAds.instance.openAdInspector((p0) {
-    print('ad error $p0');
-  });
+  // await MobileAds.instance.updateRequestConfiguration(RequestConfiguration(testDeviceIds: ['D79728264130CE0918737B5A2178D362']));
+  // MobileAds.instance.openAdInspector((p0) {
+  //   print('ad error $p0');
+  // });
 }
diff --git a/lib/vpn/vpn_switch.dart b/lib/vpn/vpn_switch.dart
index b0f813830..f3bc712e6 100644
--- a/lib/vpn/vpn_switch.dart
+++ b/lib/vpn/vpn_switch.dart
@@ -3,6 +3,8 @@ import 'package:lantern/vpn/vpn.dart';
 import '../ad_helper.dart';
 
 class VPNSwitch extends StatefulWidget {
+  const VPNSwitch({super.key});
+
   @override
   State<VPNSwitch> createState() => _VPNSwitchState();
 }
@@ -38,9 +40,7 @@ class _VPNSwitchState extends State<VPNSwitch> {
   Widget build(BuildContext context) {
     return sessionModel
         .shouldShowGoogleAds((context, isGoogleAdsEnable, child) {
-          print('Ads Manager Google Ad $isGoogleAdsEnable');
       return sessionModel.shouldShowCASAds((context, isCasAdsEnable, child) {
-        print('Ads Manager CAS Ad $isCasAdsEnable');
         adHelper.loadAds(
             shouldShowGoogleAds: isGoogleAdsEnable,
             shouldShowCASAds: isCasAdsEnable);