diff --git a/image/tools/entrypoint.sh b/image/tools/entrypoint.sh
index 833a3ca..d21ffcf 100755
--- a/image/tools/entrypoint.sh
+++ b/image/tools/entrypoint.sh
@@ -61,7 +61,7 @@ if [[ "$encryption_engine" ]]; then
 else
     encrypted_files="$ARCHIVES_DEST/*"
 fi
-upload_archive "${encrypted_files}" $DATESTAMP backups/$component
+upload_archive "${encrypted_files}" $DATESTAMP backups/$PRODUCT_NAME/$component
 echo '==> Archive upload completed'
 
 echo "[$DATESTAMP] Backup completed"
diff --git a/image/tools/lib/backend/s3.sh b/image/tools/lib/backend/s3.sh
index 99cd38f..4e55ddf 100644
--- a/image/tools/lib/backend/s3.sh
+++ b/image/tools/lib/backend/s3.sh
@@ -32,18 +32,13 @@ function upload_archive {
 
     local file_list=$1
     local datestamp=$2
+    local bucket_folder=$3
 
     local AWS_S3_BUCKET_NAME=$(get_s3_bucket_name)
     local AWS_S3_BUCKET_SUFFIX="$(get_s3_bucket_suffix)"
     local AWS_ACCESS_KEY_ID="$(get_s3_key_id)"
     local AWS_SECRET_ACCESS_KEY="$(get_s3_access_key)"
 
-    if [[ "$AWS_S3_BUCKET_SUFFIX" ]]; then
-        bucket_folder="$3/$AWS_S3_BUCKET_SUFFIX"
-    else
-        bucket_folder=$3
-    fi
-
     for fname in ${file_list}; do
         s3cmd put --access_key ${AWS_ACCESS_KEY_ID} --secret_key ${AWS_SECRET_ACCESS_KEY} --progress ${fname} "s3://$AWS_S3_BUCKET_NAME/$bucket_folder/$datestamp/$(basename ${fname})"
         rc=$?
diff --git a/templates/openshift/backup-cronjob-template.yaml b/templates/openshift/backup-cronjob-template.yaml
index 046e1ab..9c783fb 100644
--- a/templates/openshift/backup-cronjob-template.yaml
+++ b/templates/openshift/backup-cronjob-template.yaml
@@ -47,6 +47,9 @@ parameters:
   - name: NAME
     description: Unique job name to be used in several resource name(s)
     value: integreatly-cronjob-backup
+  - name: PRODUCT_NAME
+    description: Middleware product name to have its data archived
+    required: true
   - name: COMPONENT
     description: Component name to run the backup
     required: true
diff --git a/templates/openshift/backup-job-template.yaml b/templates/openshift/backup-job-template.yaml
index facaac6..becabfb 100644
--- a/templates/openshift/backup-job-template.yaml
+++ b/templates/openshift/backup-job-template.yaml
@@ -41,11 +41,16 @@ objects:
                   value: "${ENCRYPTION_SECRET_NAME}"
                 - name: COMPONENT_SECRET_NAME
                   value: "${COMPONENT_SECRET_NAME}"
+                - name: PRODUCT_NAME
+                  value: "${PRODUCT_NAME}"
           restartPolicy: Never
 parameters:
   - name: NAME
     description: Unique job name to be used in several resource name(s)
     value: integreatly-job-backup
+  - name: PRODUCT_NAME
+    description: Middleware product name to have its data archived
+    required: true
   - name: COMPONENT
     description: Component name to run the backup
     required: true