diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index e9ded1a80..5beaeb446 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -4,7 +4,6 @@ on:
     branches:
       - 'develop'
       - 'main'
-      - 'feature/versioning'
 jobs:
   docker:
     runs-on: ubuntu-latest
@@ -65,14 +64,14 @@ jobs:
             BUILD_TIMESTAMP=${{ steps.version_parameters.outputs.build_timestamp }}
             GIT_BRANCH=${{ steps.version_parameters.outputs.branch }}
             COMMIT_HASH=${{ github.sha }}
-#      - name: Build and Push CLI
-#        run: make push-cli SEM_VER='${{ steps.versioning.outputs.version }}' BUILD_TIMESTAMP='${{ steps.version_parameters.outputs.build_timestamp }}'
-#      - name: publish
-#        uses: ncipollo/release-action@v1
-#        with:
-#          token: ${{ secrets.GITHUB_TOKEN }}
-#          artifacts: "cli/bin/*"
-#          commit: ${{ steps.version_parameters.outputs.branch }}
-#          tag: ${{ steps.versioning.outputs.version }}
-#          prerelease: ${{ github.ref != 'refs/heads/main' }}
-#          bodyFile: 'cli/bin/README.md'
+      - name: Build and Push CLI
+        run: make push-cli SEM_VER='${{ steps.versioning.outputs.version }}' BUILD_TIMESTAMP='${{ steps.version_parameters.outputs.build_timestamp }}'
+      - name: publish
+        uses: ncipollo/release-action@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          artifacts: "cli/bin/*"
+          commit: ${{ steps.version_parameters.outputs.branch }}
+          tag: ${{ steps.versioning.outputs.version }}
+          prerelease: ${{ github.ref != 'refs/heads/main' }}
+          bodyFile: 'cli/bin/README.md'
diff --git a/Dockerfile b/Dockerfile
index fb93556af..0fa90f951 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,10 +33,10 @@ COPY shared ../shared
 COPY tap ../tap
 COPY api .
 RUN go build -ldflags="-s -w \
-     -X 'mizuserver/version.GitCommitHash=${COMMIT_HASH}' \
-     -X 'mizuserver/version.Branch=${GIT_BRANCH}' \
-     -X 'mizuserver/version.BuildTimestamp=${BUILD_TIMESTAMP}' \
-     -X 'mizuserver/version.SemVer=${SEM_VER}'" -o mizuagent .
+     -X 'mizuserver/pkg/version.GitCommitHash=${COMMIT_HASH}' \
+     -X 'mizuserver/pkg/version.Branch=${GIT_BRANCH}' \
+     -X 'mizuserver/pkg/version.BuildTimestamp=${BUILD_TIMESTAMP}' \
+     -X 'mizuserver/pkg/version.SemVer=${SEM_VER}'" -o mizuagent .
 
 
 FROM alpine:3.13.5
diff --git a/build-push-featurebranch.sh b/build-push-featurebranch.sh
index 01089010e..5fbf32619 100755
--- a/build-push-featurebranch.sh
+++ b/build-push-featurebranch.sh
@@ -14,7 +14,7 @@ then
 fi
 
 echo "building $DOCKER_TAGGED_BUILD"
-docker build -t "$DOCKER_TAGGED_BUILD" .
+docker build -t "$DOCKER_TAGGED_BUILD" --build-arg SEM_VER=${SEM_VER} --build-arg BUILD_TIMESTAMP=${BUILD_TIMESTAMP} --build-arg GIT_BRANCH=${GIT_BRANCH} --build-arg COMMIT_HASH=${COMMIT_HASH} .
 
 echo pushing to "$REPOSITORY"
 docker push "$DOCKER_TAGGED_BUILD"