diff --git a/Makefile.am b/Makefile.am
index 2625dcc..1fdd645 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -113,10 +113,10 @@ AM_CFLAGS = \
     $(NULL)
 
 sbin_PROGRAMS =
-dist_cache_DATA = packaging/installer/.keep
-dist_varlib_DATA = packaging/installer/.keep
-dist_registry_DATA = packaging/installer/.keep
-dist_log_DATA = packaging/installer/.keep
+dist_cache_DATA =
+dist_varlib_DATA =
+dist_registry_DATA =
+dist_log_DATA =
 plugins_PROGRAMS =
 
 LIBNETDATA_FILES = \
diff --git a/collectors/Makefile.am b/collectors/Makefile.am
index 7431025..f62f8ac 100644
--- a/collectors/Makefile.am
+++ b/collectors/Makefile.am
@@ -30,11 +30,6 @@ SUBDIRS = \
 usercustompluginsconfigdir=$(configdir)/custom-plugins.d
 usergoconfigdir=$(configdir)/go.d
 
-# Explicitly install directories to avoid permission issues due to umask
-install-exec-local:
-	$(INSTALL) -d $(DESTDIR)$(usercustompluginsconfigdir)
-	$(INSTALL) -d $(DESTDIR)$(usergoconfigdir)
-
 dist_noinst_DATA = \
     README.md \
     $(NULL)
diff --git a/collectors/charts.d.plugin/Makefile.am b/collectors/charts.d.plugin/Makefile.am
index b3b2fb9..68b768e 100644
--- a/collectors/charts.d.plugin/Makefile.am
+++ b/collectors/charts.d.plugin/Makefile.am
@@ -31,13 +31,8 @@ dist_charts_DATA = \
 
 userchartsconfigdir=$(configdir)/charts.d
 dist_userchartsconfig_DATA = \
-    .keep \
     $(NULL)
 
-# Explicitly install directories to avoid permission issues due to umask
-install-exec-local:
-	$(INSTALL) -d $(DESTDIR)$(userchartsconfigdir)
-
 chartsconfigdir=$(libconfigdir)/charts.d
 dist_chartsconfig_DATA = \
     $(NULL)
diff --git a/collectors/node.d.plugin/Makefile.am b/collectors/node.d.plugin/Makefile.am
index 411bce9..ba60276 100644
--- a/collectors/node.d.plugin/Makefile.am
+++ b/collectors/node.d.plugin/Makefile.am
@@ -23,13 +23,8 @@ dist_noinst_DATA = \
 
 usernodeconfigdir=$(configdir)/node.d
 dist_usernodeconfig_DATA = \
-    .keep \
     $(NULL)
 
-# Explicitly install directories to avoid permission issues due to umask
-install-exec-local:
-	$(INSTALL) -d $(DESTDIR)$(usernodeconfigdir)
-
 nodeconfigdir=$(libconfigdir)/node.d
 dist_nodeconfig_DATA = \
     $(NULL)
diff --git a/collectors/python.d.plugin/Makefile.am b/collectors/python.d.plugin/Makefile.am
index cb14e35..8a6c5a7 100644
--- a/collectors/python.d.plugin/Makefile.am
+++ b/collectors/python.d.plugin/Makefile.am
@@ -29,13 +29,8 @@ dist_python_DATA = \
 
 userpythonconfigdir=$(configdir)/python.d
 dist_userpythonconfig_DATA = \
-    .keep \
     $(NULL)
 
-# Explicitly install directories to avoid permission issues due to umask
-install-exec-local:
-	$(INSTALL) -d $(DESTDIR)$(userpythonconfigdir)
-
 pythonconfigdir=$(libconfigdir)/python.d
 dist_pythonconfig_DATA = \
     $(NULL)
diff --git a/collectors/statsd.plugin/Makefile.am b/collectors/statsd.plugin/Makefile.am
index 87b6ca7..9d010c7 100644
--- a/collectors/statsd.plugin/Makefile.am
+++ b/collectors/statsd.plugin/Makefile.am
@@ -14,9 +14,4 @@ dist_statsdconfig_DATA = \
 
 userstatsdconfigdir=$(configdir)/statsd.d
 dist_userstatsdconfig_DATA = \
-    .keep \
     $(NULL)
-
-# Explicitly install directories to avoid permission issues due to umask
-install-exec-local:
-	$(INSTALL) -d $(DESTDIR)$(userstatsdconfigdir)
diff --git a/health/Makefile.am b/health/Makefile.am
index f63faa8..8912ef2 100644
--- a/health/Makefile.am
+++ b/health/Makefile.am
@@ -16,13 +16,8 @@ dist_noinst_DATA = \
 
 userhealthconfigdir=$(configdir)/health.d
 dist_userhealthconfig_DATA = \
-    .keep \
     $(NULL)
 
-# Explicitly install directories to avoid permission issues due to umask
-install-exec-local:
-	$(INSTALL) -d $(DESTDIR)$(userhealthconfigdir)
-
 healthconfigdir=$(libconfigdir)/health.d
 dist_healthconfig_DATA = \
     health.d/adaptec_raid.conf \
diff --git a/system/Makefile.am b/system/Makefile.am
index ad68c65..bf6a840 100644
--- a/system/Makefile.am
+++ b/system/Makefile.am
@@ -16,14 +16,6 @@ CLEANFILES = \
 include $(top_srcdir)/build/subst.inc
 SUFFIXES = .in
 
-dist_config_SCRIPTS = \
-    edit-config \
-    $(NULL)
-
-# Explicitly install directories to avoid permission issues due to umask
-install-exec-local:
-	$(INSTALL) -d $(DESTDIR)$(configdir)
-
 nodist_noinst_DATA = \
     netdata-openrc \
     netdata.logrotate \
diff --git a/web/Makefile.am b/web/Makefile.am
index ccaccd7..f2fed50 100644
--- a/web/Makefile.am
+++ b/web/Makefile.am
@@ -11,10 +11,6 @@ SUBDIRS = \
 
 usersslconfigdir=$(configdir)/ssl
 
-# Explicitly install directories to avoid permission issues due to umask
-install-exec-local:
-	$(INSTALL) -d $(DESTDIR)$(usersslconfigdir)
-
 dist_noinst_DATA = \
     README.md \
     gui/confluence/README.md \