diff --git a/roles/oracle-db-install/templates/cron_oracle_cleaner.j2 b/roles/oracle-db-install/templates/cron_oracle_cleaner.j2
index 2cb4f90..b159a3b 100644
--- a/roles/oracle-db-install/templates/cron_oracle_cleaner.j2
+++ b/roles/oracle-db-install/templates/cron_oracle_cleaner.j2
@@ -1,16 +1,24 @@
 #!/bin/sh
 
-/usr/bin/logger -t ora_db_clean_xml "Clean xml file older than 30 days from {{ oracle_base }}/diag/rdbms/"
-find {{ oracle_base }}/diag/rdbms/ -iname "*xml"  -mtime +30 -print -delete | logger -t oracle_clean_xml
+export ORACLE_BASE={{ oracle_base }}
 
-/usr/bin/logger -t ora_lsnr_clean_xml "Clean xml file older than 30 days from {{ oracle_base }}/diag/tnslsnr/"
-find {{ oracle_base }}/diag/tnslsnr/ -iname "*xml"  -mtime +30 -print -delete | logger -t oracle_clean_xml
+export ADMIN_DIR=${ORACLE_BASE}/admin
+export RDBMS_LOG_DIR=${ORACLE_BASE}/diag/rdbms
+export LSNR_LOG_DIR=${ORACLE_BASE}/diag/tnslsnr
 
-/usr/bin/logger -t ora_db_clean_trc "Clean trc file older than 30 days from {{ oracle_base }}/diag/rdbms/"
-find {{ oracle_base }}/diag/rdbms/ -iname "*trc"  -mtime +30 -print -delete | logger -t oracle_clean_trc
+export DAYS=15
 
-/usr/bin/logger -t ora_db_clean_trm "Clean trm file older than 30 days from {{ oracle_base }}/diag/rdbms/"
-find {{ oracle_base }}/diag/rdbms/ -iname "*trm"  -mtime +30 -print -delete | logger -t oracle_clean_trm
+/usr/bin/logger -t ora_db_clean_xml "Clean xml file older than $DAYS days from ${RDBMS_LOG_DIR}"
+find ${RDBMS_LOG_DIR} -iname "*xml"  -mtime +$DAYS -print -delete | logger -t oracle_clean_xml
 
-/usr/bin/logger -t ora_db_clean_aud "Clean audit file older than 30 days from {{ oracle_base }}/admin/"
-find {{ oracle_base }}/admin/ -iname "*.aud"  -mtime +30 -print -delete | logger -t oracle_clean_aud
+/usr/bin/logger -t ora_lsnr_clean_xml "Clean xml file older than $DAYS days from ${LSNR_LOG_DIR}"
+find ${LSNR_LOG_DIR} -iname "*xml"  -mtime +$DAYS -print -delete | logger -t oracle_clean_xml
+
+/usr/bin/logger -t ora_db_clean_trc "Clean trc file older than $DAYS days from ${RDBMS_LOG_DIR}"
+find ${RDBMS_LOG_DIR} -iname "*trc"  -mtime +$DAYS -print -delete | logger -t oracle_clean_trc
+
+/usr/bin/logger -t ora_db_clean_trm "Clean trm file older than $DAYS days from ${RDBMS_LOG_DIR}"
+find ${RDBMS_LOG_DIR} -iname "*trm"  -mtime +$DAYS -print -delete | logger -t oracle_clean_trm
+
+/usr/bin/logger -t ora_db_clean_aud "Clean audit file older than +$DAYS days from ${ADMIN_DIR}"
+find ${ADMIN_DIR} -iname "*.aud"  -mtime +$DAYS -print -delete | logger -t oracle_clean_aud