diff --git a/ansible/inventory/env/group_vars/all.yml b/ansible/inventory/env/group_vars/all.yml
index 0b59c0382d..e5ac6d444e 100644
--- a/ansible/inventory/env/group_vars/all.yml
+++ b/ansible/inventory/env/group_vars/all.yml
@@ -85,7 +85,7 @@ postgres:
     db_port: 5432
     db_admin_user: analytics
     db_admin_password: "{{dp_vault_pgdb_admin_password}}"
-    dp_ssl: ""
+    dp_ssl: false
     dp_db_name: analytics
 
 postgres_address_space: 0.0.0.0/0 # Postgres trust address space
diff --git a/ansible/roles/analytics-druid/defaults/main.yml b/ansible/roles/analytics-druid/defaults/main.yml
index dbbb714681..23490fa91e 100644
--- a/ansible/roles/analytics-druid/defaults/main.yml
+++ b/ansible/roles/analytics-druid/defaults/main.yml
@@ -136,7 +136,7 @@ default_druid_configs:
       s3_bucket: "{{ cloud_storage_telemetry_bucketname }}"
       s3_endpoint: "{{ cloud_private_storage_endpoint }}"
       s3_segment_dir: "druid/raw/segments"
-      s3_path_like_access: "{{ cloud_storage_pathstyle_access }}"
+      s3_path_like_access: "{{ s3_path_style_access }}"
       s3_v4_sign_region: "{{ cloud_private_storage_region }}"
       #Logging the indexing logs to s3
       s3_logging_bucket: "{{ cloud_storage_telemetry_bucketname }}"
diff --git a/kubernetes/helm_charts/secor/config/secor.common.properties b/kubernetes/helm_charts/secor/config/secor.common.properties
index 2ae318da2c..19e306a6eb 100644
--- a/kubernetes/helm_charts/secor/config/secor.common.properties
+++ b/kubernetes/helm_charts/secor/config/secor.common.properties
@@ -27,8 +27,8 @@ cloud.service={{ $.Values.storage_type }}
 
 # AWS authentication credentials.
 # Leave empty if using IAM role-based authentication with s3a filesystem.
-aws.access.key=
-aws.secret.key=
+#aws.access.key=
+#aws.secret.key=
 aws.role=
 
 # Optional Proxy Setting. Set to true to enable proxy
@@ -51,8 +51,8 @@ aws.proxy.http.port=
 # secor.upload.manager.class.
 #
 # http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region
-aws.region=
-aws.endpoint=
+#aws.region=
+#aws.endpoint=
 
 # Toggle the AWS S3 client between virtual host style access and path style
 # access. See http://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html
diff --git a/kubernetes/helm_charts/secor/config/secor.partition.properties b/kubernetes/helm_charts/secor/config/secor.partition.properties
index f14c523a5c..4abf0843e4 100644
--- a/kubernetes/helm_charts/secor/config/secor.partition.properties
+++ b/kubernetes/helm_charts/secor/config/secor.partition.properties
@@ -28,7 +28,7 @@ secor.kafka.group={{ get (get $.Values.secor_jobs $.Release.Name) "consumer_grou
 secor.message.parser.class={{ get (get $.Values.secor_jobs $.Release.Name) "message_parser" }}
 
 # S3 path where sequence files are stored.
-secor.s3.path=
+#secor.s3.path=
 
 # Swift path where sequence files are stored.
 secor.swift.path=secor_dev/partition
@@ -67,6 +67,6 @@ secor.max.file.age.policy=oldest
 # currentTime - Time of upload in HH-mm format
 # currentDate - Time of upload in YYYYMMDD format
 # folder - Folder to use based on message id map lookup
-secor.s3.output_file_pattern=
+#secor.s3.output_file_pattern=
 
 secor.partition.message.channel.identifier={{ get (get $.Values.secor_jobs $.Release.Name) "message_channel_identifier" }}
diff --git a/kubernetes/helm_charts/secor/config/secor.properties b/kubernetes/helm_charts/secor/config/secor.properties
index 6f2876d1de..624e409d85 100644
--- a/kubernetes/helm_charts/secor/config/secor.properties
+++ b/kubernetes/helm_charts/secor/config/secor.properties
@@ -10,7 +10,7 @@ include=secor.common.properties
 ###############
 
 # Name of the s3 bucket where log files are stored.
-secor.s3.bucket=
+#secor.s3.bucket=
 
 ###############
 # Using Swift #