diff --git a/install/scripts/update_bap_config.sh b/install/scripts/update_bap_config.sh
index c4aa61a..be65d06 100755
--- a/install/scripts/update_bap_config.sh
+++ b/install/scripts/update_bap_config.sh
@@ -50,14 +50,12 @@ echo "Your Private Key: $private_key"
 echo "Your Public Key: $public_key"
 
 
-valid_from=$(date -u +"%Y-%m-%dT%H:%M:%S.%3NZ")
-
 if [[ $(uname -s ) == 'Darwin' ]];then
-    valid_from=$(date -u +"%Y-%m-%dT%H:%M:%S.%000Z")
-    valid_until=$(date -u -v+1y +"%Y-%m-%dT%H:%M:%S.%000Z")
+    valid_from=$(date -u -v-1d +"%Y-%m-%dT%H:%M:%S.%000Z")
+    valid_until=$(date -u -v+3y +"%Y-%m-%dT%H:%M:%S.%000Z")
 else
-    valid_from=$(date -u +"%Y-%m-%dT%H:%M:%S.%3NZ")
-    valid_until=$(date -u -d "+1 year" +"%Y-%m-%dT%H:%M:%S.%3NZ")
+    valid_from=$(date -u -d "-1 day" +"%Y-%m-%dT%H:%M:%S.%3NZ")
+    valid_until=$(date -u -d "+3 year" +"%Y-%m-%dT%H:%M:%S.%3NZ")
 fi
 
 type=BAP
diff --git a/install/scripts/update_bpp_config.sh b/install/scripts/update_bpp_config.sh
index fbd450d..e20cc3a 100755
--- a/install/scripts/update_bpp_config.sh
+++ b/install/scripts/update_bpp_config.sh
@@ -52,12 +52,13 @@ get_keys
 
 
 if [[ $(uname -s ) == 'Darwin' ]];then
-    valid_from=$(date -u +"%Y-%m-%dT%H:%M:%S.%000Z")
-    valid_until=$(date -u -v+1y +"%Y-%m-%dT%H:%M:%S.%000Z")
+    valid_from=$(date -u -v-1d +"%Y-%m-%dT%H:%M:%S.%000Z")
+    valid_until=$(date -u -v+3y +"%Y-%m-%dT%H:%M:%S.%000Z")
 else
-    valid_from=$(date -u +"%Y-%m-%dT%H:%M:%S.%3NZ")
-    valid_until=$(date -u -d "+1 year" +"%Y-%m-%dT%H:%M:%S.%3NZ")
+    valid_from=$(date -u -d "-1 day" +"%Y-%m-%dT%H:%M:%S.%3NZ")
+    valid_until=$(date -u -d "+3 year" +"%Y-%m-%dT%H:%M:%S.%3NZ")
 fi
+
 type=BPP