diff --git a/openshift/scripts/common/envars b/openshift/scripts/common/envars
index b0e2504f2..8f3025133 100644
--- a/openshift/scripts/common/envars
+++ b/openshift/scripts/common/envars
@@ -10,3 +10,4 @@ PATH_DEPLOY="${PATH_DEPLOY:-$(dirname ${0})/../templates/deploy.yaml}"
 PATH_NATS="${PATH_NATS:-$(dirname ${0})/../templates/nats.yaml}"
 PATH_NATS_SERVER_CONFIG="${PATH_NATS_SERVER_CONFIG:-$(dirname ${0})/../templates/nats_server.yaml}"
 TEMPLATE_PATH="${TEMPLATE_PATH:-$(dirname ${0})/../templates}"
+CRUNCHY_PREFIX="${CRUNCHY_PREFIX:-wps-crunchydb-16}"
\ No newline at end of file
diff --git a/openshift/scripts/oc_cleanup_db.sh b/openshift/scripts/oc_cleanup_db.sh
index 507bec861..88a4ddd18 100755
--- a/openshift/scripts/oc_cleanup_db.sh
+++ b/openshift/scripts/oc_cleanup_db.sh
@@ -41,7 +41,7 @@ OC_CLEAN_DEPLOY="oc -n ${PROJ_TARGET} ${DELETE_OR_GET} \
 
 OC_CLEAN_CRUNCHY="oc -n ${PROJ_TARGET} ${DELETE_OR_GET} \
     PostgresCluster \
-    -o name -l app=wps-crunchydb-16-${SUFFIX}"
+    -o name -l app=${CRUNCHY_PREFIX}-${SUFFIX}"
 
 OC_CLEAN_CONFIGMAPS="oc -n ${PROJ_TARGET} ${DELETE_OR_GET} \
     configmaps \
diff --git a/openshift/scripts/oc_deploy.sh b/openshift/scripts/oc_deploy.sh
index 69085c27f..c542ed20c 100755
--- a/openshift/scripts/oc_deploy.sh
+++ b/openshift/scripts/oc_deploy.sh
@@ -34,9 +34,9 @@ OBJ_NAME="${APP_NAME}-${SUFFIX}"
 OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${PATH_DEPLOY} \
  -p SUFFIX=${SUFFIX} \
  -p PROJECT_NAMESPACE=${PROJ_TARGET} \
- -p POSTGRES_USER=wps-crunchydb-16-${SUFFIX} \
+ -p POSTGRES_USER=${CRUNCHY_PREFIX}-${SUFFIX} \
  -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
- -p CRUNCHYDB_USER=wps-crunchydb-16-${SUFFIX}-pguser-wps-crunchydb-16-${SUFFIX} \
+ -p CRUNCHYDB_USER=${CRUNCHY_PREFIX}-${SUFFIX}-pguser-${CRUNCHY_PREFIX}-${SUFFIX} \
  -p VANITY_DOMAIN=${VANITY_DOMAIN} \
  ${SECOND_LEVEL_DOMAIN:+ "-p SECOND_LEVEL_DOMAIN=${SECOND_LEVEL_DOMAIN}"} \
  ${GUNICORN_WORKERS:+ "-p GUNICORN_WORKERS=${GUNICORN_WORKERS}"} \
diff --git a/openshift/scripts/oc_provision_backup_s3_postgres_cronjob.sh b/openshift/scripts/oc_provision_backup_s3_postgres_cronjob.sh
index 7925fec15..70df1e3fa 100755
--- a/openshift/scripts/oc_provision_backup_s3_postgres_cronjob.sh
+++ b/openshift/scripts/oc_provision_backup_s3_postgres_cronjob.sh
@@ -29,10 +29,10 @@ PROJ_TARGET="${PROJ_TARGET:-${PROJ_DEV}}"
 # Prepare variables for backups
 JOB_NAME="backup-postgres-${APP_NAME}-${SUFFIX}"
 IMAGE_NAMESPACE=${PROJ_TOOLS}
-CLUSTER_NAME="wps-crunchydb-16-${SUFFIX}"
+CLUSTER_NAME="${CRUNCHY_PREFIX}-${SUFFIX}"
 
 OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/backup-s3-postgres-cronjob.yaml \
