diff --git a/Makefile b/Makefile
index 323b7d7..1e4c2c1 100644
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,6 @@
 SHELL=/bin/bash
 
 generate_etc:
-	$(eval store="s3_store")
-ifeq ($(INTEGRATION), true)
-	$(eval store="s3_store_dev")
-endif
 	install -d \
 		tmp/etc/any-sync-node-{1..3}/ \
 		tmp/etc/any-sync-filenode/ \
@@ -13,7 +9,7 @@ endif
 	cat etc/{network,common,node-1}.yml > tmp/etc/any-sync-node-1/config.yml
 	cat etc/{network,common,node-2}.yml > tmp/etc/any-sync-node-2/config.yml
 	cat etc/{network,common,node-3}.yml > tmp/etc/any-sync-node-3/config.yml
-	cat etc/{network,common,filenode,$(store)}.yml > tmp/etc/any-sync-filenode/config.yml
+	cat etc/{network,common,filenode}.yml > tmp/etc/any-sync-filenode/config.yml
 	cat etc/{network,common,coordinator}.yml > tmp/etc/any-sync-coordinator/config.yml
 	cat etc/network.yml | grep -v '^network:' > tmp/etc/any-sync-coordinator/network.yml
 
diff --git a/etc/filenode.yml b/etc/filenode.yml
index c510b5b..87755bd 100644
--- a/etc/filenode.yml
+++ b/etc/filenode.yml
@@ -3,6 +3,13 @@ account:
     peerKey: kTZYumPO7MoEsU7ZyeNTLFgYaO3rGFEHk2qXJdqnV9O0DhMk/wdbgkwrbqtIpVH4Bkx7LPEHesTg3DfH4G524g==
     signingKey: kTZYumPO7MoEsU7ZyeNTLFgYaO3rGFEHk2qXJdqnV9O0DhMk/wdbgkwrbqtIpVH4Bkx7LPEHesTg3DfH4G524g==
 
+s3Store:
+    bucket: s3-emulator:4569
+    maxThreads: 16
+    profile: default
+    region: eu-central-1
+    endpoint: http://s3-emulator:4569
+
 redis:
     isCluster: false
     url: redis://redis:6379?dial_timeout=3&read_timeout=6s
diff --git a/etc/s3_store.yml b/etc/s3_store.yml
deleted file mode 100644
index 3c71b26..0000000
--- a/etc/s3_store.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-s3Store:
-    bucket: anytype-dev-filenode
-    maxThreads: 16
-    profile: default
-    region: eu-central-1
\ No newline at end of file
diff --git a/etc/s3_store_dev.yml b/etc/s3_store_dev.yml
deleted file mode 100644
index d3ca94e..0000000
--- a/etc/s3_store_dev.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-s3Store:
-    bucket: s3-emulator:4569
-    maxThreads: 16
-    profile: default
-    region: eu-central-1
-    endpoint: http://s3-emulator:4569
\ No newline at end of file