diff --git a/.github/workflows/be-cd.yaml b/.github/workflows/be-cd.yaml
index e184f84..fdc1604 100644
--- a/.github/workflows/be-cd.yaml
+++ b/.github/workflows/be-cd.yaml
@@ -12,7 +12,7 @@ on:
       - server/docker/docker-compose-db.yaml
 
 concurrency:
-  group: be
+  group: $ {{ github.workflow }}
   cancel-in-progress: true
 
 jobs:
@@ -76,5 +76,5 @@ jobs:
               || docker stack deploy -c docker-compose-be.yaml ${REPO_NAME}
               
             docker image prune -af
-            docker service inspect ${REPO_NAME}_be --format '{{.UpdateStatus.State}}' \
-              | grep -qv 'completed' && exit 1
+            docker service inspect ${REPO_NAME}_be --format {{.UpdateStatus.State}} \
+              | grep -q completed
diff --git a/.github/workflows/fe-cd.yaml b/.github/workflows/fe-cd.yaml
index 4e54f17..afffc5e 100644
--- a/.github/workflows/fe-cd.yaml
+++ b/.github/workflows/fe-cd.yaml
@@ -11,7 +11,7 @@ on:
       - server/docker/docker-compose-fe.yaml
 
 concurrency:
-  group: fe
+  group: $ {{ github.workflow }}
   cancel-in-progress: true
 
 jobs:
@@ -62,7 +62,6 @@ jobs:
               && docker service update --force ${REPO_NAME}_fe \
               || docker stack deploy -c docker-compose-fe.yaml ${REPO_NAME}
 
-            docker service inspect ${REPO_NAME}_fe
             docker image prune -af
-            docker service inspect ${REPO_NAME}_fe --format '{{.UpdateStatus.State}}' \
-              | grep -qv 'completed' && exit 1
+            docker service inspect ${REPO_NAME}_fe --format {{.UpdateStatus.State}} \
+              | grep -q completed