diff --git a/Rakefile b/Rakefile
index 8b187cbb84..f8e358c1f0 100644
--- a/Rakefile
+++ b/Rakefile
@@ -65,7 +65,7 @@ end
 
 Yast::Tasks.configuration do |conf|
   conf.obs_api = "https://api.opensuse.org"
-  conf.obs_project = "YaST:Head:Agama"
+  conf.obs_project = "systemsmanagement:Agama:Staging"
   conf.package_dir = File.join(Rake.original_dir, "package")
   conf.obs_target = "openSUSE_Tumbleweed"
   package_name = package_name_from(Rake.original_dir)
diff --git a/rust/share/org.opensuse.Agama.Network1.service b/rust/share/org.opensuse.Agama.Network1.service
new file mode 100644
index 0000000000..0c28a66706
--- /dev/null
+++ b/rust/share/org.opensuse.Agama.Network1.service
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.opensuse.Agama.Network1
+Exec=/usr/bin/agama-dbus-server
+User=root
diff --git a/service/package/gem2rpm.yml b/service/package/gem2rpm.yml
index ab7b91dd7d..73a4d79ced 100644
--- a/service/package/gem2rpm.yml
+++ b/service/package/gem2rpm.yml
@@ -1,7 +1,6 @@
 ---
 :sourceurl: "%{mod_full_name}.gem"
 :preamble: |-
-  %global rb_build_versions %{rb_default_ruby}
   BuildRequires:  dbus-1-common
   Requires:       dbus-1-common
 :post_install: |-
@@ -12,8 +11,6 @@
   install -D -m 0644 %{buildroot}%{gem_base}/gems/%{mod_full_name}/etc/agama.yaml %{buildroot}%{_sysconfdir}/agama.yaml
 :main:
   :preamble: |-
-    # Override build.rpm, see also https://github.com/openSUSE/obs-build/blob/master/configs/
-    %global rb_build_versions %{rb_default_ruby}
     BuildRequires:  dbus-1-common
     Requires:       dbus-1-common
     Requires:       snapper