diff --git a/.github/workflows/1_dev.yml b/.github/workflows/1_dev.yml
index 875f89c6..0fa20664 100644
--- a/.github/workflows/1_dev.yml
+++ b/.github/workflows/1_dev.yml
@@ -143,7 +143,7 @@ jobs:
         if: matrix.platform == 'darwin'
         run: |
           cd build
-          mv statping-darwin-10.6-${{ matrix.arch }} statping
+          mv statping-darwin-10.12-${{ matrix.arch }} statping
           chmod +x statping
           tar -czvf statping-darwin-${{ matrix.arch }}.tar.gz statping
           rm -rf statping
diff --git a/.github/workflows/2_unstable.yml b/.github/workflows/2_unstable.yml
index b927f7bb..c9a18933 100644
--- a/.github/workflows/2_unstable.yml
+++ b/.github/workflows/2_unstable.yml
@@ -61,11 +61,11 @@ jobs:
       matrix:
         platform: [linux]
         arch: [386, amd64, arm-7, arm-6, arm64]
-#        include:
-#          - platform: darwin
-#            arch: amd64
-#          - platform: windows
-#            arch: amd64
+        include:
+          - platform: darwin
+            arch: amd64
+          - platform: windows
+            arch: amd64
 
     steps:
       - uses: actions/checkout@v2
@@ -88,17 +88,17 @@ jobs:
           echo "XGO_TAGS=netgo osusergo linux sqlite_omit_load_extension" >> $GITHUB_ENV
         shell: bash
 
-#      - name: Set Darwin Build Flags
-#        if: matrix.platform == 'darwin'
-#        run: echo "XGO_TAGS=netgo osusergo darwin sqlite_omit_load_extension" >> $GITHUB_ENV
-#        shell: bash
+      - name: Set Darwin Build Flags
+        if: matrix.platform == 'darwin'
+        run: echo "XGO_TAGS=netgo osusergo darwin sqlite_omit_load_extension" >> $GITHUB_ENV
+        shell: bash
 
- #     - name: Set Windows Build Flags
- #       if: matrix.platform == 'windows'
- #       run: |
- #         echo "BUILD_FLAGS=-extldflags -static" >> $GITHUB_ENV
- #         echo "XGO_TAGS=netgo osusergo sqlite_omit_load_extension" >> $GITHUB_ENV
- #       shell: bash
+      - name: Set Windows Build Flags
+        if: matrix.platform == 'windows'
+        run: |
+          echo "BUILD_FLAGS=-extldflags -static -buildmode=exe" >> $GITHUB_ENV
+          echo "XGO_TAGS=netgo osusergo sqlite_omit_load_extension" >> $GITHUB_ENV
+        shell: bash
 
       - name: Build ${{ matrix.platform }}/${{ matrix.arch }}
         uses: crazy-max/ghaction-xgo@v1
@@ -128,25 +128,25 @@ jobs:
           rm -rf statping
           echo "compressed=statping-linux-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV
 
-#      - name: Compress Windows Builds
-#        if: matrix.platform == 'windows'
-#        run: |
-#          cd build
-#          mv statping-windows-4.0-${{ matrix.arch }}.exe statping.exe
-#          chmod +x statping.exe
-#          zip statping-windows-${{ matrix.arch }}.zip statping.exe
-#          rm -rf statping.exe
-#          echo "compressed=statping-windows-${{ matrix.arch }}.zip" >> $GITHUB_ENV
+      - name: Compress Windows Builds
+        if: matrix.platform == 'windows'
+        run: |
+          cd build
+          mv statping-windows-4.0-${{ matrix.arch }}.exe statping.exe
+          chmod +x statping.exe
+          zip statping-windows-${{ matrix.arch }}.zip statping.exe
+          rm -rf statping.exe
+          echo "compressed=statping-windows-${{ matrix.arch }}.zip" >> $GITHUB_ENV
 
-#      - name: Compress Darwin Builds
-#        if: matrix.platform == 'darwin'
-#        run: |
-#          cd build
-#          mv statping-darwin-10.6-${{ matrix.arch }} statping
-#          chmod +x statping
-#          tar -czvf statping-darwin-${{ matrix.arch }}.tar.gz statping
-#          rm -rf statping
-#          echo "compressed=statping-darwin-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV
+      - name: Compress Darwin Builds
+        if: matrix.platform == 'darwin'
+        run: |
+          cd build
+          mv statping-darwin-10.12-${{ matrix.arch }} statping
+          chmod +x statping
+          tar -czvf statping-darwin-${{ matrix.arch }}.tar.gz statping
+          rm -rf statping
+          echo "compressed=statping-darwin-${{ matrix.arch }}.tar.gz" >> $GITHUB_ENV
 
       - name: Upload Compiled Statping Binary
         uses: actions/upload-artifact@v1