diff --git a/build.sh b/build.sh
index 1971b4bc..dd3bd76f 100755
--- a/build.sh
+++ b/build.sh
@@ -18,6 +18,7 @@ OMR_HOST=${OMR_HOST:-$(curl -sS ifconfig.co)}
 OMR_PORT=${OMR_PORT:-8000}
 OMR_REPO=${OMR_REPO:-http://$OMR_HOST:$OMR_PORT/$OMR_PATH}
 OMR_KEEPBIN=${OMR_KEEPBIN:-no}
+OMR_IMG=${OMR_IMG:-no}
 OMR_UEFI=${OMR_UEFI:-yes}
 OMR_TARGET=${OMR_TARGET:-x86_64}
 OMR_TARGET_CONFIG="config-$OMR_TARGET"
@@ -77,6 +78,11 @@ CONFIG_VERSION_CODE="$(git -C "$OMR_FEED" describe --tag --always)"
 CONFIG_PACKAGE_${OMR_DIST}-full=y
 EOF
 
+if [ "$OMR_IMG" = "yes" ] && [ "$OMR_TARGET" = "x86_64" ]; then 
+	echo 'CONFIG_VDI_IMAGES=y' >> source/.config
+	echo 'CONFIG_VMDK_IMAGES=y' >> source/.config
+fi
+
 echo "Building $OMR_DIST for the target $OMR_TARGET"
 
 cd source
diff --git a/circle.yml b/circle.yml
index 4c463d13..b943b8c2 100644
--- a/circle.yml
+++ b/circle.yml
@@ -7,12 +7,12 @@ dependencies:
     override:
         - sudo apt-get update
         - sudo apt-get install -yq build-essential git unzip ncurses-dev libz-dev libssl-dev python subversion gettext gawk wget curl rsync perl
-        - sh build.sh prepare {tools,toolchain}/install -j4 :
+        - sh build.sh prepare {tools,toolchain}/install -j2 :
             environment:
                 OMR_TARGET: x86_64
                 OMR_KEEPBIN: yes
             timeout: 7200
-        - sh build.sh prepare {tools,toolchain}/install -j4 :
+        - sh build.sh prepare {tools,toolchain}/install -j2 :
             environment:
                 OMR_TARGET: rpi3
                 OMR_KEEPBIN: yes
@@ -23,23 +23,23 @@ dependencies:
 
 compile:
     override:
-        - sh build.sh package/{compile,install,preconfig,index} -j4 :
+        - sh build.sh package/{compile,install,preconfig,index} -j2 :
             timeout: 7200
             environment:
                 OMR_TARGET: x86_64
                 OMR_KEEPBIN: yes
-        - make -C source target/install -j4 :
+        - make -C source target/install -j2 :
             timeout: 7200
-        - sh build.sh package/{compile,install,preconfig,index} -j4 :
+        - sh build.sh package/{compile,install,preconfig,index} -j2 :
             timeout: 7200
             environment:
                 OMR_TARGET: rpi3
                 OMR_KEEPBIN: yes
-        - make -C source target/compile -j4 :
+        - make -C source target/compile -j2 :
             timeout: 7200
-        - make -C source package/compile -j4 :
+        - make -C source package/compile -j2 :
             timeout: 7200
-        - make -C source target/install -j4 :
+        - make -C source target/install -j2 :
             timeout: 7200
 
 test: