diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index d2526f47e..283c6c72a 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -24,4 +24,6 @@ jobs:
       docker_file: docker/deluge.Dockerfile
       dockerhub_repo: codexstorage/deluge
       tag_latest: ${{ github.ref_name == github.event.repository.default_branch || startsWith(github.ref, 'refs/tags/') }}
+      checkout-fetch-depth: 0
+      checkout-fetch-tags: true
     secrets: inherit
diff --git a/docker/deluge.Dockerfile b/docker/deluge.Dockerfile
index 835afef05..4fff09d68 100644
--- a/docker/deluge.Dockerfile
+++ b/docker/deluge.Dockerfile
@@ -28,9 +28,15 @@ RUN conda create -y -n 'deluge' python=3.8
 RUN conda init bash
 RUN echo "conda activate deluge" > ~/.bashrc
 
-RUN conda install -y anaconda::py-boost\
-    anaconda::gxx_linux-64\
-    anaconda:openssl
+RUN if [ $(uname -m) = "aarch64" ]; then \
+      conda install -y anaconda::py-boost \
+        anaconda::gxx_linux-aarch64 \
+        anaconda:openssl; \
+    else \
+      conda install -y anaconda::py-boost \
+        anaconda::gxx_linux-64 \
+        anaconda:openssl; \
+    fi
 
 COPY . ./