diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index 9f5c74781..24893726f 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -189,14 +189,6 @@ steps:
           '-c', 'CREATE DATABASE views;']
   waitFor: ['Turn down FHIR Sink Server Search']
 
-- name: 'docker/compose'
-  id: 'Launch HAPI FHIR Sink Server Controller'
-  args: [ '-f', './docker/sink-compose.yml', '-p', 'sink-server-controller', 'up','--force-recreate', '-d' ]
-  env:
-    - SINK_SERVER_NAME=sink-server-controller
-    - SINK_SERVER_PORT=9001
-  waitFor: ['Create views database']
-
 - name: 'docker/compose'
   id: 'Bring up controller and Spark containers'
   env:
@@ -231,23 +223,14 @@ steps:
   args: [ '-f', './docker/compose-controller-spark-sql-single.yaml', 'down' ,'-v']
   waitFor: ['Run E2E Test for Dockerized Controller and Spark Thriftserver']
 
-# Resetting Sink FHIR server for FHIR to FHIR sync
 - name: 'docker/compose'
-  id: 'Turn down HAPI FHIR sink-server-controller'
-  args: [ '-f', './docker/sink-compose.yml', '-p', 'sink-server-controller' ,'down' ,'-v']
+  id: 'Launch HAPI FHIR Sink Server Controller'
+  args: [ '-f', './docker/sink-compose.yml', '-p', 'sink-server-controller', 'up','--force-recreate', '-d' ]
   env:
     - SINK_SERVER_NAME=sink-server-controller
     - SINK_SERVER_PORT=9001
   waitFor: ['Bring down controller and Spark containers for FHIR server to FHIR server sync']
 
-- name: 'docker/compose'
-  id: 'Launch HAPI FHIR Sink Server Fhir sync'
-  args: ['-f', './docker/sink-compose.yml', '-p', 'sink-server-fhir-sync' , 'up' , '--force-recreate', '-d']
-  env:
-    - SINK_SERVER_NAME=sink-server-fhir-sync
-    - SINK_SERVER_PORT=9001
-  waitFor: ['Turn down HAPI FHIR sink-server-controller']
-
 # Spinning up only the pipeline controller for FHIR server to FHIR server sync
 - name: 'docker/compose'
   id: 'Bring up the pipeline controller'
@@ -262,7 +245,7 @@ steps:
     - FHIRDATA_SINKDBCONFIGPATH=
   args: [ '-f', './docker/compose-controller-spark-sql-single.yaml', 'up',
           '--force-recreate', '--no-deps' , '-d' ,'pipeline-controller' ]
-  waitFor: ['Launch HAPI FHIR Sink Server Fhir sync']         
+  waitFor: ['Launch HAPI FHIR Sink Server Controller']         
 
 - name: '${_REPOSITORY}/e2e-tests/controller-spark:${_TAG}'
   id: 'Run E2E Test for Dockerized Controller for FHIR server to FHIR server sync'   
@@ -281,10 +264,10 @@ steps:
   waitFor: ['Bring down controller']
 
 - name: 'docker/compose'
-  id: 'Turn down HAPI FHIR Sink Server Fhir sync for e2e tests'
-  args: [ '-f', './docker/sink-compose.yml', '-p', 'sink-server-fhir-sync', 'down' ,'-v']
+  id: 'Turn down FHIR Sink Server Controller for e2e tests'
+  args: [ '-f', './docker/sink-compose.yml', '-p', 'sink-server-controller', 'down' ,'-v']
   env:
-    - SINK_SERVER_NAME=sink-server-fhir-sync
+    - SINK_SERVER_NAME=sink-server-controller
     - SINK_SERVER_PORT=9001
   waitFor: ['Turn down HAPI Source Server']
 
@@ -379,7 +362,7 @@ steps:
   args:
   - -c
   - 'cd dwh; ./validate_indicators.sh'
-  waitFor: ['Run E2E Test for JDBC mode with OpenMRS source', 'Turn down HAPI FHIR Sink Server Fhir sync for e2e tests']
+  waitFor: ['Run E2E Test for JDBC mode with OpenMRS source', 'Turn down FHIR Sink Server Controller for e2e tests'']
 
 - name: 'docker/compose'
   id: 'Turn down Webserver and HAPI Server'