diff --git a/jb/project/tools/exclude_jfx_module.patch b/jb/project/tools/exclude_jfx_module.patch
new file mode 100644
index 000000000000..ba7c9b493d43
--- /dev/null
+++ b/jb/project/tools/exclude_jfx_module.patch
@@ -0,0 +1,21 @@
+Index: modules.list
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+--- modules.list	(revision 57ff1dba25206f9f078b48995aa8744e51b1dd2a)
++++ modules.list	(date 1584500341724)
+@@ -20,13 +20,6 @@
+ java.transaction.xa,
+ java.xml,
+ java.xml.crypto,
+-javafx.base,
+-javafx.controls,
+-javafx.fxml,
+-javafx.graphics,
+-javafx.media,
+-javafx.swing,
+-javafx.web,
+ jdk.accessibility,
+ jdk.aot,
+ jdk.charsets,
diff --git a/jb/project/tools/linux/scripts/mkbundles_x64.sh b/jb/project/tools/linux/scripts/mkbundles_x64.sh
index 5c3ab27ff740..d22ed3c785ab 100755
--- a/jb/project/tools/linux/scripts/mkbundles_x64.sh
+++ b/jb/project/tools/linux/scripts/mkbundles_x64.sh
@@ -4,5 +4,6 @@ JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
 script_dir=jb/project/tools/linux/scripts
-${script_dir}/mkimages_x64.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jcef"
-${script_dir}/mkimages_x64.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx"
+${script_dir}/mkimages_x64.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jcef" || exit $?
+${script_dir}/mkimages_x64.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx" || exit $?
+${script_dir}/mkimages_x64.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx_jcef" || exit $?
\ No newline at end of file
diff --git a/jb/project/tools/linux/scripts/mkimages_x64.sh b/jb/project/tools/linux/scripts/mkimages_x64.sh
index 322fed871fd6..68ecf0d12d01 100755
--- a/jb/project/tools/linux/scripts/mkimages_x64.sh
+++ b/jb/project/tools/linux/scripts/mkimages_x64.sh
@@ -26,22 +26,22 @@ function create_jbr {
 
   case "$1" in
   "${bundle_type}_lw")
-    JBR_BASE_NAME=jbr_${bundle_type}_lw-$JBSDK_VERSION
+    JBR_BASE_NAME=jbr_${bundle_type}_lw-${JBSDK_VERSION}
     grep -v "jdk.compiler\|jdk.hotspot.agent" modules.list > modules_tmp.list
     ;;
-  "jfx")
-    JBR_BASE_NAME=jbr_${bundle_type}-$JBSDK_VERSION
+  "jfx" | "jcef")
+    JBR_BASE_NAME=jbr_${bundle_type}-${JBSDK_VERSION}
     cat modules.list > modules_tmp.list
     ;;
-  "jcef")
-    JBR_BASE_NAME=jbr-$JBSDK_VERSION
+  "jfx_jcef")
+    JBR_BASE_NAME=jbr-${JBSDK_VERSION}
     cat modules.list > modules_tmp.list
     ;;
   *)
-    echo "***ERR*** bundle was not specified" && exit $?
+    echo "***ERR*** bundle was not specified" && exit 1
     ;;
   esac
-  rm -rf $BASE_DIR/$JBR_BUNDLE
+  rm -rf ${BASE_DIR}/${JBR_BUNDLE}
 
   JBR=$JBR_BASE_NAME-linux-x64-b$build_number
 
