diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ab9a132..1ac8aa5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   build:
-    name: Build
+    name: Native Build
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -18,7 +18,8 @@ jobs:
         os:
           - ubuntu-latest
           - macos-latest
-          # llvm 9 build is broken on windows for now. Re-enable this when it is fixed:
+          # Build still fails on windows - sysroot path passed to compiler-rt
+          # is incorrect.
           # - windows-latest
     steps:
       - uses: actions/checkout@v1
@@ -35,6 +36,11 @@ jobs:
         if: matrix.os == 'ubuntu-latest'
       - name: Build
         run: sudo make -j4 package
+        if: matrix.os != 'windows-latest'
+      - name: Build
+        run: make -j4 package
+        shell: bash
+        if: matrix.os == 'windows-latest'
       - name: Run the testsuite
         run: make check
         if: matrix.os == 'ubuntu-latest'
@@ -42,5 +48,21 @@ jobs:
         uses: actions/upload-artifact@v1
         with:
           # Upload the dist folder. Give it a name according to the OS it was built for.
-          name: ${{ format( 'dist-{0}.tgz', matrix.os) }}
+          name: ${{ format( 'dist-{0}', matrix.os) }}
+          path: dist
+
+  dockerbuild:
+    name: Docker Build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+        with:
+          submodules: true
+      - name: Run docker_build script
+        run: ./docker_build.sh
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v1
+        with:
+          # Upload the dist folder. Give it a name according to the OS it was built for.
+          name: dist-debian-stretch
           path: dist
diff --git a/deb_from_installation.sh b/deb_from_installation.sh
index 5858306..5576eda 100755
--- a/deb_from_installation.sh
+++ b/deb_from_installation.sh
@@ -17,5 +17,5 @@ mkdir -p build/pkg/opt
 mkdir -p build/pkg/DEBIAN
 sed -e s/VERSION/$VERSION/ wasi-sdk.control > build/pkg/DEBIAN/control
 cp -R /opt/wasi-sdk build/pkg/opt/
-cd build && dpkg-deb -b pkg wasi-sdk_$VERSION\_amd64.deb
-mv build/wasi-sdk_$VERSION\amd64.deb $OUTDIR/
+cd build && dpkg-deb -b pkg wasi-sdk_$VERSION\_amd64.deb && cd ..
+mv build/wasi-sdk_$VERSION\_amd64.deb $OUTDIR/