diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 985dd7e96..2e6c1760b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,7 +32,8 @@ jobs:
           go-version-file: ./go.mod
 
       - name: Install Ziti CI
-        uses: openziti/ziti-ci@v1
+        # uses: openziti/ziti-ci@v1
+        uses: qrkourier/ziti-ci@v1
 
       - name: Build and Test
         shell: bash
@@ -65,13 +66,14 @@ jobs:
           go-version-file: ./go.mod
 
       - name: Install Ziti CI
-        uses: openziti/ziti-ci@v1
+        # uses: openziti/ziti-ci@v1
+        uses: qrkourier/ziti-ci@v1
 
       - name: Build and Test
         shell: bash
         run: |
           go install github.com/mitchellh/gox@latest
-          $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q -t go-build-flags)" -cgo -os=windows -arch=amd64 -output=$GOX_OUTPUT ./ziti/
+          $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q go-build-flags -n)" -cgo -os=windows -arch=amd64 -output=$GOX_OUTPUT ./ziti/
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
@@ -95,21 +97,20 @@ jobs:
           go-version-file: ./go.mod
 
       - name: Install Ziti CI
-        uses: openziti/ziti-ci@v1
+        # uses: openziti/ziti-ci@v1
+        uses: qrkourier/ziti-ci@v1
 
       - name: Build and Test
         shell: bash
         run: |
           sudo apt-get update
           sudo apt-get -yq install gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf gcc-aarch64-linux-gnu
-          $(go env GOPATH)/bin/ziti-ci configure-git
           go install github.com/mitchellh/gox@latest
-          $(go env GOPATH)/bin/ziti-ci -t go-build-flags
-          $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q -t go-build-flags)" -cgo -os=linux -arch=amd64 -output=$GOX_OUTPUT ./ziti/
+          $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q go-build-flags -n)" -cgo -os=linux -arch=amd64 -output=$GOX_OUTPUT ./...
           CC=arm-linux-gnueabihf-gcc \
-          $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q -t go-build-flags)" -cgo -os=linux -arch=arm -output=$GOX_OUTPUT ./ziti/
+          $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q go-build-flags -n)" -cgo -os=linux -arch=arm -output=$GOX_OUTPUT ./...
           CC=aarch64-linux-gnu-gcc \
-          $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q -t go-build-flags)" -cgo -os=linux -arch=arm64 -output=$GOX_OUTPUT ./ziti/
+          $(go env GOPATH)/bin/gox -ldflags "$($(go env GOPATH)/bin/ziti-ci -q go-build-flags -n)" -cgo -os=linux -arch=arm64 -output=$GOX_OUTPUT ./...
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
@@ -133,7 +134,8 @@ jobs:
           go-version-file: ./go.mod
 
       - name: Install Ziti CI
-        uses: openziti/ziti-ci@v1
+        # uses: openziti/ziti-ci@v1
+        uses: qrkourier/ziti-ci@v1
 
       - name: Run Go Quickstart Test
         timeout-minutes: 5
@@ -180,7 +182,8 @@ jobs:
           python-version: '3.7'
 
       - name: Install Ziti CI
-        uses: openziti/ziti-ci@v1
+        # uses: openziti/ziti-ci@v1
+        uses: qrkourier/ziti-ci@v1
 
       - name: Download linux release artifact
         uses: actions/download-artifact@v4