diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5b457ad..d8c1bea 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,8 +2,7 @@ shared: &shared
   docker:
     - image: docker:stable-git
   environment:
-    IMAGE_USER: lmmsci
-    IMAGE_PREFIX: ""
+    UBUNTU_VERSION: "18.04"
   steps:
     - checkout
     - setup_remote_docker:
@@ -11,40 +10,55 @@ shared: &shared
     - run:
         name: Build image
         command: |
-          ./build-image.sh $CIRCLE_JOB 18.04
+          ./build-image.sh $CIRCLE_JOB
         environment:
-          DOCKER_ARGS: "--build-arg UBUNTU_VERSION=18.04"
+          IMAGE_USER: lmmsci
+          IMAGE_PREFIX: ""
+
+xenial: &xenial
+  <<: *shared
+  environment:
+    UBUNTU_VERSION: "xenial"
 version: 2
 jobs:
-  base:
-    <<: *shared
-  linux:
-    <<: *shared
+  base:xenial:
+    <<: *xenial
+  linux:xenial:
+    <<: *xenial
   linux.gcc:
+    <<: *xenial
+
+  base:18.04:
     <<: *shared
-  linux.mingw:
+  linux:18.04:
     <<: *shared
-  linux.mingw32:
+  linux.mingw:18.04:
     <<: *shared
-  linux.mingw64:
+  linux.mingw32:18.04:
+    <<: *shared
+  linux.mingw64:18.04:
     <<: *shared
 workflows:
   version: 2
   build_images:
     jobs:
-      - base
-      - linux:
+      - base:xenial
+      - linux:xenial:
+          requires:
+            - base:xenial
+      - linux.gcc:xenial:
           requires:
-           - base
-      - linux.gcc:
+           - linux:xenial
+      - base:18.04
+      - linux:18.04:
           requires:
-           - linux
-      - linux.mingw:
+           - base:18.04
+      - linux.mingw:18.04:
           requires:
-           - base
-      - linux.mingw32:
+           - base:18.04
+      - linux.mingw32:18.04:
           requires:
-           - linux.mingw
-      - linux.mingw64:
+           - linux.mingw:18.04
+      - linux.mingw64:18.04:
           requires:
-           - linux.mingw
+           - linux.mingw:18.04
diff --git a/build-image.sh b/build-image.sh
index de9547f..86dffc3 100755
--- a/build-image.sh
+++ b/build-image.sh
@@ -1,11 +1,22 @@
 #!/usr/bin/env sh
 
-set -e
+set -e -x
+
+DOCKERFILE_AND_TAG=$1
+
+# Split DOCKERFILE_AND_TAG into $1 and $2.
+OLDIFS="$IFS"
+IFS=":"
+# shellcheck disable=SC2086
+set -- $DOCKERFILE_AND_TAG
 
 IMAGE=$IMAGE_USER/$IMAGE_PREFIX$1
 DOCKERFILE=$1
 TAG=$2
 
+# Restore the IFS
+IFS="$OLDIFS"
+
 function log() {
     echo -e "\e[35m[build-image.sh]\e[39m $@"
 }
@@ -23,7 +34,7 @@ log "Building image from Dockerfile"
 docker build            \
     --tag $IMAGE:$TAG   \
     $CACHE_FROM         \
-    $DOCKER_ARGS        \
+    --build-arg UBUNTU_VERSION="$UBUNTU_VERSION" \
     $DOCKERFILE
 
 if [ "$CIRCLE_BRANCH" = "master" ]; then
diff --git a/linux.gcc/Dockerfile b/linux.gcc/Dockerfile
index 7478672..1f7ef1c 100644
--- a/linux.gcc/Dockerfile
+++ b/linux.gcc/Dockerfile
@@ -8,4 +8,7 @@ RUN apt-get update && apt-get install -y    \
     stk                                     \
     wget                                    \
     file									\
+    # for vst
+    wine1.6                                 \
+    wine1.6-dev                             \
 && rm -rf /var/lib/apt/lists/*
diff --git a/linux/Dockerfile b/linux/Dockerfile
index a24b9de..6f69f12 100644
--- a/linux/Dockerfile
+++ b/linux/Dockerfile
@@ -24,9 +24,6 @@ RUN apt-get update -qq &&       \
         libxft-dev              \
         libxinerama-dev         \
         portaudio19-dev         \
-        libwine-dev             \
-        libwine-dev:i386        \
-        wine64-tools            \
         gcc-multilib            \
         g++-multilib            \
         qt5-default             \