diff --git a/openshift/scripts/oc_cleanup.sh b/openshift/scripts/oc_cleanup.sh
index f85cfe79c..870d48431 100755
--- a/openshift/scripts/oc_cleanup.sh
+++ b/openshift/scripts/oc_cleanup.sh
@@ -30,13 +30,11 @@ else
 	DELETE_OR_GET="get"
 fi
 OC_CLEAN_DEPLOY="oc -n ${PROJ_TARGET} ${DELETE_OR_GET} all,cm,pvc -o name -l app=${APP_LABEL}"
-OC_CLEAN_TILESERV="oc -n ${PROJ_TARGET} ${DELETE_OR_GET} all,cm,pvc,PostgresCluster -o name -l app=wps-tileserv-${SUFFIX}"
 
 # Execute commands
 #
 echo -e "\n${PROJ_TARGET}:"
 eval "${OC_CLEAN_DEPLOY}"
-eval "${OC_CLEAN_TILESERV}"
 
 # Provide oc command instruction
 #
diff --git a/openshift/scripts/oc_cleanup_db.sh b/openshift/scripts/oc_cleanup_db.sh
index 8d99f6fa1..06c566591 100755
--- a/openshift/scripts/oc_cleanup_db.sh
+++ b/openshift/scripts/oc_cleanup_db.sh
@@ -39,6 +39,10 @@ OC_CLEAN_DEPLOY="oc -n ${PROJ_TARGET} ${DELETE_OR_GET} \
     all,cm,secret,endpoints,serviceaccounts,rolebinding.rbac.authorization.k8s.io,roles.rbac.authorization.k8s.io,pvc \
     -o name -l app=${APPLICATION_NAME} -l cluster-name=${APPLICATION_NAME}"
 
+OC_CLEAN_CRUNCHY="oc -n ${PROJ_TARGET} ${DELETE_OR_GET} \
+    PostgresCluster \
+    -o name -l app=wps-crunchydb-${SUFFIX}"
+
 OC_CLEAN_CONFIGMAPS="oc -n ${PROJ_TARGET} ${DELETE_OR_GET} \
     configmaps \
     -o name -l cluster-name=${APPLICATION_NAME}"
@@ -47,11 +51,12 @@ OC_CLEAN_PATRONI_NETWORK_POLICY="oc -n ${PROJ_TARGET} ${DELETE_OR_GET} networkpo
 
 # Execute commands
 #
-echo -e "\n${PROJ_TARGET}:" 
+echo -e "\n${PROJ_TARGET}:"
 eval "${OC_CLEAN_DEPLOY}"
+eval "${OC_CLEAN_CRUNCHY}"
 eval "${OC_CLEAN_CONFIGMAPS}"
 eval "${OC_CLEAN_PATRONI_NETWORK_POLICY}"
 
 # Provide oc command instruction
 #
-display_helper "${OC_CLEAN_DEPLOY}" "${OC_CLEAN_CONFIGMAPS}" "${OC_CLEAN_PATRONI_NETWORK_POLICY}"
\ No newline at end of file
+display_helper "${OC_CLEAN_DEPLOY}" "${OC_CLEAN_CRUNCHY}" "${OC_CLEAN_CONFIGMAPS}" "${OC_CLEAN_PATRONI_NETWORK_POLICY}"
\ No newline at end of file