diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index eae4a1f73..cd418d914 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -84,6 +84,44 @@ builds:
       - "{{ .Env.STRIP_FLAGS }}"
       - "-linkmode={{ .Env.LINKMODE }}"
       - -extldflags "-lc -lrt -lpthread"
+  - id: akash-linux-amd64-static
+    binary: akash
+    main: ./cmd/akash
+    env:
+      - CC=x86_64-linux-gnu-gcc
+      - CXX=x86_64-linux-gnu-g++
+    goarch:
+      - amd64
+    goos:
+      - linux
+    flags:
+      - "-mod={{ .Env.MOD }}"
+      - "-tags=osusergo,netgo"
+      - -trimpath
+    ldflags:
+      - "{{ .Env.BUILD_VARS }}"
+      - "{{ .Env.STRIP_FLAGS }}"
+      - "-linkmode={{ .Env.LINKMODE }}"
+      - -extldflags "-lc -lrt -lpthread --static"
+  - id: akash-linux-arm64-static
+    binary: akash
+    main: ./cmd/akash
+    goarch:
+      - arm64
+    goos:
+      - linux
+    env:
+      - CC=aarch64-linux-gnu-gcc
+      - CXX=aarch64-linux-gnu-g++
+    flags:
+      - "-mod={{ .Env.MOD }}"
+      - "-tags=osusergo,netgo"
+      - -trimpath
+    ldflags:
+      - "{{ .Env.BUILD_VARS }}"
+      - "{{ .Env.STRIP_FLAGS }}"
+      - "-linkmode={{ .Env.LINKMODE }}"
+      - -extldflags "-lc -lrt -lpthread --static"
 universal_binaries:
   - id: akash-darwin-universal
     ids:
@@ -114,7 +152,16 @@ archives:
       - zip
     files:
       - none*
-
+  - id: static
+    ids:
+      - akash-linux-amd64-static
+      - akash-linux-arm64-static
+    name_template: "akash_{{ .Os }}_{{ .Arch }}_static"
+    wrap_in_directory: false
+    formats:
+      - zip
+    files:
+      - none*
 checksum:
   # You can change the name of the checksums file.
   # Default is `{{ .ProjectName }}_{{ .Version }}_checksums.txt`.
diff --git a/Makefile b/Makefile
index ac69d7041..45833489e 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ IS_STABLE             ?= false
 
 GO_LINKMODE            ?= external
 GOMOD                  ?= readonly
-BUILD_TAGS             ?= osusergo,netgo,hidraw,ledger
+BUILD_TAGS             ?= osusergo,netgo
 GORELEASER_STRIP_FLAGS ?=
 
 ifeq ($(IS_MAINNET), true)
@@ -39,6 +39,10 @@ ifneq (,$(findstring cgotrace,$(BUILD_OPTIONS)))
 	BUILD_TAGS := $(BUILD_TAGS),cgotrace
 endif
 
+ifneq (,$(findstring noledger,$(BUILD_OPTIONS)))
+	BUILD_TAGS := $(BUILD_TAGS),hidraw,ledger
+endif
+
 GORELEASER_BUILD_VARS := \
 -X github.com/cosmos/cosmos-sdk/version.Name=akash \
 -X github.com/cosmos/cosmos-sdk/version.AppName=akash \
diff --git a/make/test-upgrade.mk b/make/test-upgrade.mk
index f2e6f96d2..487dc7c7e 100644
--- a/make/test-upgrade.mk
+++ b/make/test-upgrade.mk
@@ -21,7 +21,7 @@ UPGRADE_FROM            := $(shell cat $(ROOT_DIR)/meta.json | jq -r --arg name
 GENESIS_BINARY_VERSION  := $(shell cat $(ROOT_DIR)/meta.json | jq -r --arg name $(UPGRADE_TO) '.upgrades[$$name].from_binary' | tr -d '\n')
 UPGRADE_BINARY_VERSION  ?= local
 
-SNAPSHOT_SOURCE         ?= mainnet
+SNAPSHOT_SOURCE         ?= sandbox-2
 
 ifeq ($(SNAPSHOT_SOURCE),mainnet)
 	SNAPSHOT_NETWORK    := akashnet-2