diff --git a/.github/workflows/rust-cli-publish.yml b/.github/workflows/rust-cli-publish.yml
index 309909b01f..3561ed0f8c 100644
--- a/.github/workflows/rust-cli-publish.yml
+++ b/.github/workflows/rust-cli-publish.yml
@@ -50,20 +50,27 @@ jobs:
           zowex/**
           !.git
 
-  build-ubuntu-mac:
+
+  build-linux:
     name: Build
 
     needs: release
 
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
 
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, macos-latest]
+    # Need to build in container with old version of GLIBC to support RHEL 7
+    # https://kobzol.github.io/rust/ci/2021/05/07/building-rust-binaries-in-ci-that-work-with-older-glibc.html
+    container: quay.io/pypa/manylinux2014_x86_64
 
     steps:
 
+    - name: Install Rust toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: stable
+        override: true
+
     - uses: actions/download-artifact@v2
       with:
         name: repo
@@ -90,21 +97,55 @@ jobs:
       with:
         upload_url: ${{ steps.get_upload_url.outputs.upload_url }}
         asset_path: target/release/zowex.tgz
-        asset_name: "${{matrix.os}}/zowex.tgz"
+        asset_name: zowex-linux.tgz
         asset_content_type: application/octet-stream
 
 
-  build-windows:
+  build-macos:
     name: Build
 
     needs: release
 
-    runs-on: ${{ matrix.os }}
+    runs-on: macos-latest
+
+    steps:
+
+    - uses: actions/download-artifact@v2
+      with:
+        name: repo
+
+    - name: Build
+      run: cargo build --verbose --release
+
+    - name: Get Upload URL
+      id: get_upload_url
+      run: echo "::set-output name=upload_url::$(cat release_url.txt)"
+
+    - run: echo ${{ steps.get_upload_url.outputs.upload_url }}
+
+    - name: Create Archive
+      run: |
+        cd target/release
+        tar -cvzf zowex.tgz zowex
+
+    - name: Upload Release Asset
+      id: upload-release-asset
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.get_upload_url.outputs.upload_url }}
+        asset_path: target/release/zowex.tgz
+        asset_name: zowex-macos.tgz
+        asset_content_type: application/octet-stream
+
+
+  build-windows:
+    name: Build
+
+    needs: release
 
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [windows-latest]
+    runs-on: windows-latest
 
     steps:
 
@@ -134,5 +175,5 @@ jobs:
       with:
         upload_url: ${{ steps.get_upload_url.outputs.upload_url }}
         asset_path: target\release\zowex.tgz
-        asset_name: "${{matrix.os}}/zowex.tgz"
+        asset_name: zowex-windows.tgz
         asset_content_type: application/octet-stream
diff --git a/zowex/Cargo.lock b/zowex/Cargo.lock
index 0aea4334da..1d6c7fbaba 100644
--- a/zowex/Cargo.lock
+++ b/zowex/Cargo.lock
@@ -40,7 +40,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "zowex"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
  "rpassword",
 ]
diff --git a/zowex/Cargo.toml b/zowex/Cargo.toml
index 87dcf54e66..7a66c17fda 100644
--- a/zowex/Cargo.toml
+++ b/zowex/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zowex"
-version = "0.2.0"
+version = "0.2.1"
 authors = ["Zowe Project"]
 edition = "2018"