diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index a458a595..28547299 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -25,7 +25,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.18
+          go-version: 1.18.1
 
       - name: Check out code
         uses: actions/checkout@v2
diff --git a/.github/workflows/push_pr.yaml b/.github/workflows/push_pr.yaml
index 8ad6da4f..ce5892e2 100644
--- a/.github/workflows/push_pr.yaml
+++ b/.github/workflows/push_pr.yaml
@@ -34,7 +34,7 @@ jobs:
       - name: setup go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.18
+          go-version: 1.18.1
 
       - name: Checkout sources
         uses: actions/checkout@v2.3.4
@@ -84,7 +84,6 @@ jobs:
         uses: goreleaser/goreleaser-action@v2
         with:
           install-only: true
-          version: 1.7.0
 
       - name: Setup Prometheus Stack
         run: |
@@ -93,18 +92,19 @@ jobs:
           kubectl create ns monitoring
           helm install monitoring prometheus-community/prometheus -n monitoring
 
+      - name: Build and Install Fission CLI
+        run: |
+          make debug-vars
+          make build-fission-cli
+          sudo make install-fission-cli
+          sudo chmod +x /usr/local/bin/fission
+
       - name: Build and Install Fission
         run: |
           kubectl create ns fission
           make create-crds
           SKAFFOLD_PROFILE=kind-ci make skaffold-deploy
 
-      - name: Build and Install Fission CLI
-        run: |
-          make build-fission-cli
-          sudo make install-fission-cli
-          sudo chmod +x /usr/local/bin/fission
-
       - name: Port-forward fission components
         run: |
           kubectl port-forward svc/router 8888:80 -nfission &
diff --git a/.github/workflows/upgrade_test.yaml b/.github/workflows/upgrade_test.yaml
index 77cdba94..e77c1a0a 100644
--- a/.github/workflows/upgrade_test.yaml
+++ b/.github/workflows/upgrade_test.yaml
@@ -33,7 +33,7 @@ jobs:
     - name: Setup go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.18
+        go-version: 1.18.1
 
     - name: Checkout action sources
       uses: actions/checkout@v2.3.4
@@ -60,7 +60,6 @@ jobs:
       uses: goreleaser/goreleaser-action@v2
       with:
         install-only: true
-        version: 1.7.0
 
     - name: Setup kubectl & fetch node information
       run: |
diff --git a/Makefile b/Makefile
index edfa0412..240f6262 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,7 @@ COMMITSHA ?= $(shell git rev-parse HEAD)
 
 GOOS ?= $(shell go env GOOS)
 GOARCH ?= $(shell go env GOARCH)
+GOAMD64 ?= $(shell go env GOAMD64)
 
 FISSION-CLI-SUFFIX :=
 ifeq ($(GOOS), windows)
@@ -32,6 +33,11 @@ endif
 help:
 	@awk '/^#/{c=substr($$0,3);next}c&&/^[[:alpha:]][[:alnum:]_-]+:/{print substr($$1,1,index($$1,":")),c}1{c=0}' $(MAKEFILE_LIST) | column -s: -t
 
+print-%:
+	@echo '$*=$($*)'
+
+debug-vars: print-GOOS print-GOARCH print-GOAMD64 print-VERSION print-TIMESTAMP print-COMMITSHA print-FISSION-CLI-SUFFIX print-SKAFFOLD_PROFILE
+
 ### Static checks
 check: test-run build-fission-cli clean
 
@@ -47,10 +53,11 @@ test-run: code-checks
 
 ### Binaries
 build-fission-cli:
-	@GOOS=$(GOOS) GOARCH=$(GOARCH) GORELEASER_CURRENT_TAG=$(VERSION) goreleaser build --snapshot --rm-dist --single-target --id fission-cli
+	@GOOS=$(GOOS) GOARCH=$(GOARCH) GOAMD64=$(GOAMD64) GORELEASER_CURRENT_TAG=$(VERSION) goreleaser build --snapshot --rm-dist --single-target --id fission-cli
 
 install-fission-cli:
