diff --git a/.gitignore b/.gitignore
index bcbff2b..5fa8b99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
-.idea
 *.iml
-/vendor/
-/build/
-node_modules/
+.idea
 /.php-cs-fixer.cache
+/.php_cs.cache
+/build/
+/vendor/
 js/
+node_modules/
diff --git a/Makefile b/Makefile
index 55fbcef..29c117e 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ app_name=$(notdir $(CURDIR))
 build_tools_directory=$(CURDIR)/build/tools
 source_build_directory=$(CURDIR)/build/artifacts/source
 source_package_name=$(source_build_directory)/$(app_name)
-appstore_build_directory=$(CURDIR)/build/artifacts/appstore
+appstore_build_directory=$(CURDIR)/build/artifacts
 appstore_package_name=$(appstore_build_directory)/$(app_name)
 npm=$(shell which npm 2> /dev/null)
 composer=$(shell which composer 2> /dev/null)
@@ -105,21 +105,22 @@ dist: build
 source:
 	rm -rf $(source_build_directory)
 	mkdir -p $(source_build_directory)
-	tar
+	tar cvzf $(source_package_name).tar.gz \
 	--exclude-vcs \
 	--exclude="../$(app_name)/build" \
-	--exclude="../$(app_name)/node_modules" \
+	--exclude="../$(app_name)/js/node_modules" \
 	--exclude="../$(app_name)/node_modules" \
 	--exclude="../$(app_name)/*.log" \
 	--exclude="../$(app_name)/js/*.log" \
-	-cvzf $(source_package_name).tar.gz ../$(app_name)
+	../$(app_name)
 
-# Builds the source package for the app store, ignores php and js tests
+# Builds the source package for the app store, ignores php tests, js tests
+# and build related folders that are unnecessary for an appstore release
 .PHONY: appstore
 appstore:
 	rm -rf $(appstore_build_directory)
 	mkdir -p $(appstore_build_directory)
-	tar
+	tar cvzf $(appstore_package_name).tar.gz \
 	--exclude-vcs \
 	--exclude="../$(app_name)/build" \
 	--exclude="../$(app_name)/tests" \
@@ -128,6 +129,7 @@ appstore:
 	--exclude="../$(app_name)/phpunit*xml" \
 	--exclude="../$(app_name)/composer.*" \
 	--exclude="../$(app_name)/node_modules" \
+	--exclude="../$(app_name)/js/node_modules" \
 	--exclude="../$(app_name)/js/tests" \
 	--exclude="../$(app_name)/js/test" \
 	--exclude="../$(app_name)/js/*.log" \
@@ -135,16 +137,22 @@ appstore:
 	--exclude="../$(app_name)/js/bower.json" \
 	--exclude="../$(app_name)/js/karma.*" \
 	--exclude="../$(app_name)/js/protractor.*" \
-	--exclude="../$(app_name)/package*.json" \
+	--exclude="../$(app_name)/package.json" \
 	--exclude="../$(app_name)/bower.json" \
 	--exclude="../$(app_name)/karma.*" \
 	--exclude="../$(app_name)/protractor\.*" \
 	--exclude="../$(app_name)/.*" \
 	--exclude="../$(app_name)/js/.*" \
+	--exclude="../$(app_name)/webpack.config.js" \
+	--exclude="../$(app_name)/stylelint.config.js" \
+	--exclude="../$(app_name)/CHANGELOG.md" \
+	--exclude="../$(app_name)/README.md" \
+	--exclude="../$(app_name)/package-lock.json" \
+	--exclude="../$(app_name)/LICENSES" \
 	--exclude="../$(app_name)/src" \
 	--exclude="../$(app_name)/stubs" \
 	--exclude="../$(app_name)/vendor" \
-	-cvzf $(appstore_package_name).tar.gz ../$(app_name)
+	../$(app_name)
 
 # Start a nextcloud server on Docker to kickstart developement
 .PHONY: appstore
diff --git a/psalm.xml b/psalm.xml
index 7b74fb9..e55d59b 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -6,6 +6,7 @@
 		findUnusedCode="false"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns="https://getpsalm.org/schema/config"
+		xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
 >
 	<projectFiles>
 		<directory name="lib" />