-    -p CRUNCHYDB_USER=wps-crunchydb-16-${SUFFIX}-pguser-wps-crunchydb-16-${SUFFIX} \
+    -p CRUNCHYDB_USER=${CRUNCHY_PREFIX}-${SUFFIX}-pguser-${CRUNCHY_PREFIX}-${SUFFIX} \
     -p JOB_NAME=${JOB_NAME} \
     -p IMAGE_NAMESPACE=${IMAGE_NAMESPACE} \
     -p APP_LABEL=${APP_NAME}-${SUFFIX} \
diff --git a/openshift/scripts/oc_provision_c_haines_cronjob.sh b/openshift/scripts/oc_provision_c_haines_cronjob.sh
index 58b335bde..08e707b90 100755
--- a/openshift/scripts/oc_provision_c_haines_cronjob.sh
+++ b/openshift/scripts/oc_provision_c_haines_cronjob.sh
@@ -35,7 +35,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/c_haines.cronjob.ya
 -p SUFFIX=${SUFFIX} \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
 -p POSTGRES_USER=wps-crunchydb-${SUFFIX} \
--p CRUNCHYDB_USER=wps-crunchydb-16-${SUFFIX}-pguser-wps-crunchydb-16-${SUFFIX} \
+-p CRUNCHYDB_USER=${CRUNCHY_PREFIX}-${SUFFIX}-pguser-${CRUNCHY_PREFIX}-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"}"
 
 # Apply template (apply or use --dry-run)
diff --git a/openshift/scripts/oc_provision_ec_gdps_cronjob.sh b/openshift/scripts/oc_provision_ec_gdps_cronjob.sh
index dc65ef988..eb0bcdb2f 100755
--- a/openshift/scripts/oc_provision_ec_gdps_cronjob.sh
+++ b/openshift/scripts/oc_provision_ec_gdps_cronjob.sh
@@ -36,7 +36,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/env_canada_gdps.cro
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-16-${SUFFIX}-pguser-wps-crunchydb-16-${SUFFIX} \
+-p CRUNCHYDB_USER=${CRUNCHY_PREFIX}-${SUFFIX}-pguser-${CRUNCHY_PREFIX}-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"} \
 ${IMAGE_REGISTRY:+ "-p IMAGE_REGISTRY=${IMAGE_REGISTRY}"}"
 
diff --git a/openshift/scripts/oc_provision_ec_hrdps_cronjob.sh b/openshift/scripts/oc_provision_ec_hrdps_cronjob.sh
index 559a833af..b02a33352 100755
--- a/openshift/scripts/oc_provision_ec_hrdps_cronjob.sh
+++ b/openshift/scripts/oc_provision_ec_hrdps_cronjob.sh
@@ -36,7 +36,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/env_canada_hrdps.cr
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-16-${SUFFIX}-pguser-wps-crunchydb-16-${SUFFIX} \
+-p CRUNCHYDB_USER=${CRUNCHY_PREFIX}-${SUFFIX}-pguser-${CRUNCHY_PREFIX}-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"} \
 ${IMAGE_REGISTRY:+ "-p IMAGE_REGISTRY=${IMAGE_REGISTRY}"}"
 
diff --git a/openshift/scripts/oc_provision_ec_rdps_cronjob.sh b/openshift/scripts/oc_provision_ec_rdps_cronjob.sh
index 392418f02..d60595e39 100755
--- a/openshift/scripts/oc_provision_ec_rdps_cronjob.sh
+++ b/openshift/scripts/oc_provision_ec_rdps_cronjob.sh
@@ -37,7 +37,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/env_canada_rdps.cro
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-16-${SUFFIX}-pguser-wps-crunchydb-16-${SUFFIX} \
+-p CRUNCHYDB_USER=${CRUNCHY_PREFIX}-${SUFFIX}-pguser-${CRUNCHY_PREFIX}-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"} \
 ${IMAGE_REGISTRY:+ "-p IMAGE_REGISTRY=${IMAGE_REGISTRY}"}"
 
diff --git a/openshift/scripts/oc_provision_fill_partition_job.sh b/openshift/scripts/oc_provision_fill_partition_job.sh
index 9d0f5e95f..8f0327c71 100755
--- a/openshift/scripts/oc_provision_fill_partition_job.sh
+++ b/openshift/scripts/oc_provision_fill_partition_job.sh
@@ -22,7 +22,7 @@ JOB="job/fill-partition-data-${SUFFIX}"
 oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/partition_filler_job.yaml \
     -p SUFFIX=${SUFFIX} \
     -p PG_DATABASE=${PG_DATABASE} \
