diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3a96ef18e..38af69b1a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,8 +26,8 @@ jobs:
           node-version: ${{ matrix.node-version }}
       - run: yarn install --frozen-lockfile --ignore-engines
       - run: yarn add sequelize@${{ matrix.sequelize-version }} --ignore-engines
-      - run: docker-compose up -d ${DIALECT}
-      - run: docker run --link ${DIALECT}:db -e CHECK_PORT=${SEQ_PORT::-1} -e CHECK_HOST=db --net cli_default giorgos/takis
+      - run: docker compose up -d ${DIALECT}
+      - run: docker run --link ${DIALECT}:db --net cli_default jwilder/dockerize -wait tcp://${DIALECT}:${SEQ_PORT::-1} -timeout 2m
       - run: yarn test
   test-mysql:
     strategy:
@@ -47,8 +47,8 @@ jobs:
           node-version: ${{ matrix.node-version }}
       - run: yarn install --frozen-lockfile --ignore-engines
       - run: yarn add sequelize@${{ matrix.sequelize-version }} --ignore-engines
-      - run: docker-compose up -d ${DIALECT}
-      - run: docker run --link ${DIALECT}:db -e CHECK_PORT=${SEQ_PORT::-1} -e CHECK_HOST=db --net cli_default giorgos/takis
+      - run: docker compose up -d ${DIALECT}
+      - run: docker run --link ${DIALECT}:db --net cli_default jwilder/dockerize -wait tcp://${DIALECT}:${SEQ_PORT::-1} -timeout 2m
       - run: yarn test
   test-sqlite:
     strategy:
diff --git a/docker-compose.yml b/docker-compose.yml
index 614fa862c..b5993d453 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,7 +12,7 @@ services:
       - "54320:5432"
     container_name: postgres
     command: >
-      bash -c "sed -i -e 's/# \(zh_TW\|en_US\).UTF-8 UTF-8/\1.UTF-8 UTF-8/' /etc/locale.gen
+      bash -c "sed -i -e 's/# \\(zh_TW\\|en_US\\).UTF-8 UTF-8/\\1.UTF-8 UTF-8/' /etc/locale.gen
       && locale-gen
       && docker-entrypoint.sh postgres"