diff --git a/.github/workflows/backup-org.yml b/.github/workflows/backup-org.yml
index 80131fa..c58293d 100644
--- a/.github/workflows/backup-org.yml
+++ b/.github/workflows/backup-org.yml
@@ -1,27 +1,45 @@
 name: Backup org
 
 on:
-  workflow_dispatch:    
-#  schedule:
-    # At 04:05 everyday
+  workflow_dispatch:
+  #  schedule:
+  # At 04:05 everyday
 #    - cron:  '45 4 * * *'
 
 jobs:
   org-migration-backupto-s3:
     runs-on: ubuntu-latest
+
     steps:
-      - name: Get GitHub User Data
-        uses: docker://ghcr.io/amitsaha/gitbackup:latest
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITBACKUP_TOKEN}}
-        with:
-          args: -service github -github.createUserMigration -ignore-fork -github.repoType owner -dir .
-      
+      - name: Download gitbackup binary
+        run: curl -L -o gitbackup.tar.gz https://github.com/amitsaha/gitbackup/releases/download/v1.1/gitbackup_Linux_x86_64.tar.gz
+
+      - name: Extract
+        run: tar -xzf gitbackup.tar.gz
 
-      - name: Push to S3
+      - name: Make executable
+        run: chmod +x gitbackup
+
+      - name: Run backup
         env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID}}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_KEY}}
-          AWS_DEFAULT_REGION: 'ap-southeast-2'
+          GITHUB_TOKEN: ${{ secrets.GITBACKUP_TOKEN }}
         run: |
-          aws s3 cp github.com/. s3://gitbackup-echorand/ --recursive --include "*.tar.gz"
+          ./gitbackup \
+            -service github \
+            -github.createUserMigration \
+            -ignore-fork \
+            -github.repoType owner \
+            --github.namespaceWhitelist code16 \
+            --backupdir /tmp/backup
+
+#      - name: Install AWS CLI
+#        run: |
+#          apt-get update && apt-get install -y awscli
+#
+#      - name: Upload to S3
+#        env:
+#          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+#          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_KEY }}
+#          AWS_DEFAULT_REGION: ap-southeast-2
+#        run: |
+#          aws s3 cp /backup s3://gitbackup-echorand/ --recursive
\ No newline at end of file