diff --git a/Dockerfile b/Dockerfile
index 4f17e78..307432f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,11 +29,11 @@ RUN \
   NZBHYDRA2_VER=${NZBHYDRA2_RELEASE#v} && \
   curl -o \
     /tmp/nzbhydra2.zip -L \
-    "https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-linux.zip" && \
+    "https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-amd64-linux.zip" && \
   mkdir -p /app/nzbhydra2 && \
   unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2 && \
   chmod +x /app/nzbhydra2/nzbhydra2wrapperPy3.py && \
-  chmod +x /app/nzbhydra2/core && \
+  if [ -f /app/nzbhydra2/core ]; then chmod +x /app/nzbhydra2/core; fi && \
   echo "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
   mkdir -p /defaults && \
   curl -o \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 2964507..b4ad80b 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -29,11 +29,11 @@ RUN \
   NZBHYDRA2_VER=${NZBHYDRA2_RELEASE#v} && \
   curl -o \
     /tmp/nzbhydra2.zip -L \
-    "https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-linux.zip" && \
+    "https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-arm64-linux.zip" && \
   mkdir -p /app/nzbhydra2 && \
   unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2 && \
   chmod +x /app/nzbhydra2/nzbhydra2wrapperPy3.py && \
-  chmod +x /app/nzbhydra2/core && \
+  if [ -f /app/nzbhydra2/core ]; then chmod +x /app/nzbhydra2/core; fi && \
   echo "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
   mkdir -p /defaults && \
   curl -o \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index af8d272..0aebb76 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -29,11 +29,11 @@ RUN \
   NZBHYDRA2_VER=${NZBHYDRA2_RELEASE#v} && \
   curl -o \
     /tmp/nzbhydra2.zip -L \
-    "https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-linux.zip" && \
+    "https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-generic.zip" && \
   mkdir -p /app/nzbhydra2 && \
   unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2 && \
   chmod +x /app/nzbhydra2/nzbhydra2wrapperPy3.py && \
-  chmod +x /app/nzbhydra2/core && \
+  if [ -f /app/nzbhydra2/core ]; then chmod +x /app/nzbhydra2/core; fi && \
   echo "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
   mkdir -p /defaults && \
   curl -o \
@@ -49,7 +49,10 @@ RUN \
     /app/nzbhydra2/upstart \
     /app/nzbhydra2/rc.d \
     /app/nzbhydra2/sysv \
-    /app/nzbhydra2/systemd
+    /app/nzbhydra2/systemd \
+    /app/nzbhydra2/WindowsService \
+    /app/nzbhydra2/NZBHydra2.exe \
+    "/app/nzbhydra2/NZBHydra2 Console.exe"
 
 # copy local files
 COPY root/ /
diff --git a/README.md b/README.md
index 699cc9e..6a51264 100644
--- a/README.md
+++ b/README.md
@@ -235,6 +235,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **22.01.23:** - Update release URL for arch-specific packages.
 * **20.01.23:** - Update dependencies for v5.
 * **10.12.22:** - Bump master JRE to v17. Default mapIpToHost to false.
 * **11.09.22:** - Migrate to s6v3.
diff --git a/readme-vars.yml b/readme-vars.yml
index c172a60..42178be 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -56,6 +56,7 @@ app_setup_block: |
 # changelog
 
 changelogs:
+  - { date: "22.01.23:", desc: "Update release URL for arch-specific packages." }
   - { date: "20.01.23:", desc: "Update dependencies for v5." }
   - { date: "10.12.22:", desc: "Bump master JRE to v17. Default mapIpToHost to false." }
   - { date: "11.09.22:", desc: "Migrate to s6v3." }