diff --git a/Makefile b/Makefile
index ee754c1..85f5151 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ install: $(APP)
 	@if [ -z "$${WORKSPACE}" ]; then exit 1; fi
 	@mkdir --parents --verbose $${WORKSPACE}/usr/$(BINDIR)
 	@install -Dpm 755 $(APP) $${WORKSPACE}/usr/$(BINDIR)/$(APP)
-	@install -Dpm 600 config.json $${WORKSPACE}/$(APP)/$(APP).conf
+	@install -Dpm 600 config.json $${WORKSPACE}/etc/$(APP)/$(APP).json
 
 .PHONY: clean
 .ONESHELL:
@@ -104,7 +104,7 @@ DEB: scripts/cc-metric-store.deb.control $(APP)
 	@SIZE="$$(awk -v size="$$SIZE_BYTES" 'BEGIN {print (size/1024)+1}' | awk '{print int($$0)}')"
 	#@sed -e s+"{VERSION}"+"$$VERS"+g -e s+"{INSTALLED_SIZE}"+"$$SIZE"+g -e s+"{ARCH}"+"$$ARCH"+g $$CONTROLFILE > $${DEBIANDIR}/control
 	@sed -e s+"{VERSION}"+"$$VERS"+g -e s+"{INSTALLED_SIZE}"+"$$SIZE"+g -e s+"{ARCH}"+"$$ARCH"+g $$CONTROLFILE > $${DEBIANBINDIR}/control
-	@make PREFIX=$${WORKSPACE} BINDIR="sbin" install
+	@make PREFIX=$${WORKSPACE} install
 	@DEB_FILE="cc-metric-store_$${VERS}_$${ARCH}.deb"
 	@dpkg-deb -b $${WORKSPACE} "$$DEB_FILE"
 	@rm -r "$${WORKSPACE}"
diff --git a/scripts/cc-metric-store.spec b/scripts/cc-metric-store.spec
index fae7af3..ae88883 100644
--- a/scripts/cc-metric-store.spec
+++ b/scripts/cc-metric-store.spec
@@ -26,7 +26,7 @@ make
 
 %install
 # Install cc-metric-store
-make PREFIX=%{buildroot} BINDIR=sbin install
+make PREFIX=%{buildroot} install
 # Integrate into system
 install -Dpm 0644 scripts/%{name}.service %{buildroot}%{_unitdir}/%{name}.service
 install -Dpm 0600 scripts/%{name}.config %{buildroot}%{_sysconfdir}/default/%{name}
@@ -47,7 +47,7 @@ install -Dpm 0644 scripts/%{name}.sysusers %{buildroot}%{_sysusersdir}/%{name}.c
 
 %files
 # Binary
-%attr(-,clustercockpit,clustercockpit) %{_sbindir}/%{name}
+%attr(-,clustercockpit,clustercockpit) %{_bindir}/%{name}
 # Config
 %dir %{_sysconfdir}/%{name}
 %attr(0600,clustercockpit,clustercockpit) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.json