diff --git a/datastore_server/etc/core_plugins.properties b/datastore_server/etc/core_plugins.properties
deleted file mode 100644
index 8aa4355947edb96a5383b4b0993b1c994c7e886b..0000000000000000000000000000000000000000
--- a/datastore_server/etc/core_plugins.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Properties for enabling/disabling core plugins
-#
-
-# 
-# List of comma-separated regular expressions. If a technology (i.e. module) from the core plugins
-# folder is matching one of these regular expressions it is enabled.
-#
-#enabled-technologies = proteomics, dev-.*
-
-#
-# List of comma-separated full core plugin names (or prefixes) of core plugins to be disabled 
-# even though they are in an enabled technology.
-#
-#disabled-core-plugins = proteomics:reporting-plugins
\ No newline at end of file
diff --git a/datastore_server/etc/service.properties b/datastore_server/etc/service.properties
index e74af95e9e79a8f60efeb6b21dd4e8d28d29463a..1017b51c619307b80fc774467ca4566cea5aff85 100644
--- a/datastore_server/etc/service.properties
+++ b/datastore_server/etc/service.properties
@@ -9,6 +9,8 @@ storeroot-dir = ${root-dir}/store
 # The directory for incoming files over rpc
 rpc-incoming-dir = ${root-dir}/incoming-rpc
 
+core-plugins-folder = source/core-plugins
+
 # The directory where the command queue file is located; defaults to storeroot-dir 
 commandqueue-dir =
 
diff --git a/datastore_server/dist/etc/core_plugins.properties b/datastore_server/source/core-plugins/core_plugins.properties
similarity index 79%
rename from datastore_server/dist/etc/core_plugins.properties
rename to datastore_server/source/core-plugins/core_plugins.properties
index 8aa4355947edb96a5383b4b0993b1c994c7e886b..5145f37b1103fc5422a4020f67f7294891359153 100644
--- a/datastore_server/dist/etc/core_plugins.properties
+++ b/datastore_server/source/core-plugins/core_plugins.properties
@@ -6,10 +6,10 @@
 # List of comma-separated regular expressions. If a technology (i.e. module) from the core plugins
 # folder is matching one of these regular expressions it is enabled.
 #
-#enabled-technologies = proteomics, dev-.*
+#enabled-technologies = 
 
 #
 # List of comma-separated full core plugin names (or prefixes) of core plugins to be disabled 
 # even though they are in an enabled technology.
 #
-#disabled-core-plugins = proteomics:reporting-plugins
\ No newline at end of file
+#disabled-core-plugins = 
\ No newline at end of file