diff --git a/Dockerfile b/Dockerfile
index c789cc026..5f2372695 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -159,9 +159,8 @@ COPY --from=builder /lib/libwasmvm_muslc.a /lib/libwasmvm_muslc.a
 
 # Copy runtime scripts and make them executable
 COPY --from=builder /code/scripts/test_node.sh /usr/bin/devnet
-COPY --from=builder /code/scripts/testnet-setup.sh /usr/bin/testnet-setup.sh
+COPY --from=builder /code/scripts/testnet-setup.sh /usr/bin/testnet
 COPY --from=builder /code/scripts/lib/ /usr/local/lib/sonr-scripts/
-RUN chmod +x /usr/bin/devnet /usr/bin/testnet-setup.sh /usr/local/lib/sonr-scripts/*.sh
 
 # Set up dependencies
 ENV PACKAGES="curl make bash jq sed"
diff --git a/Makefile b/Makefile
index b1f59ae6f..ee15e2e63 100644
--- a/Makefile
+++ b/Makefile
@@ -197,7 +197,7 @@ build-all: go.sum
 
 docker:
 	@gum log --level info "Building Docker images..."
-	@bash scripts/containers.sh build-all
+	@docker buildx build -t onsonr/snrd:latest -f Dockerfile .
 
 localnet: ## Cross-platform localnet (auto-detects best method for your system)
 	@bash scripts/cross_platform_localnet.sh
diff --git a/devbox.json b/devbox.json
index 7635b14c2..5a7e3b496 100644
--- a/devbox.json
+++ b/devbox.json
@@ -13,29 +13,6 @@
   "env": {},
   "shell": {
     "init_hook": [
-      "alias git-context='./scripts/github-env.sh git-context'",
-      "alias affected-scopes='./scripts/github-env.sh affected-scopes'",
-      "alias changed-scopes='./scripts/github-env.sh changed-scopes'",
-      "alias changed-scopes-diff='./scripts/github-env.sh changed-scopes-diff'",
-      "alias changed-files='./scripts/github-env.sh changed-files'",
-      "alias current-pr='./scripts/github-env.sh current-pr'",
-      "alias current-branch='./scripts/github-env.sh current-branch'",
-      "alias current-issue='./scripts/github-env.sh current-issue'",
-      "alias current-milestone='./scripts/github-env.sh current-milestone'",
-      "alias final-issue='./scripts/github-env.sh final-issue'",
-      "alias build-scopes='./scripts/github-env.sh build-scopes'",
-      "alias release-scopes='./scripts/github-env.sh release-scopes'",
-      "alias snapshot-scopes='./scripts/github-env.sh snapshot-scopes'",
-      "alias bump-scopes='./scripts/github-env.sh bump-scopes'",
-      "alias publish-scopes='./scripts/github-env.sh publish-scopes'",
-      "alias test-scopes='./scripts/github-env.sh test-scopes'",
-      "alias ai-commit='./scripts/github-env.sh ai-commit'",
-      "alias smart-commit='./scripts/github-env.sh smart-commit'",
-      "alias generate-commit='./scripts/github-env.sh generate-commit'",
-      "alias analyze-type='./scripts/github-env.sh analyze-type'",
-      "alias pr-description='./scripts/github-env.sh pr-description'",
-      "alias validate-default-branch='./scripts/github-env.sh validate-default-branch'",
-      "alias commit-summary='./scripts/github-env.sh commit-summary'",
       "go mod download"
     ],
     "scripts": {
diff --git a/scripts/lib/config.sh b/scripts/lib/config.sh
old mode 100644
new mode 100755
diff --git a/scripts/lib/env.sh b/scripts/lib/env.sh
old mode 100644
new mode 100755
diff --git a/scripts/lib/genesis.sh b/scripts/lib/genesis.sh
old mode 100644
new mode 100755
diff --git a/scripts/lib/jq_patch.sh b/scripts/lib/jq_patch.sh
old mode 100644
new mode 100755
diff --git a/scripts/lib/keys.sh b/scripts/lib/keys.sh
old mode 100644
new mode 100755
diff --git a/scripts/lib/tx.sh b/scripts/lib/tx.sh
old mode 100644
new mode 100755