diff --git a/_build-and-test-all.sh b/_build-and-test-all.sh
index 5cb504a5..c709ab48 100755
--- a/_build-and-test-all.sh
+++ b/_build-and-test-all.sh
@@ -29,9 +29,11 @@ ${dockerall}Up
 
 ./wait-for-services.sh localhost readers/${READER}/finished "8099"
 
+compose="docker-compose -f docker-compose-${DATABASE}.yml "
 
+$compose stop cdc-service
 curl -s https://raw.githubusercontent.com/eventuate-foundation/eventuate-common/master/migration/db-id/migration.sh &> /dev/stdout | bash
-
+$compose start cdc-service
 
 ${dockerall}Up -P envFile=docker-compose-env-files/db-id-gen.env
 
diff --git a/docker-compose-mysql.yml b/docker-compose-mysql.yml
index 15cb4d51..9b81847d 100755
--- a/docker-compose-mysql.yml
+++ b/docker-compose-mysql.yml
@@ -6,7 +6,7 @@ services:
     build:
       context: ./order-service/
       args:
-        baseImageVersion: ${EVENTUATE_JAVA_BASE_IMAGE_VERSION?}
+        baseImageVersion: ${EVENTUATE_JAVA_BASE_IMAGE_VERSION}
     ports:
       - "8081:8080"
     depends_on:
@@ -31,7 +31,7 @@ services:
     build:
       context: ./customer-service/
       args:
-        baseImageVersion: ${EVENTUATE_JAVA_BASE_IMAGE_VERSION?}
+        baseImageVersion: ${EVENTUATE_JAVA_BASE_IMAGE_VERSION}
     ports:
       - "8082:8080"
     depends_on:
@@ -54,7 +54,7 @@ services:
     build:
       context: ./api-gateway-service/
       args:
-        baseImageVersion: ${EVENTUATE_JAVA_BASE_IMAGE_VERSION?}
+        baseImageVersion: ${EVENTUATE_JAVA_BASE_IMAGE_VERSION}
     ports:
       - "8083:8080"
     environment:
diff --git a/docker-compose-postgres.yml b/docker-compose-postgres.yml
index e8515895..56f9c52e 100755
--- a/docker-compose-postgres.yml
+++ b/docker-compose-postgres.yml
@@ -6,7 +6,7 @@ services:
     build:
       context: ./order-service/
       args:
-        baseImageVersion: ${EVENTUATE_JAVA_BASE_IMAGE_VERSION?}
+        baseImageVersion: ${EVENTUATE_JAVA_BASE_IMAGE_VERSION}
     ports:
       - "8081:8080"
     depends_on:
@@ -28,7 +28,7 @@ services:
     build:
       context: ./customer-service/
       args:
-        baseImageVersion: ${EVENTUATE_JAVA_BASE_IMAGE_VERSION?}
+        baseImageVersion: ${EVENTUATE_JAVA_BASE_IMAGE_VERSION}
     ports:
       - "8082:8080"
     depends_on:
@@ -48,7 +48,7 @@ services:
     build:
       context: ./api-gateway-service/
       args:
-        baseImageVersion: ${EVENTUATE_JAVA_BASE_IMAGE_VERSION?}
+        baseImageVersion: ${EVENTUATE_JAVA_BASE_IMAGE_VERSION}
     ports:
       - "8083:8080"
     environment: