diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
index 9b55ef8f..90e8c947 100644
--- a/.github/workflows/container.yml
+++ b/.github/workflows/container.yml
@@ -83,193 +83,193 @@ jobs:
         echo "Flags:     ${{ steps.buildx.outputs.flags }}"
         echo "Platforms: ${{ steps.buildx.outputs.platforms }}"
 
-#    - name: Log into registry ${{ env.REGISTRY }}
-#      if: github.event_name != 'pull_request'
-#      uses: docker/login-action@v2
-#      with:
-#        registry: ${{ env.REGISTRY }}
-#        username: ${{ github.actor }}
-#        password: ${{ secrets.GITHUB_TOKEN }}
-#
-#    - name: Log into registry ${{ env.EULIX_REGISTRY }}
-#      if: github.event_name != 'pull_request'
-#      uses: docker/login-action@v2
-#      with:
-#        registry: ${{ env.EULIX_REGISTRY }}
-#        username: ${{ secrets.EULIX_REGISTRY_USERNAME }}
-#        password: ${{ secrets.EULIX_REGISTRY_PASSWORD }}
-#
-#    - name: Log into registry Docker Hub
-#      if: github.event_name != 'pull_request'
-#      uses: docker/login-action@v2
-#      with:
-#        username: ${{ secrets.DOCKER_HUB_REGISTRY_USERNAME }}
-#        password: ${{ secrets.DOCKER_HUB_REGISTRY_PASSWORD }}
-#
-#    - name: Log into registry ${{ env.HUAWEICLOUD_REGISTRY_SH }}
-#      if: github.event_name != 'pull_request'
-#      uses: docker/login-action@v2
-#      with:
-#        registry: ${{ env.HUAWEICLOUD_REGISTRY_SH }}
-#        username: cn-east-3@${{ secrets.HUAWEICLOUD_USERNAME }}
-#        password: ${{ secrets.HUAWEICLOUD_PASSWORD }}
-#
-#    - name: Log into registry ${{ env.HUAWEICLOUD_REGISTRY_BJ }}
-#      if: github.event_name != 'pull_request'
-#      uses: docker/login-action@v2
-#      with:
-#        registry: ${{ env.HUAWEICLOUD_REGISTRY_BJ }}
-#        username: cn-north-4@${{ secrets.HUAWEICLOUD_USERNAME }}
-#        password: ${{ secrets.HUAWEICLOUD_PASSWORD }}
-#
-#    - name: Log into registry ${{ env.HUAWEICLOUD_REGISTRY_GZ }}
-#      if: github.event_name != 'pull_request'
-#      uses: docker/login-action@v2
-#      with:
-#        registry: ${{ env.HUAWEICLOUD_REGISTRY_GZ }}
-#        username: cn-south-1@${{ secrets.HUAWEICLOUD_USERNAME }}
-#        password: ${{ secrets.HUAWEICLOUD_PASSWORD }}
-#
-#    - name: Log into registry ${{ env.HUAWEICLOUD_REGISTRY_SG }}
-#      if: github.event_name != 'pull_request'
-#      uses: docker/login-action@v2
-#      with:
-#        registry: ${{ env.HUAWEICLOUD_REGISTRY_SG }}
-#        username: ap-southeast-3@${{ secrets.HUAWEICLOUD_USERNAME }}
-#        password: ${{ secrets.HUAWEICLOUD_PASSWORD }}
-#
-#    - name: Log into registry ${{ env.HUAWEICLOUD_REGISTRY_HK }}
-#      if: github.event_name != 'pull_request'
-#      uses: docker/login-action@v2
-#      with:
-#        registry: ${{ env.HUAWEICLOUD_REGISTRY_HK }}
-#        username: ap-southeast-1@${{ secrets.HUAWEICLOUD_USERNAME }}
-#        password: ${{ secrets.HUAWEICLOUD_PASSWORD }}
-#
-#    - name: Log into registry ${{ env.HUAWEICLOUD_REGISTRY_AF }}
-#      if: github.event_name != 'pull_request'
-#      uses: docker/login-action@v2
-#      with:
-#        registry: ${{ env.HUAWEICLOUD_REGISTRY_AF }}
-#        username: af-south-1@${{ secrets.HUAWEICLOUD_USERNAME }}
-#        password: ${{ secrets.HUAWEICLOUD_PASSWORD }}
-#
-#    - name: Log into registry ${{ env.HUAWEICLOUD_REGISTRY_LA }}
-#      if: github.event_name != 'pull_request'
-#      uses: docker/login-action@v2
-#      with:
-#        registry: ${{ env.HUAWEICLOUD_REGISTRY_LA }}
-#        username: la-north-2@${{ secrets.HUAWEICLOUD_USERNAME }}
-#        password: ${{ secrets.HUAWEICLOUD_PASSWORD }}
-#
-#    - name: Extract Docker metadata for Server
-#      id: meta-server
-#      uses: docker/metadata-action@v2
-#      with:
-#        images: |
-#          ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-#          ${{ env.EULIX_REGISTRY }}/${{ env.IMAGE_NAME }}
-#          aospace/${{ env.GITHUB_REPOSITORY_NAME }}
-#          ${{ env.HUAWEICLOUD_REGISTRY_SH }}/${{ env.IMAGE_NAME }}
-#          ${{ env.HUAWEICLOUD_REGISTRY_BJ }}/${{ env.IMAGE_NAME }}
-#          ${{ env.HUAWEICLOUD_REGISTRY_GZ }}/${{ env.IMAGE_NAME }}
-#          ${{ env.HUAWEICLOUD_REGISTRY_HK }}/${{ env.IMAGE_NAME }}
-#          ${{ env.HUAWEICLOUD_REGISTRY_SG }}/${{ env.IMAGE_NAME }}
-#          ${{ env.HUAWEICLOUD_REGISTRY_AF }}/${{ env.IMAGE_NAME }}
-#          ${{ env.HUAWEICLOUD_REGISTRY_LA }}/${{ env.IMAGE_NAME }}
-#        flavor: |
-#          prefix=server-
-#
-#    - name: Build and push Docker image for Server
-#      id: build-and-push-server
-#      uses: docker/build-push-action@v4.2.1
-#      with:
-#        context: .
-#        push: ${{ github.event_name != 'pull_request' }}
-#        tags: ${{ steps.meta-server.outputs.tags }}
-#        labels: ${{ steps.meta-server.outputs.labels }}
-#        builder: ${{ steps.buildx.outputs.name }}
-#        platforms: linux/amd64,linux/arm64
-#        cache-from: type=gha
-#        cache-to: type=gha,mode=max
-#        file: Dockerfile-server
-#        provenance: false
-#
-#    - name: Extract Docker metadata for Client
-#      id: meta-client
-#      uses: docker/metadata-action@v2
-#      with:
-#        images: |
-#          ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-#          ${{ env.EULIX_REGISTRY }}/${{ env.IMAGE_NAME }}
-#          aospace/${{ env.GITHUB_REPOSITORY_NAME }}
-#          ${{ env.HUAWEICLOUD_REGISTRY_SH }}/${{ env.IMAGE_NAME }}
-#          ${{ env.HUAWEICLOUD_REGISTRY_BJ }}/${{ env.IMAGE_NAME }}
-#          ${{ env.HUAWEICLOUD_REGISTRY_GZ }}/${{ env.IMAGE_NAME }}
-#          ${{ env.HUAWEICLOUD_REGISTRY_HK }}/${{ env.IMAGE_NAME }}
-#          ${{ env.HUAWEICLOUD_REGISTRY_SG }}/${{ env.IMAGE_NAME }}
-#          ${{ env.HUAWEICLOUD_REGISTRY_AF }}/${{ env.IMAGE_NAME }}
-#          ${{ env.HUAWEICLOUD_REGISTRY_LA }}/${{ env.IMAGE_NAME }}
-#        flavor: |
-#          prefix=client-
-#
-#    - name: Build and push Docker image for Client
-#      id: build-and-push-client
-#      uses: docker/build-push-action@v4.2.1
-#      with:
-#        context: .
-#        push: ${{ github.event_name != 'pull_request' }}
-#        tags: ${{ steps.meta-client.outputs.tags }}
-#        labels: ${{ steps.meta-client.outputs.labels }}
-#        builder: ${{ steps.buildx.outputs.name }}
-#        platforms: linux/amd64,linux/arm64
-#        cache-from: type=gha
-#        cache-to: type=gha,mode=max
-#        file: Dockerfile-client
-#        provenance: false
-#
-#    - name: Extract Docker metadata for Server
-#      id: meta-opensource-server
-#      uses: docker/metadata-action@v2
-#      with:
-#        images: |
-#          ${{ env.EULIX_REGISTRY }}/cicada-private/aonetwork-server
-#        flavor: |
-#          prefix=opensource-server-
-#
-#    - name: Build and push Docker image for Server
-#      id: build-and-push-opensource-server
-#      uses: docker/build-push-action@v2
-#      with:
-#        context: .
-#        push: ${{ github.event_name != 'pull_request' }}
-#        tags: ${{ steps.meta-opensource-server.outputs.tags }}
-#        labels: ${{ steps.meta-opensource-server.outputs.labels }}
-#        builder: ${{ steps.buildx.outputs.name }}
-#        platforms: linux/amd64,linux/arm64
-#        cache-from: type=gha
-#        cache-to: type=gha,mode=max
-#        file: Dockerfile-server
-#
-#    - name: Extract Docker metadata for Client
-#      id: meta-opensource-client
-#      uses: docker/metadata-action@v2
-#      with:
-#        images: |
-#          ${{ env.EULIX_REGISTRY }}/cicada-private/aonetwork-client
-#        flavor: |
-#          prefix=opensource-client-
-#
-#    - name: Build and push Docker image for Client
-#      id: build-and-push-opensource-client
-#      uses: docker/build-push-action@v2
-#      with:
-#        context: .
-#        push: ${{ github.event_name != 'pull_request' }}
-#        tags: ${{ steps.meta-opensource-client.outputs.tags }}
-#        labels: ${{ steps.meta-opensource-client.outputs.labels }}
-#        builder: ${{ steps.buildx.outputs.name }}
-#        platforms: linux/amd64,linux/arm64
-#        cache-from: type=gha
-#        cache-to: type=gha,mode=max
-#        file: Dockerfile-client
+    - name: Log into registry ${{ env.REGISTRY }}
+      if: github.event_name != 'pull_request'
+      uses: docker/login-action@v2
+      with:
+        registry: ${{ env.REGISTRY }}
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Log into registry ${{ env.EULIX_REGISTRY }}
+      if: github.event_name != 'pull_request'
+      uses: docker/login-action@v2
+      with:
+        registry: ${{ env.EULIX_REGISTRY }}
+        username: ${{ secrets.EULIX_REGISTRY_USERNAME }}
+        password: ${{ secrets.EULIX_REGISTRY_PASSWORD }}
+
+    - name: Log into registry Docker Hub
+      if: github.event_name != 'pull_request'
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKER_HUB_REGISTRY_USERNAME }}
+        password: ${{ secrets.DOCKER_HUB_REGISTRY_PASSWORD }}
+
+    - name: Log into registry ${{ env.HUAWEICLOUD_REGISTRY_SH }}
+      if: github.event_name != 'pull_request'
+      uses: docker/login-action@v2
+      with:
+        registry: ${{ env.HUAWEICLOUD_REGISTRY_SH }}
+        username: cn-east-3@${{ secrets.HUAWEICLOUD_USERNAME }}
+        password: ${{ secrets.HUAWEICLOUD_PASSWORD }}
+
+    - name: Log into registry ${{ env.HUAWEICLOUD_REGISTRY_BJ }}
+      if: github.event_name != 'pull_request'
+      uses: docker/login-action@v2
+      with:
+        registry: ${{ env.HUAWEICLOUD_REGISTRY_BJ }}
+        username: cn-north-4@${{ secrets.HUAWEICLOUD_USERNAME }}
+        password: ${{ secrets.HUAWEICLOUD_PASSWORD }}
+
+    - name: Log into registry ${{ env.HUAWEICLOUD_REGISTRY_GZ }}
+      if: github.event_name != 'pull_request'
+      uses: docker/login-action@v2
+      with:
+        registry: ${{ env.HUAWEICLOUD_REGISTRY_GZ }}
+        username: cn-south-1@${{ secrets.HUAWEICLOUD_USERNAME }}
+        password: ${{ secrets.HUAWEICLOUD_PASSWORD }}
+
+    - name: Log into registry ${{ env.HUAWEICLOUD_REGISTRY_SG }}
+      if: github.event_name != 'pull_request'
+      uses: docker/login-action@v2
+      with:
+        registry: ${{ env.HUAWEICLOUD_REGISTRY_SG }}
+        username: ap-southeast-3@${{ secrets.HUAWEICLOUD_USERNAME }}
+        password: ${{ secrets.HUAWEICLOUD_PASSWORD }}
+
+    - name: Log into registry ${{ env.HUAWEICLOUD_REGISTRY_HK }}
+      if: github.event_name != 'pull_request'
+      uses: docker/login-action@v2
+      with:
+        registry: ${{ env.HUAWEICLOUD_REGISTRY_HK }}
+        username: ap-southeast-1@${{ secrets.HUAWEICLOUD_USERNAME }}
+        password: ${{ secrets.HUAWEICLOUD_PASSWORD }}
+
+    - name: Log into registry ${{ env.HUAWEICLOUD_REGISTRY_AF }}
+      if: github.event_name != 'pull_request'
+      uses: docker/login-action@v2
+      with:
+        registry: ${{ env.HUAWEICLOUD_REGISTRY_AF }}
+        username: af-south-1@${{ secrets.HUAWEICLOUD_USERNAME }}
+        password: ${{ secrets.HUAWEICLOUD_PASSWORD }}
+
+    - name: Log into registry ${{ env.HUAWEICLOUD_REGISTRY_LA }}
+      if: github.event_name != 'pull_request'
+      uses: docker/login-action@v2
+      with:
+        registry: ${{ env.HUAWEICLOUD_REGISTRY_LA }}
+        username: la-north-2@${{ secrets.HUAWEICLOUD_USERNAME }}
+        password: ${{ secrets.HUAWEICLOUD_PASSWORD }}
+
+    - name: Extract Docker metadata for Server
+      id: meta-server
+      uses: docker/metadata-action@v2
+      with:
+        images: |
+          ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          ${{ env.EULIX_REGISTRY }}/${{ env.IMAGE_NAME }}
+          aospace/${{ env.GITHUB_REPOSITORY_NAME }}
+          ${{ env.HUAWEICLOUD_REGISTRY_SH }}/${{ env.IMAGE_NAME }}
+          ${{ env.HUAWEICLOUD_REGISTRY_BJ }}/${{ env.IMAGE_NAME }}
+          ${{ env.HUAWEICLOUD_REGISTRY_GZ }}/${{ env.IMAGE_NAME }}
+          ${{ env.HUAWEICLOUD_REGISTRY_HK }}/${{ env.IMAGE_NAME }}
+          ${{ env.HUAWEICLOUD_REGISTRY_SG }}/${{ env.IMAGE_NAME }}
+          ${{ env.HUAWEICLOUD_REGISTRY_AF }}/${{ env.IMAGE_NAME }}
+          ${{ env.HUAWEICLOUD_REGISTRY_LA }}/${{ env.IMAGE_NAME }}
+        flavor: |
+          prefix=server-
+
+    - name: Build and push Docker image for Server
+      id: build-and-push-server 
+      uses: docker/build-push-action@v4.2.1
+      with:
+        context: .
+        push: ${{ github.event_name != 'pull_request' }}
+        tags: ${{ steps.meta-server.outputs.tags }}
+        labels: ${{ steps.meta-server.outputs.labels }}
+        builder: ${{ steps.buildx.outputs.name }}
+        platforms: linux/amd64,linux/arm64
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
+        file: Dockerfile-server
+        provenance: false
+
+    - name: Extract Docker metadata for Client
+      id: meta-client
+      uses: docker/metadata-action@v2
+      with:
+        images: |
+          ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          ${{ env.EULIX_REGISTRY }}/${{ env.IMAGE_NAME }}
+          aospace/${{ env.GITHUB_REPOSITORY_NAME }}
+          ${{ env.HUAWEICLOUD_REGISTRY_SH }}/${{ env.IMAGE_NAME }}
+          ${{ env.HUAWEICLOUD_REGISTRY_BJ }}/${{ env.IMAGE_NAME }}
+          ${{ env.HUAWEICLOUD_REGISTRY_GZ }}/${{ env.IMAGE_NAME }}
+          ${{ env.HUAWEICLOUD_REGISTRY_HK }}/${{ env.IMAGE_NAME }}
+          ${{ env.HUAWEICLOUD_REGISTRY_SG }}/${{ env.IMAGE_NAME }}
+          ${{ env.HUAWEICLOUD_REGISTRY_AF }}/${{ env.IMAGE_NAME }}
+          ${{ env.HUAWEICLOUD_REGISTRY_LA }}/${{ env.IMAGE_NAME }}
+        flavor: |
+          prefix=client-
+
+    - name: Build and push Docker image for Client
+      id: build-and-push-client 
+      uses: docker/build-push-action@v4.2.1
+      with:
+        context: .
+        push: ${{ github.event_name != 'pull_request' }}
+        tags: ${{ steps.meta-client.outputs.tags }}
+        labels: ${{ steps.meta-client.outputs.labels }}
+        builder: ${{ steps.buildx.outputs.name }}
+        platforms: linux/amd64,linux/arm64
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
+        file: Dockerfile-client
+        provenance: false
+
+    - name: Extract Docker metadata for Server
+      id: meta-opensource-server
+      uses: docker/metadata-action@v2
+      with:
+        images: |
+          ${{ env.EULIX_REGISTRY }}/cicada-private/aonetwork-server
+        flavor: |
+          prefix=opensource-server-
+
+    - name: Build and push Docker image for Server
+      id: build-and-push-opensource-server 
+      uses: docker/build-push-action@v2
+      with:
+        context: .
+        push: ${{ github.event_name != 'pull_request' }}
+        tags: ${{ steps.meta-opensource-server.outputs.tags }}
+        labels: ${{ steps.meta-opensource-server.outputs.labels }}
+        builder: ${{ steps.buildx.outputs.name }}
+        platforms: linux/amd64,linux/arm64
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
+        file: Dockerfile-server
+
+    - name: Extract Docker metadata for Client
+      id: meta-opensource-client
+      uses: docker/metadata-action@v2
+      with:
+        images: |
+          ${{ env.EULIX_REGISTRY }}/cicada-private/aonetwork-client
+        flavor: |
+          prefix=opensource-client-
+
+    - name: Build and push Docker image for Client
+      id: build-and-push-opensource-client 
+      uses: docker/build-push-action@v2
+      with:
+        context: .
+        push: ${{ github.event_name != 'pull_request' }}
+        tags: ${{ steps.meta-opensource-client.outputs.tags }}
+        labels: ${{ steps.meta-opensource-client.outputs.labels }}
+        builder: ${{ steps.buildx.outputs.name }}
+        platforms: linux/amd64,linux/arm64
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
+        file: Dockerfile-client