diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6366b285..0b01f7ab 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -12,7 +12,7 @@ WORKDIR /source
 COPY . .
 
 RUN npm ci
-RUN npm run dist:oss:selfhost
+RUN npm run dist:bit:selfhost
 
 ###############################################
 #                 Build stage                 #
diff --git a/docker/Dockerfile-QA b/docker/Dockerfile-QA
index 6366b285..240f2ea7 100644
--- a/docker/Dockerfile-QA
+++ b/docker/Dockerfile-QA
@@ -12,7 +12,10 @@ WORKDIR /source
 COPY . .
 
 RUN npm ci
-RUN npm run dist:oss:selfhost
+# TODO: Make sure version is correct when building QA image.
+# RUN jq --arg version "$VERSION - ${GITHUB_SHA:0:7}" '.version = $version' package.json > package.json.tmp
+# RUN mv package.json.tmp package.json
+RUN npm run build:bit:qa
 
 ###############################################
 #                 Build stage                 #