diff --git a/.gitmodules b/.gitmodules
index f94ce9e359..ad6a7e7dec 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,12 +19,6 @@
 [submodule "src/uaa-release"]
 	path = src/uaa-release
 	url = https://github.com/cloudfoundry/uaa-release
-[submodule "src/dea-hm-workspace"]
-	path = src/dea-hm-workspace
-	url = https://github.com/cloudfoundry/dea-hm-workspace
-[submodule "src/capi-release"]
-	path = src/capi-release
-	url = https://github.com/cloudfoundry/capi-release
 [submodule "src/nats-release"]
 	path = src/nats-release
 	url = https://github.com/cloudfoundry/nats-release
@@ -64,3 +58,7 @@
 [submodule "src/dotnet-core-buildpack-release"]
 	path = src/dotnet-core-buildpack-release
 	url = https://github.com/cloudfoundry/dotnet-core-buildpack-release
+[submodule "src/capi-release"]
+	path = src/capi-release
+	url = https://github.com/ZhangWeiinHPE/capi-release.git
+	branch = change_ccng_url
diff --git a/jobs/dea_logging_agent b/jobs/dea_logging_agent
deleted file mode 120000
index 3df3d47676..0000000000
--- a/jobs/dea_logging_agent
+++ /dev/null
@@ -1 +0,0 @@
-../src/loggregator/jobs/dea_logging_agent
\ No newline at end of file
diff --git a/jobs/dea_next b/jobs/dea_next
deleted file mode 120000
index ad61581d54..0000000000
--- a/jobs/dea_next
+++ /dev/null
@@ -1 +0,0 @@
-../src/dea-hm-workspace/jobs/dea_next
\ No newline at end of file
diff --git a/jobs/hm9000 b/jobs/hm9000
deleted file mode 120000
index bbff2c5452..0000000000
--- a/jobs/hm9000
+++ /dev/null
@@ -1 +0,0 @@
-../src/dea-hm-workspace/jobs/hm9000
\ No newline at end of file
diff --git a/packages/dea_logging_agent b/packages/dea_logging_agent
deleted file mode 120000
index 8c0e150429..0000000000
--- a/packages/dea_logging_agent
+++ /dev/null
@@ -1 +0,0 @@
-../src/loggregator/packages/dea_logging_agent
\ No newline at end of file
diff --git a/packages/dea_next b/packages/dea_next
deleted file mode 120000
index 05be2a6136..0000000000
--- a/packages/dea_next
+++ /dev/null
@@ -1 +0,0 @@
-../src/dea-hm-workspace/packages/dea_next
\ No newline at end of file
diff --git a/packages/hm9000 b/packages/hm9000
deleted file mode 120000
index 9541c8d395..0000000000
--- a/packages/hm9000
+++ /dev/null
@@ -1 +0,0 @@
-../src/dea-hm-workspace/packages/hm9000
\ No newline at end of file
diff --git a/packages/warden b/packages/warden
deleted file mode 120000
index b7f55422ec..0000000000
--- a/packages/warden
+++ /dev/null
@@ -1 +0,0 @@
-../src/dea-hm-workspace/packages/warden
\ No newline at end of file
diff --git a/src/capi-release b/src/capi-release
index 6f21ff2945..bf50d83fc6 160000
--- a/src/capi-release
+++ b/src/capi-release
@@ -1 +1 @@
-Subproject commit 6f21ff2945d8fb3a0bfbcbb0a1bb1b74ca128bb2
+Subproject commit bf50d83fc6f23dd1e837f98e9811c8e5104fd070
diff --git a/src/dea-hm-workspace b/src/dea-hm-workspace
deleted file mode 160000
index 5b66a99459..0000000000
--- a/src/dea-hm-workspace
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5b66a9945971e7ad8e27fca438941148caa382ad
diff --git a/src/dea_next b/src/dea_next
deleted file mode 120000
index 1592f5bf6f..0000000000
--- a/src/dea_next
+++ /dev/null
@@ -1 +0,0 @@
-dea-hm-workspace/src/dea_next
\ No newline at end of file
diff --git a/src/hm9000 b/src/hm9000
deleted file mode 120000
index 046dca5e2a..0000000000
--- a/src/hm9000
+++ /dev/null
@@ -1 +0,0 @@
-dea-hm-workspace
\ No newline at end of file
diff --git a/src/warden b/src/warden
deleted file mode 120000
index 7f5e13496a..0000000000
--- a/src/warden
+++ /dev/null
@@ -1 +0,0 @@
-dea-hm-workspace/src/warden
\ No newline at end of file
diff --git a/templates/cf-infrastructure-bosh-lite.yml b/templates/cf-infrastructure-bosh-lite.yml
index b794ee75d8..5e1d683d14 100644
--- a/templates/cf-infrastructure-bosh-lite.yml
+++ b/templates/cf-infrastructure-bosh-lite.yml
@@ -1029,6 +1029,7 @@ properties:
     skip_ssl_validation: true
     nodes: 1
     use_http: true
+    backend: diego
 
   smoke_tests:
     api:  (( "api." system_domain ))