diff --git a/Makefile b/Makefile
index d0a9f72..b4eae56 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY : help clean veryclean fetch prune docker push build full-build update work docker-debian11 debian11 docker-mint20 mint20 docker-ubuntu20 ubuntu20 docker-ubuntu21 ubuntu21 docker-fedora34 fedora34 docker-fedora35 fedora35 docker-macos-x86_64 macos-x86_64 docker-macos-aarch64 macos-aarch64
+.PHONY : help clean veryclean prune docker push rmi build update work docker-debian11 debian11 docker-mint20 mint20 docker-ubuntu20 ubuntu20 docker-ubuntu21 ubuntu21 docker-fedora34 fedora34 docker-fedora35 fedora35 docker-macos-x86_64 macos-x86_64 docker-macos-aarch64 macos-aarch64
 
 version:=$(shell cat version)
 release:=$(shell cat release)
@@ -6,10 +6,10 @@ source_release:=$(shell cat source_release)
 
 help :
 	@echo "Use: make [help]"
-	@echo "          [docker] [push]          - building all docker images"
-	@echo "          [build] [full-build]     - building all artifacts"
+	@echo "          [docker] [push] [rmi]    - handle docker images"
+	@echo "          [build]                  - building all artifacts"
 	@echo "          [clean] [veryclean]      - cleaning up"
-	@echo "          [fetch] [update] [prune] - misc."
+	@echo "          [update] [prune]         - misc."
 	@echo ""
 	@echo "docker targets:" 
 	@echo "  [docker-debian11]"
@@ -64,34 +64,6 @@ build :
 	${MAKE} macos-aarch64
 	${MAKE} clean
 
-
-full-build :
-	${MAKE} docker-debian11
-	${MAKE} clean
-	${MAKE} debian11
-	${MAKE} docker-mint20
-	${MAKE} clean
-	${MAKE} mint20
-	${MAKE} docker-ubuntu20
-	${MAKE} clean
-	${MAKE} ubuntu20
-	${MAKE} docker-ubuntu21
-	${MAKE} clean
-	${MAKE} ubuntu21
-	${MAKE} docker-fedora34
-	${MAKE} clean
-	${MAKE} fedora34
-	${MAKE} docker-fedora35
-	${MAKE} clean
-	${MAKE} fedora35
-	${MAKE} docker-macos-x86_64
-	${MAKE} clean
-	${MAKE} macos-x86_64
-	${MAKE} docker-macos-aarch64
-	${MAKE} clean
-	${MAKE} macos-aarch64
-	${MAKE} clean
-
 push :
 	docker push librewolf/bsys5-image-debian11
 	docker push librewolf/bsys5-image-mint20
@@ -102,6 +74,16 @@ push :
 	docker push librewolf/bsys5-image-macos-x86_64
 	docker push librewolf/bsys5-image-macos-aarch64
 
+rmi :
+	docker rmi librewolf/bsys5-image-debian11
+	docker rmi librewolf/bsys5-image-mint20
+	docker rmi librewolf/bsys5-image-ubuntu20
+	docker rmi librewolf/bsys5-image-ubuntu21
+	docker rmi librewolf/bsys5-image-fedora34
+	docker rmi librewolf/bsys5-image-fedora35
+	docker rmi librewolf/bsys5-image-macos-x86_64
+	docker rmi librewolf/bsys5-image-macos-aarch64
+
 update :
 	@wget -q -O version "https://gitlab.com/librewolf-community/browser/source/-/raw/main/version"
 	@wget -q -O source_release "https://gitlab.com/librewolf-community/browser/source/-/raw/main/release"
@@ -158,13 +140,13 @@ docker-fedora34 :
 	${MAKE} -f assets/linux.mk distro=fedora34 "distro_image=fedora:34" docker
 fedora34 :
 	${MAKE} -f assets/linux.mk distro=fedora34 build
-	${MAKE} -f assets/linux.artifacts.mk distro=fedora34 artifacts-rpm
+	${MAKE} -f assets/linux.artifacts.mk fc=fc34 distro=fedora34 artifacts-rpm
 ## fedora35
 docker-fedora35 :
 	${MAKE} -f assets/linux.mk distro=fedora35 "distro_image=fedora:35" docker
 fedora35 :
 	${MAKE} -f assets/linux.mk distro=fedora35 build
-	${MAKE} -f assets/linux.artifacts.mk distro=fedora35 artifacts-rpm
+	${MAKE} -f assets/linux.artifacts.mk fc=fc35 distro=fedora35 artifacts-rpm
 
 
 #
diff --git a/assets/linux.artifacts.mk b/assets/linux.artifacts.mk
index 0d416b9..4758651 100644
--- a/assets/linux.artifacts.mk
+++ b/assets/linux.artifacts.mk
@@ -11,8 +11,37 @@ use_docker=true
 
 infile=librewolf-$(version)-$(release).en-US.$(distro)-x86_64.tar.bz2
 
+
+###### .DEB ######
+
+
+
+librewolf-$(version)-$(release).en-US.$(distro).x86_64.deb : $(infile)
+	@echo "[debug] Building DEB:"
+
 artifacts-deb : $(infile) $(infile).sha256sum
 	sha256sum -c $(infile).sha256sum
+	${MAKE} -f assets/linux.artifacts.mk distro=$(distro) librewolf-$(version)-$(release).en-US.$(distro).x86_64.deb
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+###### .RPM ######
+
+librewolf-$(version)-$(release).$(fc).x86_64.rpm : $(infile)
+	@echo "[debug] Building RPM:"
+
 artifacts-rpm : $(infile) $(infile).sha256sum
 	sha256sum -c $(infile).sha256sum
+	${MAKE} -f assets/linux.artifacts.mk fc=$(fc) distro=$(distro) librewolf-$(version)-$(release).$(fc).x86_64.rpm