diff --git a/.github/workflows/docker-pr.yml b/.github/workflows/docker-pr.yml
index b2dfbe3..d66a2b2 100644
--- a/.github/workflows/docker-pr.yml
+++ b/.github/workflows/docker-pr.yml
@@ -23,5 +23,16 @@ jobs:
           name: "version.json"
           json: '{"type": "docker", "tag": "nightly", "commit": "${{ steps.vars.outputs.sha_short }}", "date": "${{ steps.date.outputs.date }}"}'
           dir: 'backend/'
-      - name: Build docker images
-        run: docker build . -t tzahi12345/youtubedl-material:nightly-pr
\ No newline at end of file
+      - name: setup platform emulator
+        uses: docker/setup-qemu-action@v1
+      - name: setup multi-arch docker build
+        uses: docker/setup-buildx-action@v1
+      - name: build & push images
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64,linux/arm,linux/arm64/v8
+          #platforms: linux/amd64
+          push: false
+          tags: tzahi12345/youtubedl-material:nightly-pr
\ No newline at end of file
diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
index 3fd1716..e8dfea9 100644
--- a/.github/workflows/docker-release.yml
+++ b/.github/workflows/docker-release.yml
@@ -84,3 +84,5 @@ jobs:
           push: true
           tags: ${{ steps.docker-meta.outputs.tags }}
           labels: ${{ steps.docker-meta.outputs.labels }}
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index e683353..5aa3f55 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -84,3 +84,6 @@ jobs:
           push: true
           tags: ${{ steps.docker-meta.outputs.tags }}
           labels: ${{ steps.docker-meta.outputs.labels }}
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
diff --git a/Dockerfile b/Dockerfile
index b8a53de..856b58d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -53,7 +53,7 @@ FROM base as python
 WORKDIR /app
 COPY docker-utils/GetTwitchDownloader.py .
 RUN apt update && \
-    apt install -y --no-install-recommends python3-minimal python-is-python3 python3-pip && \
+    apt install -y --no-install-recommends python3-minimal python-is-python3 python3-pip python3.8-dev build-essential && \
     apt clean && \
     rm -rf /var/lib/apt/lists/*
 RUN pip install PyGithub requests
diff --git a/docker-utils/GetTwitchDownloader.py b/docker-utils/GetTwitchDownloader.py
index e236942..d32beb1 100644
--- a/docker-utils/GetTwitchDownloader.py
+++ b/docker-utils/GetTwitchDownloader.py
@@ -26,7 +26,8 @@ def getZipName():
 
 def getLatestFileInRepo(repo, search_string):
     # Create an unauthenticated instance of the Github object
-    g = Github(os.environ.get('GH_TOKEN'))
+    gh_token = os.environ.get('GH_TOKEN')
+    g = Github(gh_token if gh_token else None) # ensure it's none if it's falsy
 
     # Replace with the repository owner and name
     repo = g.get_repo(repo)