diff --git a/.github/workflows/build_addon.yml b/.github/workflows/build_addon.yml
index e0a7a50..c9a7914 100644
--- a/.github/workflows/build_addon.yml
+++ b/.github/workflows/build_addon.yml
@@ -2,91 +2,90 @@ name: Build addon
 
 on:
   release:
-    types: [published]
+    types: [ published ]
   push:
   workflow_dispatch:
 
 env:
   TARGET: nextcloud_backup
-  IMAGE: "{arch}-hassio-nextcloud-backup"
-  REPOSITORY: sebclemhassaddon
+  IMAGE: "hassio-nextcloud-backup"
+  REPOSITORY: ghcr.io/sebclem
 
 
 
 jobs:
-  build-armhf:
+  build-dockers:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
-      matrix: 
-        arch: [aarch64, amd64, armv7, i386]
+      matrix:
+        arch: [ aarch64, amd64, armv7, i386 ]
     steps:
 
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v2
 
-    - name: Add Qemu-user-static ${{matrix.arch}}
-      run: docker run --rm --privileged hassioaddons/qemu-user-static:latest
+      - name: Add Qemu-user-static ${{matrix.arch}}
+        run: docker run --rm --privileged hassioaddons/qemu-user-static:latest
 
-    - name: Set up Docker Buildx ${{matrix.arch}}
-      uses: docker/setup-buildx-action@v1
+      - name: Set up Docker Buildx ${{matrix.arch}}
+        uses: docker/setup-buildx-action@v1
 
