diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7f021f6..2861065 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,38 +2,14 @@ name: Release
 
 on:
   push:
-    tags:
-    - '[0-9]+.[0-9]+.[0-9]+'
+    branches:
+    - test
 
 jobs:
-  create-release:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Create Release
-      id: create_release
-      uses: actions/create-release@v1.0.0
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: ${{ github.ref }}
-        release_name: Release ${{ github.ref }}
-        draft: false
-        prerelease: false
-    - name: Dump upload url to file
-      run: echo '${{ steps.create_release.outputs.upload_url }}' > upload_url
-    - name: Upload upload_url
-      uses: actions/upload-artifact@v1
-      with:
-        name: upload_url
-        path: upload_url
-
   build:
-    needs: create-release
     strategy:
       matrix:
         platform: [
-          'linux-arm',
-          'linux-arm64',
           'linux-x64',
         ]
         pair: [
@@ -42,10 +18,6 @@ jobs:
           'node:14',
         ]
         include:
-          - platform: 'linux-arm'
-            host-os: 'ubuntu-latest'
-          - platform: 'linux-arm64'
-            host-os: 'ubuntu-latest'
           - platform: 'linux-x64'
             host-os: 'ubuntu-latest'
           - pair: 'node:10'
@@ -61,14 +33,6 @@ jobs:
     runs-on: ${{ matrix.host-os }}
 
     steps:
-    - name: Download upload_url
-      uses: actions/download-artifact@v1
-      with:
-        name: upload_url
-    - name: Set upload_url
-      run: echo "UPLOAD_URL=$(cat upload_url/upload_url)" >> $GITHUB_ENV
-    - name: Set release version
-      run: echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_ENV
     - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.version }}
       uses: actions/setup-node@v4
@@ -77,23 +41,3 @@ jobs:
     - name: Build adapter
       run: |
         ./build.sh "${{ matrix.platform }}" "${{ matrix.language }}" "${{ matrix.version }}"
-    - name: Upload Release Asset
-      id: upload-release-asset
-      uses: actions/upload-release-asset@v1.0.1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ env.UPLOAD_URL }}
-        asset_path: zigbee-adapter-${{ env.RELEASE_VERSION }}-${{ matrix.platform }}-v${{ matrix.version }}.tgz
-        asset_name: zigbee-adapter-${{ env.RELEASE_VERSION }}-${{ matrix.platform }}-v${{ matrix.version }}.tgz
-        asset_content_type: application/gnutar
-    - name: Upload Release Asset Checksum
-      id: upload-release-asset-checksum
-      uses: actions/upload-release-asset@v1.0.1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ env.UPLOAD_URL }}
-        asset_path: zigbee-adapter-${{ env.RELEASE_VERSION }}-${{ matrix.platform }}-v${{ matrix.version }}.tgz.sha256sum
-        asset_name: zigbee-adapter-${{ env.RELEASE_VERSION }}-${{ matrix.platform }}-v${{ matrix.version }}.tgz.sha256sum
-        asset_content_type: text/plain
diff --git a/build.sh b/build.sh
index 4e256e9..7230cb1 100755
--- a/build.sh
+++ b/build.sh
@@ -56,7 +56,9 @@ function build_native() {
 }
 
 function build_cross_compiled() {
-  docker run --rm -t -v $PWD:/build webthingsio/toolchain-${ADDON_ARCH}-${LANGUAGE_NAME}-${LANGUAGE_VERSION} bash -c "cd /build; ADDON_ARCH=${ADDON_ARCH} ./package.sh"
+  echo $UID
+  whoami
+  docker run --rm -t --user 0 -v $PWD:/build webthingsio/toolchain-${ADDON_ARCH}-${LANGUAGE_NAME}-${LANGUAGE_VERSION} bash -c "echo $UID; cd /build; ADDON_ARCH=${ADDON_ARCH} ./package.sh"
 }
 
 case "${ADDON_ARCH}" in
