diff --git a/common-dev-assets b/common-dev-assets
index ede5101..f3a80f0 160000
--- a/common-dev-assets
+++ b/common-dev-assets
@@ -1 +1 @@
-Subproject commit ede51011fa1c9ba379c2d9a7b563b3714804de6a
+Subproject commit f3a80f0aba9cd08dbf70b044fd4adce587e02dda
diff --git a/examples/every-mt-vpe/main.tf b/examples/every-mt-vpe/main.tf
index 8cd2adc..5ee05a4 100644
--- a/examples/every-mt-vpe/main.tf
+++ b/examples/every-mt-vpe/main.tf
@@ -106,14 +106,6 @@ module "vpes" {
     {
       service_name = "hs-crypto-tke"
     },
-    {
-      service_name = "hyperp-dbaas-mongodb"
-      vpe_name     = "${var.prefix}-hyperp-mongodb"
-    },
-    {
-      service_name = "hyperp-dbaas-postgresql"
-      vpe_name     = "${var.prefix}-hyperp-postgresql"
-    },
     {
       service_name = "iam-svcs"
     },
diff --git a/service_endpoints.tf b/service_endpoints.tf
index e9aadbb..ac589f7 100644
--- a/service_endpoints.tf
+++ b/service_endpoints.tf
@@ -28,8 +28,6 @@ locals {
     hs-crypto-ep11-az3          = "crn:v1:bluemix:public:hs-crypto:${var.region}:::endpoint:ep11-az3.${local.endpoint_prefix}${var.region}.hs-crypto.cloud.ibm.com"
     hs-crypto-kmip              = "crn:v1:bluemix:public:hs-crypto:${var.region}:::endpoint:kmip.${local.endpoint_prefix}${var.region}.hs-crypto.cloud.ibm.com"
     hs-crypto-tke               = "crn:v1:bluemix:public:hs-crypto:${var.region}:::endpoint:tke.${local.endpoint_prefix}${var.region}.hs-crypto.cloud.ibm.com"
-    hyperp-dbaas-mongodb        = "crn:v1:bluemix:public:hyperp-dbaas-mongodb:${var.region}:::endpoint:dbaas900-mongodb.${local.endpoint_prefix}hyperp-dbaas.cloud.ibm.com"
-    hyperp-dbaas-postgresql     = "crn:v1:bluemix:public:hyperp-dbaas-postgresql:${var.region}:::endpoint:dbaas900-postgresql.${local.endpoint_prefix}hyperp-dbaas.cloud.ibm.com"
     iam-svcs                    = "crn:v1:bluemix:public:iam-svcs:global:::endpoint:${local.endpoint_prefix}iam.cloud.ibm.com"
     is                          = "crn:v1:bluemix:public:is:${var.region}:::endpoint:${var.region}.${local.endpoint_prefix}iaas.cloud.ibm.com"
     kms                         = "crn:v1:bluemix:public:kms:${var.region}:::endpoint:${local.endpoint_prefix}${var.region}.kms.cloud.ibm.com"
diff --git a/variables.tf b/variables.tf
index 222b624..62990e2 100644
--- a/variables.tf
+++ b/variables.tf
@@ -92,8 +92,6 @@ variable "cloud_services" {
         "hs-crypto-ep11-az3",
         "hs-crypto-kmip",
         "hs-crypto-tke",
-        "hyperp-dbaas-mongodb",
-        "hyperp-dbaas-postgresql",
         "iam-svcs",
         "is",
         "kms",