diff --git a/.github/workflows/docker-hub.yml b/.github/workflows/docker-hub.yml
index 84745f7b2..0322866d7 100644
--- a/.github/workflows/docker-hub.yml
+++ b/.github/workflows/docker-hub.yml
@@ -7,7 +7,8 @@ on:
     types: [published]
 
 env:
-  DOCKER_HUB_USER: matrixdotorg
+  DOCKER_NAMESPACE: matrixdotorg
+  DOCKER_HUB_USER: dendritegithub
   PLATFORMS: linux/amd64,linux/arm64,linux/arm/v7
 
 jobs:
@@ -37,8 +38,8 @@ jobs:
           platforms: ${{ env.PLATFORMS }}
           push: true
           tags: |
-            ${{ env.DOCKER_HUB_USER }}/dendrite-monolith:latest
-            ${{ env.DOCKER_HUB_USER }}/dendrite-monolith:${{ env.RELEASE_VERSION }}
+            ${{ env.DOCKER_NAMESPACE }}/dendrite-monolith:latest
+            ${{ env.DOCKER_NAMESPACE }}/dendrite-monolith:${{ env.RELEASE_VERSION }}
 
   Polylith:
     runs-on: ubuntu-latest
@@ -66,5 +67,5 @@ jobs:
           platforms: ${{ env.PLATFORMS }}
           push: true
           tags: |
-            ${{ env.DOCKER_HUB_USER }}/dendrite-polylith:latest
-            ${{ env.DOCKER_HUB_USER }}/dendrite-polylith:${{ env.RELEASE_VERSION }}
+            ${{ env.DOCKER_NAMESPACE }}/dendrite-polylith:latest
+            ${{ env.DOCKER_NAMESPACE }}/dendrite-polylith:${{ env.RELEASE_VERSION }}
diff --git a/build.sh b/build.sh
index 97e5f4e58..3a2053a0e 100755
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -eu
 
 # Put installed packages into ./bin
-mkdir "./bin/"
+export GOBIN=$PWD/`dirname $0`/bin
 
 if [ -d ".git" ] 
 then
@@ -17,6 +17,8 @@ else
     export FLAGS=""
 fi
 
-CGO_ENABLED=1 go build -trimpath -ldflags "$FLAGS" -v -o "./bin/" ./cmd/...
+mkdir -p bin
 
-CGO_ENABLED=0 GOOS=js GOARCH=wasm go build -trimpath -ldflags "$FLAGS" -o bin/main.wasm ./cmd/dendritejs
+CGO_ENABLED=1 go build -trimpath -ldflags "$FLAGS" -v -o "bin/" ./cmd/...
+
+CGO_ENABLED=0 GOOS=js GOARCH=wasm go build -trimpath -ldflags "$FLAGS" -o bin/main.wasm ./cmd/dendritejs
\ No newline at end of file