-    - name: Set Version Prod ${{matrix.arch}}
-      if: github.event_name != 'workflow_dispatch' && github.event_name != 'push'
-      run: |
-        version=${GITHUB_REF/refs\/tags\//}
-        if [ -n "$version" ];then
-          tmp=$(mktemp)
-          jq --arg version "$version" '.version=$version' ${{env.TARGET}}/config.json > "$tmp" && mv "$tmp" ${{env.TARGET}}/config.json
-        fi
-        echo "version_type=prod" >> $GITHUB_ENV
-    - name: Set Version Test ${{matrix.arch}}
-      if: github.event_name == 'workflow_dispatch' || github.event_name == 'push'
-      run: |
-        version=dev_${GITHUB_RUN_ID}
-        if [ -n "$version" ];then
-          tmp=$(mktemp)
-          jq --arg version "$version" '.version=$version' ${{env.TARGET}}/config.json > "$tmp" && mv "$tmp" ${{env.TARGET}}/config.json
-        fi
-        echo "version_type=dev" >> $GITHUB_ENV
-        
+      - name: Set Version Prod ${{matrix.arch}}
+        if: github.event_name != 'workflow_dispatch' && github.event_name != 'push'
+        run: |
+          version=${GITHUB_REF/refs\/tags\//}
+          if [ -n "$version" ];then
+            tmp=$(mktemp)
+            jq --arg version "$version" '.version=$version' ${{env.TARGET}}/config.json > "$tmp" && mv "$tmp" ${{env.TARGET}}/config.json
+          fi
+          echo "version_type=prod" >> $GITHUB_ENV
+      - name: Set Version Test ${{matrix.arch}}
+        if: github.event_name == 'workflow_dispatch' || github.event_name == 'push'
+        run: |
+          version=dev_${GITHUB_RUN_ID}
+          if [ -n "$version" ];then
+            tmp=$(mktemp)
+            jq --arg version "$version" '.version=$version' ${{env.TARGET}}/config.json > "$tmp" && mv "$tmp" ${{env.TARGET}}/config.json
+          fi
+          echo "version_type=dev" >> $GITHUB_ENV
 
-    - name: Get build option ${{matrix.arch}}
-      run: |
-        echo "NAME=$(jq --raw-output '.name // empty' "${{env.TARGET}}/config.json" | sed "s/'//g")" >> $GITHUB_ENV
-        echo "DESCRIPTION=$(jq --raw-output '.description // empty' "${{env.TARGET}}/config.json" | sed "s/'//g")" >> $GITHUB_ENV
-        echo "URL=$(jq --raw-output '.url // empty' "${{env.TARGET}}/config.json")" >> $GITHUB_ENV
-        echo "VERSION=$(jq --raw-output '.version' "${{env.TARGET}}/config.json")" >> $GITHUB_ENV
-        echo "IMAGE=$(echo "${{env.IMAGE}}" | sed -r "s/\{arch\}/${{matrix.arch}}/g")" >> $GITHUB_ENV
-        echo "BUILD_FROM=hassioaddons/base-${{matrix.arch}}:$(cat nextcloud_backup/.base_version)" >> $GITHUB_ENV
-        
-    - name: Set Tags ${{matrix.arch}}
-      run: |
-        if [ "${{env.version_type}}" != "dev" ]; then
-          echo "TAGS=${{env.REPOSITORY}}/${{env.IMAGE}}:latest, ${{env.REPOSITORY}}/${{env.IMAGE}}:$(jq --raw-output '.version' "${{env.TARGET}}/config.json")" >> $GITHUB_ENV
-        else
-          echo "TAGS=${{env.REPOSITORY}}/${{env.IMAGE}}:dev, ${{env.REPOSITORY}}/${{env.IMAGE}}:$(jq --raw-output '.version' "${{env.TARGET}}/config.json")" >> $GITHUB_ENV
-        fi
 
-    - name: Debug Env
-      run: |
-        echo ${{env.IMAGE}}
-        echo ${{env.VERSION}}
-        echo ${{env.TAGS}}
+      - name: Get build option ${{matrix.arch}}
+        run: |
+          echo "NAME=$(jq --raw-output '.name // empty' "${{env.TARGET}}/config.json" | sed "s/'//g")" >> $GITHUB_ENV
+          echo "DESCRIPTION=$(jq --raw-output '.description // empty' "${{env.TARGET}}/config.json" | sed "s/'//g")" >> $GITHUB_ENV
+          echo "URL=$(jq --raw-output '.url // empty' "${{env.TARGET}}/config.json")" >> $GITHUB_ENV
+          echo "VERSION=$(jq --raw-output '.version' "${{env.TARGET}}/config.json")" >> $GITHUB_ENV
+          echo "BUILD_FROM=hassioaddons/base-${{matrix.arch}}:$(cat nextcloud_backup/.base_version)" >> $GITHUB_ENV
 
-    - name: Login to DockerHub
-      uses: docker/login-action@v1 
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Set Tags ${{matrix.arch}}
+        run: |
+          if [ "${{env.version_type}}" != "dev" ]; then
+            echo "TAGS=${{env.REPOSITORY}}/${{env.IMAGE}}/${{matrix.arch}}:latest, ${{env.REPOSITORY}}/${{env.IMAGE}}/${{matrix.arch}}:$(jq --raw-output '.version' "${{env.TARGET}}/config.json")" >> $GITHUB_ENV
+          else
+            echo "TAGS=${{env.REPOSITORY}}/${{env.IMAGE}}/${{matrix.arch}}:dev, ${{env.REPOSITORY}}/${{env.IMAGE}}/${{matrix.arch}}:$(jq --raw-output '.version' "${{env.TARGET}}/config.json")" >> $GITHUB_ENV
+          fi
 
-    - name: Build and push ${{matrix.arch}}
-      uses: docker/build-push-action@v2
-      with:
-        push: true
-        context: ./${{env.TARGET}}
-        tags: ${{env.TAGS}}
-        labels: io.hass.name=${{env.NAME}}, io.hass.description=${{env.DESCRIPTION}}, io.hass.url=${{env.URL}}, io.hass.arch=${{matrix.arch}}, io.hass.version=${{env.VERSION}}, io.hass.type=addon
-        build-args: |
-          BUILD_FROM=${{env.BUILD_FROM}}
-          BUILD_VERSION=${{env.VERSION}}
-        file: ./${{env.TARGET}}/Dockerfile
\ No newline at end of file
+      - name: Debug Env
+        run: |
+          echo ${{env.VERSION}}
+          echo ${{env.TAGS}}
+
+      - name: Login to ghcr.io
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.CR_PAT }}
+
+      - name: Build and push ${{matrix.arch}}
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          context: ./${{env.TARGET}}
+          tags: ${{env.TAGS}}
+          labels: io.hass.name=${{env.NAME}}, io.hass.description=${{env.DESCRIPTION}}, io.hass.url=${{env.URL}}, io.hass.arch=${{matrix.arch}}, io.hass.version=${{env.VERSION}}, io.hass.type=addon
+          build-args: |
+            BUILD_FROM=${{env.BUILD_FROM}}
+            BUILD_VERSION=${{env.VERSION}}
+          file: ./${{env.TARGET}}/Dockerfile
\ No newline at end of file