diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c53d6f5ad168101bf718b47951d8a11705d41e76..bb427eb559ce7212f80dd5fe69d34fc56c7204e9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,7 +35,9 @@ before_script:
     - make install-release
   artifacts:
     paths:
-      - bin-release/
+      - bin-release
+      - "*/bin-release"
+      - "*/lib-release"
     expire_in: 1 day
   stage: build
 
diff --git a/makefile b/makefile
index cd1a403d019b89d6de5d71a07ed3cc956269f867..e53b007e3c75fdbfa2c13aa4bc890493bacfced0 100644
--- a/makefile
+++ b/makefile
@@ -132,40 +132,30 @@ test-release:
 	done
 
 install-debug:
-	if [ ! -w $(addsuffix -debug, $(BINFOLDER)) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(addsuffix -debug, $(BINFOLDER)) $(subst /, , $(addsuffix -debug, $(BINFOLDER))) 2>/dev/null;\
-	fi;\
-	if [ -L $(subst /, , $(addsuffix -debug, $(BINFOLDER))) ]; then\
-		mkdir -p `readlink $(subst /, , $(addsuffix -debug, $(BINFOLDER)))`;\
-	else\
-		mkdir -p $(addsuffix -debug, $(BINFOLDER));\
-	fi
-	rm -rf $(addsuffix -debug, $(BINFOLDER))/*
+	mkdir -p $(addsuffix -debug, $(BINFOLDER)); \
+	rm -rf $(addsuffix -debug, $(BINFOLDER))/*; \
+	cd $(addsuffix -debug, $(BINFOLDER)); \
 	for dir in $(SUBDIRS_LIBS); do \
-		cp $$dir/lib-debug/* $(addsuffix -debug, $(BINFOLDER)); \
-	done
+		cp -rs ../$$dir/lib-debug/* .; \
+	done; \
 	for dir in $(SUBDIRS_BINS); do \
-		cp $$dir/bin-debug/* $(addsuffix -debug, $(BINFOLDER)); \
-	done
+		cp -rs ../$$dir/bin-debug/* .; \
+	done; \
+	cd ..; \
 	cp translateAddresses $(addsuffix -debug, $(BINFOLDER)); \
 	cp xmlFormat $(addsuffix -debug, $(BINFOLDER))
 
 install-release:
-	if [ ! -w $(addsuffix -release, $(BINFOLDER)) ] && [ $(USE_RAMDISK) -eq 1 ]; then\
-		ln -s /tmp/`date +'%s%N'`-$(addsuffix -release, $(BINFOLDER)) $(subst /, , $(addsuffix -release, $(BINFOLDER))) 2>/dev/null;\
-	fi;\
-	if [ -L $(subst /, , $(addsuffix -release, $(BINFOLDER))) ]; then\
-		mkdir -p `readlink $(subst /, , $(addsuffix -release, $(BINFOLDER)))`;\
-	else\
-		mkdir -p $(addsuffix -release, $(BINFOLDER));\
-	fi
-	rm -rf $(addsuffix -release, $(BINFOLDER))/*
+	mkdir -p $(addsuffix -release, $(BINFOLDER)); \
+	rm -rf $(addsuffix -release, $(BINFOLDER))/*; \
+	cd $(addsuffix -release, $(BINFOLDER)); \
 	for dir in $(SUBDIRS_LIBS); do \
-		cp $$dir/lib-release/* $(addsuffix -release, $(BINFOLDER)); \
-	done
+		cp -rs ../$$dir/lib-release/* .; \
+	done; \
 	for dir in $(SUBDIRS_BINS); do \
-		cp $$dir/bin-release/* $(addsuffix -release, $(BINFOLDER)); \
-	done
+		cp -rs ../$$dir/bin-release/* .; \
+	done; \
+	cd ..; \
 	cp translateAddresses $(addsuffix -release, $(BINFOLDER)); \
 	cp xmlFormat $(addsuffix -release, $(BINFOLDER))