diff --git a/service/agama.gemspec b/service/agama.gemspec
index bb2b561d4a..4f254b40b7 100644
--- a/service/agama.gemspec
+++ b/service/agama.gemspec
@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.email = "yast-devel@opensuse.org"
   spec.homepage = "https://github.com/openSUSE/agama"
   spec.license = "GPL-2.0-only"
-  spec.files = Dir["lib/**/*.rb", "bin/*", "share/*", "etc/*"]
+  spec.files = Dir["lib/**/*.rb", "bin/*", "share/*", "conf.d/*"]
   spec.executables = ["agamactl", "agama-proxy-setup"]
   spec.metadata = { "rubygems_mfa_required" => "true" }
 
diff --git a/service/package/gem2rpm.yml b/service/package/gem2rpm.yml
index 5ff69bf1f2..588ea4ac70 100644
--- a/service/package/gem2rpm.yml
+++ b/service/package/gem2rpm.yml
@@ -10,7 +10,7 @@
   install -m 0644 --target-directory=%{buildroot}%{_datadir}/dbus-1/agama-services %{buildroot}%{gem_base}/gems/%{mod_full_name}/share/org.opensuse.Agama*.service
   install -D -m 0644 %{buildroot}%{gem_base}/gems/%{mod_full_name}/share/agama.service %{buildroot}%{_unitdir}/agama.service
   install -D -m 0644 %{buildroot}%{gem_base}/gems/%{mod_full_name}/share/agama-proxy-setup.service %{buildroot}%{_unitdir}/agama-proxy-setup.service
-  install -D -m 0644 %{buildroot}%{gem_base}/gems/%{mod_full_name}/etc/agama.yaml %{buildroot}%{_sysconfdir}/agama.yaml
+  install -D -m 0644 %{buildroot}%{gem_base}/gems/%{mod_full_name}/conf.d/*.yaml %{buildroot}/usr/lib/agama.d/
 :main:
   :preamble: |-
     # Override build.rpm, see also https://github.com/openSUSE/obs-build/blob/master/configs/
@@ -39,4 +39,4 @@
     %{_datadir}/dbus-1/agama-services/org.opensuse.Agama*.service\n
     %{_unitdir}/agama.service\n
     %{_unitdir}/agama-proxy-setup.service\n
-    %config %{_sysconfdir}/agama.yaml\n"
+    /usr/lib/agama.d\n"