diff --git a/processing_handler.go b/processing_handler.go
index 2016642832..c81b30579b 100644
--- a/processing_handler.go
+++ b/processing_handler.go
@@ -438,7 +438,7 @@ func handleProcessing(reqID string, rw http.ResponseWriter, r *http.Request) {
 		// copy imgData for thread safety
 		imgDataForS3 := make([]byte, len(resultData.Data))
 		copy(imgDataForS3, resultData.Data)
-		uploaded = beforeResponse(imgDataForS3, cachePath)
+		uploaded = beforeResponse(imgDataForS3, cachePath, resultData.Type.Mime())
 	}
 
 	defer resultData.Close()
diff --git a/pushd_plugin.go b/pushd_plugin.go
index 8ccc766a64..4aa72d0bb4 100644
--- a/pushd_plugin.go
+++ b/pushd_plugin.go
@@ -117,9 +117,9 @@ func createMD5Hash(data []byte) string {
 	return base64.StdEncoding.EncodeToString(hash.Sum(nil))
 }
 
-func uploadToS3(data []byte, s3Key string, uploaded chan bool) {
+func uploadToS3(data []byte, s3Key string, contentType string, uploaded chan bool) {
 	md5Hash := createMD5Hash(data)
-	log.Infof("Uploading rendered image to: %s with md5 hash: %s", s3Key, md5Hash)
+	log.Infof("Uploading rendered image to: %s with md5 hash: %s content-type: %s", s3Key, md5Hash, contentType)
 	awsSession, err := session.NewSession()
 	if err != nil {
 		log.Error(err.Error())
@@ -130,7 +130,7 @@ func uploadToS3(data []byte, s3Key string, uploaded chan bool) {
 		Body:        aws.ReadSeekCloser(bytes.NewReader(data)),
 		Bucket:      aws.String(s3RenderBucket),
 		Key:         aws.String(s3Key),
-		ContentType: aws.String("image/jpeg"),
+		ContentType: aws.String(contentType),
 		ContentMD5:  aws.String(md5Hash),
 	}
 
@@ -147,9 +147,9 @@ func uploadToS3(data []byte, s3Key string, uploaded chan bool) {
 	uploaded <- true
 }
 
-func beforeResponse(imageData []byte, cachePath string) chan bool {
+func beforeResponse(imageData []byte, cachePath string, contentType string) chan bool {
 	uploaded := make(chan bool)
-	go uploadToS3(imageData, cachePath, uploaded)
+	go uploadToS3(imageData, cachePath, contentType, uploaded)
 	return uploaded
 }