-    -p CRUNCHYDB_USER=wps-crunchydb-16-${SUFFIX}-pguser-wps-crunchydb-16-${SUFFIX} \
+    -p CRUNCHYDB_USER=${CRUNCHY_PREFIX}-${SUFFIX}-pguser-${CRUNCHY_PREFIX}-${SUFFIX} \
     -p PROJ_TOOLS=${PROJ_TOOLS} | jq '.items[0]' | oc -n ${PROJ_TARGET} create -f -
 # wait for the job to finish
 oc wait --for=condition=complete ${JOB} --timeout=3600s
diff --git a/openshift/scripts/oc_provision_grass_curing_cronjob.sh b/openshift/scripts/oc_provision_grass_curing_cronjob.sh
index 6dc93a8c4..6b455496d 100644
--- a/openshift/scripts/oc_provision_grass_curing_cronjob.sh
+++ b/openshift/scripts/oc_provision_grass_curing_cronjob.sh
@@ -36,7 +36,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/grass_curing.cronjo
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-16-${SUFFIX}-pguser-wps-crunchydb-16-${SUFFIX} \
+-p CRUNCHYDB_USER=${CRUNCHY_PREFIX}-${SUFFIX}-pguser-${CRUNCHY_PREFIX}-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"} \
 ${IMAGE_REGISTRY:+ "-p IMAGE_REGISTRY=${IMAGE_REGISTRY}"}"
 
diff --git a/openshift/scripts/oc_provision_nats.sh b/openshift/scripts/oc_provision_nats.sh
index 69770b117..5407e9fef 100755
--- a/openshift/scripts/oc_provision_nats.sh
+++ b/openshift/scripts/oc_provision_nats.sh
@@ -31,7 +31,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${PATH_NATS} \
  -p POSTGRES_DATABASE=wps \
  ${MEMORY_REQUEST:+ "-p MEMORY_REQUEST=${MEMORY_REQUEST}"} \
  ${MEMORY_LIMIT:+ "-p MEMORY_LIMIT=${MEMORY_LIMIT}"} \
- -p CRUNCHYDB_USER=wps-crunchydb-16-${SUFFIX}-pguser-wps-crunchydb-16-${SUFFIX} \
+ -p CRUNCHYDB_USER=${CRUNCHY_PREFIX}-${SUFFIX}-pguser-${CRUNCHY_PREFIX}-${SUFFIX} \
  -p APP_NAME=${APP_NAME}"
 
 # Apply a template (apply or use --dry-run=client)
diff --git a/openshift/scripts/oc_provision_noaa_gfs_cronjob.sh b/openshift/scripts/oc_provision_noaa_gfs_cronjob.sh
index 848107a88..b14310bc5 100644
--- a/openshift/scripts/oc_provision_noaa_gfs_cronjob.sh
+++ b/openshift/scripts/oc_provision_noaa_gfs_cronjob.sh
@@ -38,7 +38,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/noaa_gfs.cronjob.ya
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-16-${SUFFIX}-pguser-wps-crunchydb-16-${SUFFIX} \
+-p CRUNCHYDB_USER=${CRUNCHY_PREFIX}-${SUFFIX}-pguser-${CRUNCHY_PREFIX}-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"} \
 ${IMAGE_REGISTRY:+ "-p IMAGE_REGISTRY=${IMAGE_REGISTRY}"}"
 
diff --git a/openshift/scripts/oc_provision_noaa_nam_cronjob.sh b/openshift/scripts/oc_provision_noaa_nam_cronjob.sh
index d4e9937bf..738846dd0 100644
--- a/openshift/scripts/oc_provision_noaa_nam_cronjob.sh
+++ b/openshift/scripts/oc_provision_noaa_nam_cronjob.sh
@@ -36,7 +36,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/noaa_nam.cronjob.ya
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-16-${SUFFIX}-pguser-wps-crunchydb-16-${SUFFIX} \
+-p CRUNCHYDB_USER=${CRUNCHY_PREFIX}-${SUFFIX}-pguser-${CRUNCHY_PREFIX}-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"} \
 ${IMAGE_REGISTRY:+ "-p IMAGE_REGISTRY=${IMAGE_REGISTRY}"}"
 