@@ -50,7 +50,7 @@ function create_jbr {
     --module-path $JSDK/jmods --no-man-pages --compress=2 \
     --add-modules $(xargs < modules_tmp.list | sed s/" "//g) --output $BASE_DIR/$JBR_BUNDLE
 
-  if [ "$bundle_type" == "jcef" ]; then
+  if [[ "$bundle_type" == *jcef* ]]; then
     cp -R $BASE_DIR/$JBR_BUNDLE $BASE_DIR/jbr
     cp -R jcef_linux_x64/* $BASE_DIR/$JBR_BUNDLE/lib || exit $?
   fi
@@ -61,24 +61,30 @@ function create_jbr {
   cp -R ${BASE_DIR}/${JBR_BUNDLE} ${BASE_DIR}/jbr
   tar -pcf $JBR.tar -C $BASE_DIR jbr || exit $?
   gzip $JBR.tar || exit $?
+  rm -rf ${BASE_DIR}/${JBR_BUNDLE}
 }
 
 JBRSDK_BASE_NAME=jbrsdk-$JBSDK_VERSION
 
-if [ "$bundle_type" == "jfx" ]; then
-  git apply -p0 < jb/project/tools/exclude_jcef_module.patch
-fi
+git checkout -- modules.list src/java.desktop/share/classes/module-info.java
+case "$bundle_type" in
+  "jfx")
+    git apply -p0 < jb/project/tools/exclude_jcef_module.patch
+    ;;
+  "jcef")
+    git apply -p0 < jb/project/tools/exclude_jfx_module.patch
+    ;;
+esac
 
 sh configure \
   --disable-warnings-as-errors \
   --with-debug-level=release \
-  --with-version-build=$JDK_BUILD_NUMBER \
   --with-version-pre= \
-  --with-version-opt=b$build_number \
+  --with-version-build=${JDK_BUILD_NUMBER} \
+  --with-version-opt=b${build_number} \
   --with-import-modules=./modular-sdk \
   --enable-cds=yes || exit $?
 
-make clean CONF=linux-x86_64-normal-server-release || exit $?
 make images CONF=linux-x86_64-normal-server-release || exit $?
 
 JSDK=build/linux-x86_64-normal-server-release/images/jdk
@@ -93,21 +99,20 @@ JBRSDK_BUNDLE=jbrsdk
 rm -rf $BASE_DIR/$JBRSDK_BUNDLE
 cp -r $JSDK $BASE_DIR/$JBRSDK_BUNDLE || exit $?
 
-if [ "$bundle_type" == "jcef" ]; then
+if [[ "$bundle_type" == *jcef* ]]; then
   cp -R jcef_linux_x64/* $BASE_DIR/$JBRSDK_BUNDLE/lib || exit $?
-
+fi
+if [ "$bundle_type" == "jfx_jcef" ]; then
   echo Creating $JBSDK.tar.gz ...
-  tar -pcf $JBSDK.tar --exclude=*.debuginfo --exclude=demo --exclude=sample --exclude=man -C $BASE_DIR $JBRSDK_BUNDLE || exit $?
+  tar -pcf $JBSDK.tar --exclude=*.debuginfo --exclude=demo --exclude=sample --exclude=man \
+    -C $BASE_DIR $JBRSDK_BUNDLE || exit $?
   gzip $JBSDK.tar || exit $?
 fi
 
 JBR_BUNDLE=jbr_${bundle_type}
 create_jbr ${bundle_type}
 
-JBR_BUNDLE=jbr_${bundle_type}_lw
-create_jbr ${bundle_type}_lw
-
-if [ "$bundle_type" == "jcef" ]; then
+if [ "$bundle_type" == "jfx_jcef" ]; then
   make test-image || exit $?
 
   JBRSDK_TEST=$JBRSDK_BASE_NAME-linux-test-x64-b$build_number
diff --git a/jb/project/tools/mac/scripts/mkbundles.sh b/jb/project/tools/mac/scripts/mkbundles.sh
index cf4212190f1f..f8c3fff67d7c 100755
--- a/jb/project/tools/mac/scripts/mkbundles.sh
+++ b/jb/project/tools/mac/scripts/mkbundles.sh
@@ -4,5 +4,6 @@ JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
 script_dir=jb/project/tools/mac/scripts
-${script_dir}/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jcef"
-${script_dir}/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx"
+${script_dir}/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jcef" || exit $?
+${script_dir}/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx" || exit $?
+${script_dir}/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx_jcef" || exit $?
diff --git a/jb/project/tools/mac/scripts/mkimages.sh b/jb/project/tools/mac/scripts/mkimages.sh
index 42b0c326b24e..8527f4a0a530 100755
--- a/jb/project/tools/mac/scripts/mkimages.sh
+++ b/jb/project/tools/mac/scripts/mkimages.sh
@@ -29,16 +29,16 @@ function create_jbr {
     JBR_BASE_NAME=jbr_${bundle_type}_lw-${JBSDK_VERSION}
     grep -v "jdk.compiler\|jdk.hotspot.agent" modules.list > modules_tmp.list
     ;;
-  "jfx")
+  "jfx" | "jcef")
     JBR_BASE_NAME=jbr_${bundle_type}-${JBSDK_VERSION}
     cat modules.list > modules_tmp.list
     ;;
-  "jcef")
+  "jfx_jcef")
     JBR_BASE_NAME=jbr-${JBSDK_VERSION}
     cat modules.list > modules_tmp.list
     ;;
   *)
-    echo "***ERR*** bundle was not specified" && exit $?
+    echo "***ERR*** bundle was not specified" && exit 1
     ;;
   esac
   rm -rf ${BASE_DIR}/${JBR_BUNDLE}
@@ -59,7 +59,7 @@ function create_jbr {
   cp -R ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/MacOS ${JRE_CONTENTS}
   cp ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Info.plist ${JRE_CONTENTS}
 
-  if [ "${bundle_type}" == "jcef" ]; then
+  if [[ "${bundle_type}" == *jcef* ]]; then
     rm -rf ${JRE_CONTENTS}/Frameworks || exit $?
     rm -rf ${JRE_CONTENTS}/Helpers    || exit $?
     cp -a jcef_mac/Frameworks ${JRE_CONTENTS} || exit $?
@@ -70,13 +70,20 @@ function create_jbr {
   rm -rf ${BASE_DIR}/jbr
   cp -R ${BASE_DIR}/${JBR_BUNDLE} ${BASE_DIR}/jbr
   COPYFILE_DISABLE=1 tar -pczf ${JBR}.tar.gz --exclude='*.dSYM' --exclude='man' -C ${BASE_DIR} jbr || exit $?
+  rm -rf ${BASE_DIR}/${JBR_BUNDLE}
 }
 
 JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
 
-if [ "${bundle_type}" == "jfx" ]; then
-  git apply -p0 < jb/project/tools/exclude_jcef_module.patch
-fi
+git checkout -- modules.list src/java.desktop/share/classes/module-info.java
+case "$bundle_type" in
+  "jfx")
+    git apply -p0 < jb/project/tools/exclude_jcef_module.patch
+    ;;
+  "jcef")
+    git apply -p0 < jb/project/tools/exclude_jfx_module.patch
+    ;;
+esac
 
 sh configure \
   --disable-warnings-as-errors \
@@ -101,11 +108,12 @@ mkdir $BASE_DIR || exit $?
 JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
 cp -a $JSDK/jdk-$JBSDK_VERSION_WITH_DOTS.jdk $BASE_DIR/$JBRSDK_BUNDLE || exit $?
 
-if [ "$bundle_type" == "jcef" ]; then
-  echo Creating $JBSDK.tar.gz ...
+if [[ "$bundle_type" == *jcef* ]]; then
   cp -a jcef_mac/Frameworks $BASE_DIR/$JBRSDK_BUNDLE/Contents/
   cp -a jcef_mac/Helpers    $BASE_DIR/$JBRSDK_BUNDLE/Contents/
-
+fi
+if [ "$bundle_type" == "jfx_jcef" ]; then
+  echo Creating $JBSDK.tar.gz ...
   COPYFILE_DISABLE=1 tar -pczf $JBSDK.tar.gz -C $BASE_DIR \
     --exclude='._*' --exclude='.DS_Store' --exclude='*~' \
     --exclude='Home/demo' --exclude='Home/man' --exclude='Home/sample' \
@@ -113,17 +121,14 @@ if [ "$bundle_type" == "jcef" ]; then
 fi
 
 JBR_BUNDLE=jbr_${bundle_type}
-create_jbr $bundle_type
+create_jbr "${bundle_type}" || exit $?
 
-JBR_BUNDLE=jbr_${bundle_type}_lw
-create_jbr "${bundle_type}_lw"
-
-if [ "$bundle_type" == "jcef" ]; then
+if [ "$bundle_type" == "jfx_jcef" ]; then
   make test-image || exit $?
 
   JBRSDK_TEST=$JBRSDK_BASE_NAME-osx-test-x64-b$build_number
 
-  echo Creating $JBSDK_TEST.tar.gz ...
+  echo Creating $JBRSDK_TEST.tar.gz ...
   COPYFILE_DISABLE=1 tar -pczf $JBRSDK_TEST.tar.gz -C build/macosx-x86_64-normal-server-release/images \
     --exclude='test/jdk/demos' test || exit $?
 fi
\ No newline at end of file
diff --git a/jb/project/tools/windows/scripts/mkbundles_x64.sh b/jb/project/tools/windows/scripts/mkbundles_x64.sh
index 6c7d124ee86c..38704d02399f 100755
--- a/jb/project/tools/windows/scripts/mkbundles_x64.sh
+++ b/jb/project/tools/windows/scripts/mkbundles_x64.sh
@@ -5,4 +5,5 @@ JDK_BUILD_NUMBER=$2
 build_number=$3
 script_dir=jb/project/tools/windows/scripts
 ${script_dir}/mkimages_x64.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jcef" || exit $?
-${script_dir}/mkimages_x64.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx" || exit $?
\ No newline at end of file
+${script_dir}/mkimages_x64.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx" || exit $?
+${script_dir}/mkimages_x64.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx_jcef" || exit $?
diff --git a/jb/project/tools/windows/scripts/mkimages_x64.sh b/jb/project/tools/windows/scripts/mkimages_x64.sh
index c509a52c0913..1d76dcb1eb91 100755
--- a/jb/project/tools/windows/scripts/mkimages_x64.sh
+++ b/jb/project/tools/windows/scripts/mkimages_x64.sh
@@ -28,14 +28,11 @@ function create_jbr {
   "${bundle_type}_lw")
     grep -v "jdk.compiler\|jdk.hotspot.agent" modules.list > modules_tmp.list
     ;;
-  "jfx")
-    cat modules.list > modules_tmp.list
-    ;;
-  "jcef")
+  "jfx" | "jcef" | "jfx_jcef")
     cat modules.list > modules_tmp.list
     ;;
   *)
-    echo "***ERR*** bundle was not specified" && exit $?
+    echo "***ERR*** bundle was not specified" && exit 1
     ;;
   esac
   rm -rf ${JBR_BUNDLE}
@@ -43,7 +40,8 @@ function create_jbr {
   ${JSDK}/bin/jlink \
     --module-path ${JSDK}/jmods --no-man-pages --compress=2 \
     --add-modules $(xargs < modules_tmp.list | sed s/" "//g) --output ${JBR_BUNDLE} || exit $?
-  if [ "${bundle_type}" == "jcef" ]; then
+  if [[ "${bundle_type}" == *jcef* ]]
+  then
     cp -R jcef_win_x64/* ${JBR_BUNDLE}/bin
   fi
   echo Modifying release info ...
@@ -53,9 +51,17 @@ function create_jbr {
 JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
 WORK_DIR=$(pwd)
 
-if [ "${bundle_type}" == "jfx" ]; then
-  git apply -p0 < jb/project/tools/exclude_jcef_module.patch
-fi
+git checkout -- modules.list src/java.desktop/share/classes/module-info.java
+case "$bundle_type" in
+  "jfx")
+    echo "Excluding jcef modules"
+    git apply -p0 < jb/project/tools/exclude_jcef_module.patch
+    ;;
+  "jcef")
+    echo "Excluding jfx modules"
+    git apply -p0 < jb/project/tools/exclude_jfx_module.patch
+    ;;
+esac
 
 PATH="/usr/local/bin:/usr/bin:${PATH}"
 ./configure \
@@ -70,12 +76,17 @@ PATH="/usr/local/bin:/usr/bin:${PATH}"
   --with-boot-jdk=${BOOT_JDK} \
   --disable-ccache \
   --enable-cds=yes || exit 1
-make clean CONF=windows-x86_64-normal-server-release || exit 1
-make LOG=info images CONF=windows-x86_64-normal-server-release test-image || exit 1
+
+if [ "$bundle_type" == "jfx_jcef" ]; then
+  make LOG=info images CONF=windows-x86_64-normal-server-release test-image || exit 1
+else
+  make LOG=info images CONF=windows-x86_64-normal-server-release || exit 1
+fi
 
 JSDK=build/windows-x86_64-normal-server-release/images/jdk
-JBSDK=${JBRSDK_BASE_NAME}-windows-x64-b${build_number}
-
+if [[ "$bundle_type" == *jcef* ]]; then
+  JBSDK=${JBRSDK_BASE_NAME}-windows-x64-b${build_number}
+fi
 BASE_DIR=build/windows-x86_64-normal-server-release/images
 JBRSDK_BUNDLE=jbrsdk
 
@@ -85,5 +96,5 @@ cp -R jcef_win_x64/* ${JBRSDK_BUNDLE}/bin
 JBR_BUNDLE=jbr_${bundle_type}
 create_jbr ${bundle_type}
 
-JBR_BUNDLE=jbr_${bundle_type}_lw
-create_jbr ${bundle_type}_lw
+#JBR_BUNDLE=jbr_${bundle_type}_lw
+#create_jbr ${bundle_type}_lw
diff --git a/jb/project/tools/windows/scripts/pack_x64.sh b/jb/project/tools/windows/scripts/pack_x64.sh
index f4fa3ade69e6..b88b6f818b6b 100755
--- a/jb/project/tools/windows/scripts/pack_x64.sh
+++ b/jb/project/tools/windows/scripts/pack_x64.sh
@@ -28,14 +28,14 @@ function pack_jbr {
   "${bundle_type}_lw")
     JBR_BASE_NAME=jbr_${bundle_type}_lw-${JBSDK_VERSION}
     ;;
-  "jfx")
+  "jfx" | "jcef")
     JBR_BASE_NAME=jbr_${bundle_type}-${JBSDK_VERSION}
     ;;
-  "jcef")
+  "jfx_jcef")
     JBR_BASE_NAME=jbr-${JBSDK_VERSION}
     ;;
   *)
-    echo "***ERR*** bundle was not specified" && exit $?
+    echo "***ERR*** bundle was not specified" && exit 1
     ;;
   esac
 
@@ -45,6 +45,7 @@ function pack_jbr {
   cp -R ${BASE_DIR}/${JBR_BUNDLE} ${BASE_DIR}/jbr
 
   /usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR jbr || exit 1
+  #rm -rf ${BASE_DIR}/${JBR_BUNDLE}
 }
 
 JBRSDK_BASE_NAME=jbrsdk-$JBSDK_VERSION
@@ -55,7 +56,7 @@ JSDK=$IMAGES_DIR/jdk
 JBSDK=$JBRSDK_BASE_NAME-windows-x64-b$build_number
 BASE_DIR=.
 
-if [ "$bundle_type" == "jcef" ]; then
+if [ "$bundle_type" == "jfx_jcef" ]; then
   JBRSDK_BUNDLE=jbrsdk
   echo Creating $JBSDK.tar.gz ...
   /usr/bin/tar -czf $JBSDK.tar.gz $JBRSDK_BUNDLE || exit 1
@@ -63,10 +64,8 @@ fi
 
 JBR_BUNDLE=jbr_${bundle_type}
 pack_jbr $bundle_type
-JBR_BUNDLE=jbr_${bundle_type}_lw
-pack_jbr ${bundle_type}_lw
 
-if [ "$bundle_type" == "jcef" ]; then
+if [ "$bundle_type" == "jfx_jcef" ]; then
   JBRSDK_TEST=$JBRSDK_BASE_NAME-windows-test-x64-b$build_number
   echo Creating $JBRSDK_TEST.tar.gz ...
   /usr/bin/tar -czf $JBRSDK_TEST.tar.gz -C $IMAGES_DIR --exclude='test/jdk/demos' test || exit 1