diff --git a/.github/workflows/forkless-update-data.yml b/.github/workflows/forkless-update-data.yml
index ee7e99af77..f29ffa8a3e 100644
--- a/.github/workflows/forkless-update-data.yml
+++ b/.github/workflows/forkless-update-data.yml
@@ -96,8 +96,8 @@ jobs:
         uses: ./.github/actions/buildContainer
         id: mainnet
         with:
-          container: uniquenetwork/ci-nodata-${{ matrix.network }}
-          tag: ${{ matrix.network }}-${{ env.MAINNET_BRANCH }}-${{ env.MAINNET_HASH}}
+          container: uniquenetwork/ci-data-${{ matrix.network }}
+          tag: ${{ env.MAINNET_BRANCH }}-${{ env.MAINNET_HASH}}
           context: .docker
           dockerfile: Dockerfile-unique-release
           args: |
@@ -111,8 +111,8 @@ jobs:
         uses: ./.github/actions/buildContainer
         id: runtime
         with:
-          container: uniquenetwork/ci-nodata-${{ matrix.network }}
-          tag: ${{ matrix.network }}-${{ env.REF_SLUG }}-${{ env.BUILD_SHA }}
+          container: uniquenetwork/ci-data-${{ matrix.network }}
+          tag: ${{ env.REF_SLUG }}-${{ env.BUILD_SHA }}
           context: .
           dockerfile: .docker/Dockerfile-unique
           args: |
@@ -132,7 +132,7 @@ jobs:
         id: node
         with:
           container: uniquenetwork/ci-data-${{ matrix.network }}
-          tag: ${{ matrix.network }}-${{ env.NODE_BRANCH }}-${{ env.NODE_HASH}}
+          tag: ${{ env.NODE_BRANCH }}-${{ env.NODE_HASH}}
           context: .docker
           dockerfile: Dockerfile-unique-release
           args: |
diff --git a/.github/workflows/forkless-update-nodata.yml b/.github/workflows/forkless-update-nodata.yml
index 3230af8100..6eec9d51ef 100644
--- a/.github/workflows/forkless-update-nodata.yml
+++ b/.github/workflows/forkless-update-nodata.yml
@@ -97,7 +97,7 @@ jobs:
         id: mainnet
         with:
           container: uniquenetwork/ci-nodata-${{ matrix.network }}
-          tag: ${{ matrix.network }}-${{ env.MAINNET_BRANCH }}-${{ env.MAINNET_HASH}}
+          tag: ${{ env.MAINNET_BRANCH }}-${{ env.MAINNET_HASH}}
           context: .docker
           dockerfile: Dockerfile-unique-release
           args: |
@@ -112,7 +112,7 @@ jobs:
         id: runtime
         with:
           container: uniquenetwork/ci-nodata-${{ matrix.network }}
-          tag: ${{ matrix.network }}-${{ env.REF_SLUG }}-${{ env.BUILD_SHA }}
+          tag: ${{ env.REF_SLUG }}-${{ env.BUILD_SHA }}
           context: .
           dockerfile: .docker/Dockerfile-unique
           args: |
@@ -131,8 +131,8 @@ jobs:
         uses: ./.github/actions/buildContainer
         id: node
         with:
-          container: uniquenetwork/ci-data-${{ matrix.network }}
-          tag: ${{ matrix.network }}-${{ env.NODE_BRANCH }}-${{ env.NODE_HASH}}
+          container: uniquenetwork/ci-nodata-${{ matrix.network }}
+          tag: ${{ env.NODE_BRANCH }}-${{ env.NODE_HASH}}
           context: .docker
           dockerfile: Dockerfile-unique-release
           args: |