diff --git a/docker/librewolf/Makefile b/docker/librewolf/Makefile
index 27debf7..d1d99d7 100644
--- a/docker/librewolf/Makefile
+++ b/docker/librewolf/Makefile
@@ -2,6 +2,7 @@
 
 all :
 
+	cp ../version .
 	cp version debian10/version && cp version debian11/version && cp version fedora/version && cp version ubuntu20/version && cp version mint20/version && cp version arch && cp version macos && cp version windows && cp version portable-linux
 
 	make -C arch
diff --git a/docker/librewolf/debian10/deb/Makefile b/docker/librewolf/debian10/deb/Makefile
index 22b9c54..957ace9 100644
--- a/docker/librewolf/debian10/deb/Makefile
+++ b/docker/librewolf/debian10/deb/Makefile
@@ -1,5 +1,5 @@
 distro = debian10
-extractor = extract5
+extractor = extract10
 docker_stage = deb-$(distro)
 version = `cat ../version`
 
diff --git a/docker/librewolf/debian11/deb/Makefile b/docker/librewolf/debian11/deb/Makefile
index 80c1c13..6d8e87a 100644
--- a/docker/librewolf/debian11/deb/Makefile
+++ b/docker/librewolf/debian11/deb/Makefile
@@ -1,5 +1,5 @@
 distro = debian11
-extractor = extract5
+extractor = extract11
 docker_stage = deb-$(distro)
 version = `cat ../version`
 
diff --git a/docker/librewolf/fedora/rpm/Dockerfile b/docker/librewolf/fedora/rpm/Dockerfile
index e42bbbb..ec56e90 100644
--- a/docker/librewolf/fedora/rpm/Dockerfile
+++ b/docker/librewolf/fedora/rpm/Dockerfile
@@ -6,7 +6,7 @@ run cp librewolf-$(cat /version).en-US.rpm.zip /artifacts
 
 run sudo dnf -y install rpm-build
 
-workdir /root
+workdir /
 copy build-rpm.sh .
 copy librewolf.spec .
 run ./build-rpm.sh
diff --git a/docker/librewolf/fedora/rpm/Makefile b/docker/librewolf/fedora/rpm/Makefile
index f5fb7ac..6a0dc64 100644
--- a/docker/librewolf/fedora/rpm/Makefile
+++ b/docker/librewolf/fedora/rpm/Makefile
@@ -30,8 +30,7 @@ artifacts/build_tag :
 	sudo docker cp $(extractor):/artifacts .
 	sudo docker rm $(extractor)
 	sudo mv -v artifacts/librewolf-$(version).en-US.rpm.zip artifacts/librewolf-$(version).en-US.$(distro).zip 
-	sudo mv -v artifacts/librewolf-$(version)-1.x86_64.fc34.rpm artifacts/librewolf-$(version).en-US.$(distro).rpm 
 	sudo chown user:user artifacts/librewolf-$(version).en-US.$(distro).zip 
-	sudo chown user:user artifacts/librewolf-$(version).en-US.$(distro).rpm
+	sudo chown user:user artifacts/librewolf-$(version)-1.fc34.x86_64.rpm
 	scp artifacts/*.rpm vps:pub/pub/librewolf
 
diff --git a/docker/librewolf/fedora/rpm/build-rpm.sh b/docker/librewolf/fedora/rpm/build-rpm.sh
index b08eebf..4b0c800 100755
--- a/docker/librewolf/fedora/rpm/build-rpm.sh
+++ b/docker/librewolf/fedora/rpm/build-rpm.sh
@@ -1,11 +1,28 @@
-version=$(cat version)
+rm -rf /WORK
+mkdir /WORK
+cd /WORK
+
+version=$(cat ../version)
+
+echo '---'
+echo "--- LibreWolf version file is: $version"
+echo '---'
+echo '--- Contents of /artifacts folder:'
+ls -la /artifacts
+echo '---'
+echo '--- Contents of /WORK folder:'
+ls -la /WORK
+echo '---'
+
+
+
 
 rm -rf rpmbuild
 mkdir -p rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
 
-sed "s/__VERSION__/$version/g" < librewolf.spec > rpmbuild/SPECS/librewolf.spec
+sed "s/__VERSION__/$version/g" < /librewolf.spec > rpmbuild/SPECS/librewolf.spec
 
-cp -v artifacts/librewolf-$version.en-US.fedora.zip rpmbuild/SOURCES/librewolf.zip
+cp -v /artifacts/librewolf-$version.en-US.rpm.zip rpmbuild/SOURCES/librewolf.zip
 cd rpmbuild/SOURCES
 
 unzip librewolf.zip
@@ -20,19 +37,25 @@ cd librewolf-$version/usr/bin
 ln -s ../share/librewolf/librewolf
 cd ../../..
 
+# Application icon
+mkdir -p librewolf-$version/usr/share/applications
+mkdir -p librewolf-$version/usr/share/icons
+cp -v librewolf-$version/usr/share/librewolf/browser/chrome/icons/default/default64.png librewolf-$version/usr/share/icons/librewolf.png
+sed "s/MYDIR/\/usr\/share\/librewolf/g" < librewolf-$version/usr/share/librewolf/start-librewolf.desktop.in > librewolf-$version/usr/share/applications/librewolf.desktop
+
+
 tar cvfz lw.tar.gz librewolf-$version
+# todo perhaps: rm -rf librwolf-$version
 
-cd librewolf-$version
-find . > ../../../lw-dir.txt
-cd ..
-
-rm -rf lw
 cd ../..
 
-rm -rf ~/rpmbuild
-cp -rv rpmbuild ~
+rm -rf $HOME/rpmbuild
+cp -rv rpmbuild $HOME
 
 # Build the package!
+echo '---'
 echo "[debug] Running rpmbuild.."
+echo '---'
+
 rpmbuild -v -bb $(pwd)/rpmbuild/SPECS/librewolf.spec
-cp -v ~/rpmbuild/RPMS/x86_64/librewolf-*.rpm artifacts
+cp -v ~/rpmbuild/RPMS/x86_64/librewolf-*.rpm /artifacts
diff --git a/docker/librewolf/fedora/rpm/librewolf.spec b/docker/librewolf/fedora/rpm/librewolf.spec
index a591f17..cec6215 100644
--- a/docker/librewolf/fedora/rpm/librewolf.spec
+++ b/docker/librewolf/fedora/rpm/librewolf.spec
@@ -64,3 +64,5 @@ cp -rv * "$RPM_BUILD_ROOT"
 /usr/share/librewolf/start-librewolf
 /usr/share/librewolf/start-librewolf.desktop.in
 /usr/bin/librewolf
+/usr/share/applications/librewolf.desktop
+/usr/share/icons/librewolf.png