-	mv dist/fission-cli_$(GOOS)_$(GOARCH)/fission$(FISSION-CLI-SUFFIX) /usr/local/bin/fission
+	# TODO: Fix this hack, replace v1 with GOAMD64
+	mv dist/fission-cli_$(GOOS)_$(GOARCH)_v1/fission$(FISSION-CLI-SUFFIX) /usr/local/bin/fission
 
 ### Codegen
 codegen:
@@ -93,11 +100,11 @@ all-generators: codegen generate-crds generate-swagger-doc
 
 skaffold-prebuild:
 	@GOOS=linux GOARCH=amd64 GORELEASER_CURRENT_TAG=$(VERSION) goreleaser build --snapshot --rm-dist --single-target
-	@cp -v cmd/builder/Dockerfile.fission-builder dist/builder_linux_amd64/Dockerfile
-	@cp -v cmd/fetcher/Dockerfile.fission-fetcher dist/fetcher_linux_amd64/Dockerfile
-	@cp -v cmd/fission-bundle/Dockerfile.fission-bundle dist/fission-bundle_linux_amd64/Dockerfile
-	@cp -v cmd/reporter/Dockerfile.reporter dist/reporter_linux_amd64/Dockerfile
-	@cp -v cmd/preupgradechecks/Dockerfile.fission-preupgradechecks dist/pre-upgrade-checks_linux_amd64/Dockerfile
+	@cp -v cmd/builder/Dockerfile.fission-builder dist/builder_linux_amd64_v1/Dockerfile
+	@cp -v cmd/fetcher/Dockerfile.fission-fetcher dist/fetcher_linux_amd64_v1/Dockerfile
+	@cp -v cmd/fission-bundle/Dockerfile.fission-bundle dist/fission-bundle_linux_amd64_v1/Dockerfile
+	@cp -v cmd/reporter/Dockerfile.reporter dist/reporter_linux_amd64_v1/Dockerfile
+	@cp -v cmd/preupgradechecks/Dockerfile.fission-preupgradechecks dist/pre-upgrade-checks_linux_amd64_v1/Dockerfile
 
 skaffold-deploy: skaffold-prebuild
 	skaffold run -p $(SKAFFOLD_PROFILE)
diff --git a/skaffold.yaml b/skaffold.yaml
index b75f7786..3aec6abe 100644
--- a/skaffold.yaml
+++ b/skaffold.yaml
@@ -15,13 +15,13 @@ kind: Config
 build:
   artifacts:
   - image: fission-bundle
-    context: dist/fission-bundle_linux_amd64
+    context: dist/fission-bundle_linux_amd64_v1
   - image: fetcher
-    context: dist/fetcher_linux_amd64
+    context: dist/fetcher_linux_amd64_v1
   - image: pre-upgrade-checks
-    context: dist/pre-upgrade-checks_linux_amd64
+    context: dist/pre-upgrade-checks_linux_amd64_v1
   - image: reporter
-    context: dist/reporter_linux_amd64
+    context: dist/reporter_linux_amd64_v1
 deploy:
   helm:
     releases:
diff --git a/test/upgrade_test/fission_objects.sh b/test/upgrade_test/fission_objects.sh
index 3e814681..08be3d2a 100644
--- a/test/upgrade_test/fission_objects.sh
+++ b/test/upgrade_test/fission_objects.sh
@@ -83,11 +83,11 @@ test_fission_objects() {
 build_docker_images() {
     echo "Building new docker images"
     make skaffold-prebuild
-    doit docker build -t fission-bundle dist/fission-bundle_linux_amd64
-    doit docker build -t fetcher dist/fetcher_linux_amd64
-    doit docker build -t builder dist/builder_linux_amd64
-    doit docker build -t reporter dist/reporter_linux_amd64
-    doit docker build -t preupgradechecks dist/pre-upgrade-checks_linux_amd64
+    doit docker build -t fission-bundle dist/fission-bundle_linux_amd64_v1
+    doit docker build -t fetcher dist/fetcher_linux_amd64_v1
+    doit docker build -t builder dist/builder_linux_amd64_v1
+    doit docker build -t reporter dist/reporter_linux_amd64_v1
+    doit docker build -t preupgradechecks dist/pre-upgrade-checks_linux_amd64_v1
 }
 
 kind_image_load() {