diff --git a/package-lock.json b/package-lock.json
index 8f5e0a9..f467110 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -996,12 +996,12 @@
       "version": "github:WebThingsIO/dissolve-chunks#17a72ffca39639a956c55b1196f7df0c9c43f608",
       "from": "github:WebThingsIO/dissolve-chunks#moziot-changes",
       "requires": {
-        "dissolve": "github:mozilla-iot/dissolve#moziot-changes"
+        "dissolve": "github:WebThingsIO/dissolve#moziot-changes"
       },
       "dependencies": {
         "dissolve": {
-          "version": "github:mozilla-iot/dissolve#7d1018718a037d16425a0b91cfe96253b8dce1b1",
-          "from": "github:mozilla-iot/dissolve#moziot-changes",
+          "version": "github:WebThingsIO/dissolve#7d1018718a037d16425a0b91cfe96253b8dce1b1",
+          "from": "github:WebThingsIO/dissolve#moziot-changes",
           "requires": {
             "bl": "^4.0.2",
             "readable-stream": "^2.3.7"
@@ -3500,22 +3500,22 @@
       "from": "github:WebThingsIO/unpi#moziot-changes",
       "requires": {
         "concentrate": "^0.2.3",
-        "dissolve-chunks": "github:mozilla-iot/dissolve-chunks#moziot-changes"
+        "dissolve-chunks": "github:WebThingsIO/dissolve-chunks#moziot-changes"
       },
       "dependencies": {
         "dissolve": {
-          "version": "github:mozilla-iot/dissolve#7d1018718a037d16425a0b91cfe96253b8dce1b1",
-          "from": "github:mozilla-iot/dissolve#moziot-changes",
+          "version": "github:WebThingsIO/dissolve#7d1018718a037d16425a0b91cfe96253b8dce1b1",
+          "from": "github:WebThingsIO/dissolve#moziot-changes",
           "requires": {
             "bl": "^4.0.2",
             "readable-stream": "^2.3.7"
           }
         },
         "dissolve-chunks": {
-          "version": "github:mozilla-iot/dissolve-chunks#17a72ffca39639a956c55b1196f7df0c9c43f608",
-          "from": "github:mozilla-iot/dissolve-chunks#moziot-changes",
+          "version": "github:WebThingsIO/dissolve-chunks#17a72ffca39639a956c55b1196f7df0c9c43f608",
+          "from": "github:WebThingsIO/dissolve-chunks#moziot-changes",
           "requires": {
-            "dissolve": "github:mozilla-iot/dissolve#moziot-changes"
+            "dissolve": "github:WebThingsIO/dissolve#moziot-changes"
           }
         },
         "readable-stream": {
@@ -3650,24 +3650,24 @@
       "from": "github:WebThingsIO/zcl-packet#moziot-changes",
       "requires": {
         "concentrate": "^0.2.3",
-        "dissolve-chunks": "github:mozilla-iot/dissolve-chunks#moziot-changes",
+        "dissolve-chunks": "github:WebThingsIO/dissolve-chunks#moziot-changes",
         "enum": "^3.0.4",
-        "zcl-id": "github:mozilla-iot/zcl-id#moziot-changes"
+        "zcl-id": "github:WebThingsIO/zcl-id#moziot-changes"
       },
       "dependencies": {
         "dissolve": {
-          "version": "github:mozilla-iot/dissolve#7d1018718a037d16425a0b91cfe96253b8dce1b1",
-          "from": "github:mozilla-iot/dissolve#moziot-changes",
+          "version": "github:WebThingsIO/dissolve#7d1018718a037d16425a0b91cfe96253b8dce1b1",
+          "from": "github:WebThingsIO/dissolve#moziot-changes",
           "requires": {
             "bl": "^4.0.2",
             "readable-stream": "^2.3.7"
           }
         },
         "dissolve-chunks": {
-          "version": "github:mozilla-iot/dissolve-chunks#17a72ffca39639a956c55b1196f7df0c9c43f608",
-          "from": "github:mozilla-iot/dissolve-chunks#moziot-changes",
+          "version": "github:WebThingsIO/dissolve-chunks#17a72ffca39639a956c55b1196f7df0c9c43f608",
+          "from": "github:WebThingsIO/dissolve-chunks#moziot-changes",
           "requires": {
-            "dissolve": "github:mozilla-iot/dissolve#moziot-changes"
+            "dissolve": "github:WebThingsIO/dissolve#moziot-changes"
           }
         },
         "readable-stream": {
@@ -3698,8 +3698,8 @@
           }
         },
         "zcl-id": {
-          "version": "github:mozilla-iot/zcl-id#2d219d1cc299514cb73b9922685f2870a6eb6d8b",
-          "from": "github:mozilla-iot/zcl-id#moziot-changes",
+          "version": "github:WebThingsIO/zcl-id#2d219d1cc299514cb73b9922685f2870a6eb6d8b",
+          "from": "github:WebThingsIO/zcl-id#moziot-changes",
           "requires": {
             "busyman": "^0.3.0",
             "enum": "^3.0.4"
@@ -3714,12 +3714,12 @@
         "buffer-builder": "^0.2.0",
         "buffer-parser": "^0.2.0",
         "buffer-reader": "^0.1.0",
-        "zcl-id": "github:mozilla-iot/zcl-id#moziot-changes"
+        "zcl-id": "github:WebThingsIO/zcl-id#moziot-changes"
       },
       "dependencies": {
         "zcl-id": {
-          "version": "github:mozilla-iot/zcl-id#2d219d1cc299514cb73b9922685f2870a6eb6d8b",
-          "from": "github:mozilla-iot/zcl-id#moziot-changes",
+          "version": "github:WebThingsIO/zcl-id#2d219d1cc299514cb73b9922685f2870a6eb6d8b",
+          "from": "github:WebThingsIO/zcl-id#moziot-changes",
           "requires": {
             "busyman": "^0.3.0",
             "enum": "^3.0.4"
diff --git a/package.sh b/package.sh
index f70e9c2..76a113a 100755
--- a/package.sh
+++ b/package.sh
@@ -14,7 +14,7 @@ else
   TARFILE_SUFFIX="-${ADDON_ARCH}-${NODE_VERSION/\.*/}"
 fi
 
-npm ci
+npm ci --loglevel verbose
 npm run build
 npm prune --production