diff --git a/Dockerfile b/Dockerfile
index e7cb807..529c581 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ RUN \
   mkdir -p \
     /root-layer && \
   CALIBRE_RELEASE=$(curl -sX GET "https://api.github.com/repos/kovidgoyal/calibre/releases/latest" \
-  | awk '/tag_name/{print $4;exit}' FS='[""]' | sed 's/^v//g') && \
+  | awk '/tag_name/{print $4;exit}' FS='[""]') && \
   echo $CALIBRE_RELEASE > /root-layer/CALIBRE_RELEASE
 
 # copy local files
diff --git a/root/etc/cont-init.d/98-calibre b/root/etc/cont-init.d/98-calibre
index 5ed0a5a..cd9d71f 100644
--- a/root/etc/cont-init.d/98-calibre
+++ b/root/etc/cont-init.d/98-calibre
@@ -61,7 +61,7 @@ fi
 echo "**** Fetching calibre bin ****" 
 if [ -z ${CALIBRE_RELEASE+x} ]; then
     CALIBRE_RELEASE=$(curl -sX GET "https://api.github.com/repos/kovidgoyal/calibre/releases/latest" \
-    | awk '/tag_name/{print $4;exit}' FS='[""]' | sed 's/^v//g'); \
+    | awk '/tag_name/{print $4;exit}' FS='[""]'); \
 fi 
 
 mkdir -p \
@@ -70,13 +70,13 @@ mkdir -p \
 if [ "$(uname -m)" == "x86_64" ]; then
     curl -o \
         /tmp/calibre.txz -L \
-        "https://download.calibre-ebook.com/${CALIBRE_RELEASE}/calibre-${CALIBRE_RELEASE}-x86_64.txz"
+        "https://github.com/kovidgoyal/calibre/releases/download/${CALIBRE_RELEASE}/calibre-${CALIBRE_RELEASE:1}-x86_64.txz"
 fi
 
 if [ "$(uname -m)" == "aarch64" ]; then
     curl -o \
         /tmp/calibre.txz -L \
-        "https://download.calibre-ebook.com/${CALIBRE_RELEASE}/calibre-${CALIBRE_RELEASE}-arm64.txz"
+        "https://github.com/kovidgoyal/calibre/releases/download/${CALIBRE_RELEASE}/calibre-${CALIBRE_RELEASE:1}-arm64.txz"
 fi
 
 tar xf \