diff --git a/Makefile b/Makefile
index fced65f6..938e8fe7 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ wheel: clean
 	pip3 install build
 	python3 -m build
 docker_stage: wheel
-	cp dist/*.whl docker/root/ytdl-sub.whl
+	cp dist/*.whl docker/root/
 	cp -R examples docker/root/defaults/
 docker: docker_stage
 	sudo docker build --progress=plain --no-cache -t ytdl-sub:local docker/
diff --git a/docker/Dockerfile b/docker/Dockerfile
index abde1f7c..a5b68b59 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -32,11 +32,10 @@ RUN mkdir -p /config && \
     if [[ $(uname -m) == "x86_64" ]]; then \
       echo "installing phantomjs" && \
       apk add --no-cache gcompat && \
-      cd /defaults && \
-      tar -xjvf phantomjs-2.1.1-linux-x86_64.tar.bz2 && \
-      mv /defaults/phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/share/phantomjs && \
-      rm -rf /defaults/phantomjs-2.1.1-linux-x86_64 && \
-      rm phantomjs-2.1.1-linux-x86_64.tar.bz2 && \
+      tar -xjvf /defaults/phantomjs-2.1.1-linux-x86_64.tar.bz2 && \
+      mv phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/share/phantomjs && \
+      rm -rf phantomjs-2.1.1-linux-x86_64 && \
+      rm /defaults/phantomjs-2.1.1-linux-x86_64.tar.bz2 && \
       ln -s /usr/share/phantomjs /usr/bin/phantomjs && \
       echo "Phantom JS version:" && \
       phantomjs --version && \
@@ -44,10 +43,10 @@ RUN mkdir -p /config && \
     fi && \
     echo "hi" && \
     # Install ytdl-sub, ensure it is installed properly
-    python3 -m pip install --break-system-packages --no-cache-dir ytdl-sub.whl && \
+    python3 -m pip install --break-system-packages --no-cache-dir ytdl_sub-*.whl && \
       ytdl-sub -h && \
     # Delete unneeded packages after install
-    rm ytdl-sub.whl && \
+    rm ytdl_sub-*.whl && \
     apk del \
       g++ \
       make \
diff --git a/docker/Dockerfile.gui b/docker/Dockerfile.gui
index 55446a6e..dd04e318 100644
--- a/docker/Dockerfile.gui
+++ b/docker/Dockerfile.gui
@@ -52,19 +52,18 @@ RUN mkdir -p /config && \
     # Install phantomjs if using x86_64, ensure it is properly installed
     if [[ $(uname -m) == "x86_64" ]]; then \
       echo "installing phantomjs" && \
-      cd /defaults && \
-      tar -xjvf phantomjs-2.1.1-linux-x86_64.tar.bz2 && \
-      mv /defaults/phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/bin/phantomjs && \
-      rm -rf /defaults/phantomjs-2.1.1-linux-x86_64 && \
-      rm phantomjs-2.1.1-linux-x86_64.tar.bz2 && \
+      tar -xjvf /defaults/phantomjs-2.1.1-linux-x86_64.tar.bz2 && \
+      mv phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/bin/phantomjs && \
+      rm -rf phantomjs-2.1.1-linux-x86_64 && \
+      rm /defaults/phantomjs-2.1.1-linux-x86_64.tar.bz2 && \
       echo "Phantom JS version:" && \
       phantomjs --version ; \
     fi && \
     # Install ytdl-sub, ensure it is installed properly
-    pip install --no-cache-dir --break-system-packages ytdl-sub.whl && \
+    pip install --no-cache-dir --break-system-packages ytdl_sub-*.whl && \
       ytdl-sub -h && \
     # Delete unneeded packages after install
-    rm ytdl-sub.whl && \
+    rm ytdl_sub-*.whl && \
     apt-get remove -y \
       g++ \
       make \
diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu
index da80c47f..de7dce0f 100644
--- a/docker/Dockerfile.ubuntu
+++ b/docker/Dockerfile.ubuntu
@@ -55,19 +55,18 @@ RUN mkdir -p /config && \
     # Install phantomjs if using x86_64, ensure it is properly installed
     if [[ $(uname -m) == "x86_64" ]]; then \
       echo "installing phantomjs" && \
-      cd /defaults && \
-      tar -xjvf phantomjs-2.1.1-linux-x86_64.tar.bz2 && \
-      mv /defaults/phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/bin/phantomjs && \
-      rm -rf /defaults/phantomjs-2.1.1-linux-x86_64 && \
-      rm phantomjs-2.1.1-linux-x86_64.tar.bz2 && \
+      tar -xjvf /defaults/phantomjs-2.1.1-linux-x86_64.tar.bz2 && \
+      mv phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/bin/phantomjs && \
+      rm -rf phantomjs-2.1.1-linux-x86_64 && \
+      rm /defaults/phantomjs-2.1.1-linux-x86_64.tar.bz2 && \
       echo "Phantom JS version:" && \
       phantomjs --version ; \
     fi && \
     # Install ytdl-sub, ensure it is installed properly
-    pip install --no-cache-dir --break-system-packages ytdl-sub.whl && \
+    pip install --no-cache-dir --break-system-packages ytdl_sub-*.whl && \
       ytdl-sub -h && \
     # Delete unneeded packages after install
-    rm ytdl-sub.whl && \
+    rm ytdl_sub-*.whl && \
     apt-get remove -y \
       g++ \
       make \