diff --git a/openshift/scripts/oc_provision_partitioner_cronjob.sh b/openshift/scripts/oc_provision_partitioner_cronjob.sh
index 921ebeeb3..871fad241 100644
--- a/openshift/scripts/oc_provision_partitioner_cronjob.sh
+++ b/openshift/scripts/oc_provision_partitioner_cronjob.sh
@@ -32,7 +32,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/partitioner.cronjob
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p PG_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-16-${SUFFIX}-pguser-wps-crunchydb-16-${SUFFIX} \
+-p CRUNCHYDB_USER=${CRUNCHY_PREFIX}-${SUFFIX}-pguser-${CRUNCHY_PREFIX}-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"}"
 
 # Apply template (apply or use --dry-run)
diff --git a/openshift/scripts/oc_provision_rdps_sfms_cronjob.sh b/openshift/scripts/oc_provision_rdps_sfms_cronjob.sh
index 1722b76fd..6870fd9d1 100644
--- a/openshift/scripts/oc_provision_rdps_sfms_cronjob.sh
+++ b/openshift/scripts/oc_provision_rdps_sfms_cronjob.sh
@@ -36,7 +36,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/rdps_sfms.cronjob.y
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-16-${SUFFIX}-pguser-wps-crunchydb-16-${SUFFIX} \
+-p CRUNCHYDB_USER=${CRUNCHY_PREFIX}-${SUFFIX}-pguser-${CRUNCHY_PREFIX}-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"} \
 ${IMAGE_REGISTRY:+ "-p IMAGE_REGISTRY=${IMAGE_REGISTRY}"}"
 
diff --git a/openshift/scripts/oc_provision_viirs_snow_cronjob.sh b/openshift/scripts/oc_provision_viirs_snow_cronjob.sh
index d3b014b23..5895a71e7 100644
--- a/openshift/scripts/oc_provision_viirs_snow_cronjob.sh
+++ b/openshift/scripts/oc_provision_viirs_snow_cronjob.sh
@@ -36,7 +36,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/viirs_snow.cronjob.
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-16-${SUFFIX}-pguser-wps-crunchydb-16-${SUFFIX} \
+-p CRUNCHYDB_USER=${CRUNCHY_PREFIX}-${SUFFIX}-pguser-${CRUNCHY_PREFIX}-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"} \
 ${IMAGE_REGISTRY:+ "-p IMAGE_REGISTRY=${IMAGE_REGISTRY}"}"
 
diff --git a/openshift/scripts/oc_provision_wfwx_hourly_actuals_cronjob.sh b/openshift/scripts/oc_provision_wfwx_hourly_actuals_cronjob.sh
index 1700f0a9b..ac00757de 100755
--- a/openshift/scripts/oc_provision_wfwx_hourly_actuals_cronjob.sh
+++ b/openshift/scripts/oc_provision_wfwx_hourly_actuals_cronjob.sh
@@ -37,7 +37,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/wfwx_hourly_actuals
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-16-${SUFFIX}-pguser-wps-crunchydb-16-${SUFFIX} \
+-p CRUNCHYDB_USER=${CRUNCHY_PREFIX}-${SUFFIX}-pguser-${CRUNCHY_PREFIX}-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"} \
 ${IMAGE_REGISTRY:+ "-p IMAGE_REGISTRY=${IMAGE_REGISTRY}"}"
 
diff --git a/openshift/scripts/oc_provision_wfwx_noon_forecasts_cronjob.sh b/openshift/scripts/oc_provision_wfwx_noon_forecasts_cronjob.sh
index 8fbd6e325..45f9e92eb 100755
--- a/openshift/scripts/oc_provision_wfwx_noon_forecasts_cronjob.sh
+++ b/openshift/scripts/oc_provision_wfwx_noon_forecasts_cronjob.sh
@@ -37,7 +37,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/wfwx_noon_forecasts
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-16-${SUFFIX}-pguser-wps-crunchydb-16-${SUFFIX} \
+-p CRUNCHYDB_USER=${CRUNCHY_PREFIX}-${SUFFIX}-pguser-${CRUNCHY_PREFIX}-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"} \
 ${IMAGE_REGISTRY:+ "-p IMAGE_REGISTRY=${IMAGE_REGISTRY}"}"
 
diff --git a/openshift/templates/crunchy.yaml b/openshift/templates/crunchy.yaml
index 9002c9228..4526e22d6 100644
--- a/openshift/templates/crunchy.yaml
+++ b/openshift/templates/crunchy.yaml
@@ -19,7 +19,6 @@ parameters:
     required: true
   - name: APP_NAME
     description: Application name (wps - wildfire predictive services)
-    value: wps-crunchydb-16
     required: true
   - name: BUCKET
     description: S3 bucket name