diff --git a/Composer/Dockerfile b/Composer/Dockerfile
index 1d6799787e..2f7b167131 100644
--- a/Composer/Dockerfile
+++ b/Composer/Dockerfile
@@ -20,7 +20,7 @@ COPY packages/extensions/visual-designer/package.json ./packages/extensions/visu
 RUN yarn install
 
 COPY . .
-RUN yarn build
+RUN yarn build:prod
 
 # use a multi-stage build to reduce the final image size
 FROM node:10-alpine
diff --git a/Composer/package.json b/Composer/package.json
index 390123f122..5ea9195300 100644
--- a/Composer/package.json
+++ b/Composer/package.json
@@ -13,7 +13,8 @@
     "packages/lib/*"
   ],
   "scripts": {
-    "build": "yarn build:dev && yarn build:server && yarn build:client",
+    "build": "yarn build:dev",
+    "build:prod": "yarn build:lib && yarn build:extensions && yarn build:server && yarn build:client",
     "build:dev": "yarn build:lib && yarn build:extensions",
     "build:lib": "cd packages/lib && yarn build:all",
     "build:extensions": "cd packages/extensions && yarn build:all",
@@ -76,4 +77,4 @@
     "start-server-and-test": "^1.9.0",
     "wsrun": "^3.6.4"
   }
-}
+}
\ No newline at end of file
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a06afd5a54..f5227a552d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -35,8 +35,8 @@ jobs:
         versionSpec: 10.15.3
     - script: cd Composer && yarn install
       displayName: 'yarn install'
-    - script: cd Composer && yarn build
-      displayName: 'yarn build'
+    - script: cd Composer && yarn build:prod
+      displayName: 'yarn build:prod'
     - script: cd Composer && yarn lint
       displayName: 'yarn lint'
     - script: cd Composer && yarn test:coverage
@@ -68,8 +68,8 @@ jobs:
         versionSpec: 10.15.3
     - script: cd Composer && yarn install
       displayName: 'yarn install'
-    - script: cd Composer && yarn build
-      displayName: 'yarn build'
+    - script: cd Composer && yarn build:prod
+      displayName: 'yarn build:prod'
     - script: cd Composer && yarn test:integration
       displayName: yarn test:integration
       env: