diff --git a/azure-pipelines-ci.yml b/azure-pipelines-ci.yml
index 2a46e3b2d..7dc89931c 100644
--- a/azure-pipelines-ci.yml
+++ b/azure-pipelines-ci.yml
@@ -87,7 +87,9 @@ stages:
               artifactName: 'backend'
               downloadPath: $(System.DefaultWorkingDirectory)/backend
           - script: |
+              mkdir -p $(System.DefaultWorkingDirectory)/frontend/build
               mv $(System.DefaultWorkingDirectory)/frontend-build/* $(System.DefaultWorkingDirectory)/frontend/build
+              rmdir $(System.DefaultWorkingDirectory)/frontend-build/*
           - template: azure-ci/docker/qemu-build.yml@organization
             parameters:
               buildArch: '$(buildArch)'
diff --git a/azure-pipelines-edge.yml b/azure-pipelines-edge.yml
index 3a6558389..265060195 100644
--- a/azure-pipelines-edge.yml
+++ b/azure-pipelines-edge.yml
@@ -90,11 +90,9 @@ stages:
               artifactName: 'backend'
               downloadPath: $(System.DefaultWorkingDirectory)/backend
           - script: |
-              ls -al $(System.DefaultWorkingDirectory)
-              ls -al $(System.DefaultWorkingDirectory)/frontend
               mkdir -p $(System.DefaultWorkingDirectory)/frontend/build
               mv $(System.DefaultWorkingDirectory)/frontend-build/* $(System.DefaultWorkingDirectory)/frontend/build
-              ls -al $(System.DefaultWorkingDirectory)/frontend/build
+              rmdir $(System.DefaultWorkingDirectory)/frontend-build/*
           - task: Docker@2
             inputs:
               containerRegistry: 'dockerHub'
diff --git a/azure-pipelines-release.yml b/azure-pipelines-release.yml
index a9b360472..74bb6cc4e 100644
--- a/azure-pipelines-release.yml
+++ b/azure-pipelines-release.yml
@@ -79,7 +79,9 @@ stages:
               artifactName: 'backend'
               downloadPath: $(System.DefaultWorkingDirectory)/backend
           - script: |
+              mkdir -p $(System.DefaultWorkingDirectory)/frontend/build
               mv $(System.DefaultWorkingDirectory)/frontend-build/* $(System.DefaultWorkingDirectory)/frontend/build
+              rmdir $(System.DefaultWorkingDirectory)/frontend-build/*
           - task: Docker@2
             inputs:
               containerRegistry: 'dockerHub'