diff --git a/api/application/config/constants.php b/api/application/config/constants.php
index 94fad650..585adaab 100644
--- a/api/application/config/constants.php
+++ b/api/application/config/constants.php
@@ -118,6 +118,7 @@ defined('CUSTOMER_IMG_URL') OR define('CUSTOMER_IMG_URL','https://demo.pdgenie.c
 defined('SALESPD_CUSTOMER_IMG_URL') OR define('SALESPD_CUSTOMER_IMG_URL','https://demo.pdgenie.com/customer/#/salespd_images/');
 defined('CUSTOMER_IMG_URL') OR define('CUSTOMER_IMG_URL','https://demo.pdgenie.com/customer/#/pd-images/');
 defined('PDF_ATTACHEMENT_URL') OR define('PDF_ATTACHEMENT_URL','https://apitest.pdgenie.com/sparqdev/api/short?dat=');
+defined('OPTIMIZED_IMAGE_BUCKET_NAME') OR define('OPTIMIZED_IMAGE_BUCKET_NAME','optimized-images-demo');
 }
 else if(ENVIRONMENT == 'testing')
 {
@@ -133,6 +134,7 @@ else if(ENVIRONMENT == 'testing')
 	defined('CUSTOMER_IMG_URL') OR define('CUSTOMER_IMG_URL','https://demo.pdgenie.com/customer/#/pd-images/');
 	defined('PDF_ATTACHEMENT_URL') OR define('PDF_ATTACHEMENT_URL','https://apitest.pdgenie.com/sparqtest/api/short?dat=');
 	defined('GOOGLE_DISTANCE_MATRIX_API_KEY') OR define('GOOGLE_DISTANCE_MATRIX_API_KEY',getenv('GOOGLE_DISTANCE_MATRIX_API_KEY'));
+	defined('OPTIMIZED_IMAGE_BUCKET_NAME') OR define('OPTIMIZED_IMAGE_BUCKET_NAME','optimized-images-demo');
 }
 else if(ENVIRONMENT == 'production')
 {
@@ -148,6 +150,7 @@ else if(ENVIRONMENT == 'production')
 	defined('CUSTOMER_IMG_URL') OR define('CUSTOMER_IMG_URL','https://pdgenie.com/customer/#/pd-images/');
 	defined('PDF_ATTACHEMENT_URL') OR define('PDF_ATTACHEMENT_URL','https://api.pdgenie.com/sparqprod/api/short?dat=');
 	defined('GOOGLE_DISTANCE_MATRIX_API_KEY') OR define('GOOGLE_DISTANCE_MATRIX_API_KEY',getenv('GOOGLE_DISTANCE_MATRIX_API_KEY'));
+	defined('OPTIMIZED_IMAGE_BUCKET_NAME') OR define('OPTIMIZED_IMAGE_BUCKET_NAME','optimized-images-live');
 }
 
 /*********************END of AWS resources Constants*************************************************/
diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php
index 86fc5c84..f29dce9e 100644
--- a/api/application/models/PD_Model.php
+++ b/api/application/models/PD_Model.php
@@ -431,7 +431,11 @@ class PD_Model extends SPARQ_Model {
 				  if(count($document_lists))
 				  {  
 					
-					$bucket_name = LENDER_BUCKET_NAME_PREFIX.$lender_id[0]['fk_lender_id'];
+					// old - gettting images from respective ledner buckets
+					//$bucket_name = LENDER_BUCKET_NAME_PREFIX.$lender_id[0]['fk_lender_id'];
+
+					//new - all images optimized and stored in single bucket
+					$bucket_name = OPTIMIZED_IMAGE_BUCKET_NAME;
 					
 					 foreach($document_lists as $key => $value)
 					 {
@@ -441,7 +445,9 @@ class PD_Model extends SPARQ_Model {
 					 			unset($document_lists[$key]);
 					 			continue; 
 					 		} 
+
 						$profilepics3path = 'pd'.$pdid.'/'.$value['pd_document_name'];
+						
 						$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$profilepics3path,$time);
 						$document_lists[$key]['doc_url'] = $singed_uri;
 					 }