diff --git a/cmd/osbuild-composer/main.go b/cmd/osbuild-composer/main.go
index 5098e5f97..9956d82e0 100644
--- a/cmd/osbuild-composer/main.go
+++ b/cmd/osbuild-composer/main.go
@@ -77,9 +77,9 @@ func main() {
 		log.Fatalf("osbuild-composer.socket doesn't exist")
 	}
 
-	if l, exists := listeners["osbuild-composer-koji.socket"]; exists {
+	if l, exists := listeners["osbuild-composer-api.socket"]; exists {
 		if len(l) != 1 {
-			log.Fatal("The osbuild-composer-koji.socket unit is misconfigured. It should contain only one socket.")
+			log.Fatal("The osbuild-composer-api.socket unit is misconfigured. It should contain only one socket.")
 		}
 
 		err = composer.InitKoji(ServerCertFile, ServerKeyFile, l[0])
diff --git a/distribution/osbuild-composer-api.socket b/distribution/osbuild-composer-api.socket
new file mode 100644
index 000000000..580f4eeb6
--- /dev/null
+++ b/distribution/osbuild-composer-api.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=OSBuild Composer API socket
+
+[Socket]
+Service=osbuild-composer.service
+ListenStream=443
+
+[Install]
+WantedBy=sockets.target
diff --git a/distribution/osbuild-composer-koji.socket b/distribution/osbuild-composer-koji.socket
deleted file mode 100644
index bc11020b8..000000000
--- a/distribution/osbuild-composer-koji.socket
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=OSBuild Composer Koji API socket
-
-[Socket]
-Service=osbuild-composer.service
-ListenStream=443
-
-[Install]
-WantedBy=sockets.target
diff --git a/distribution/osbuild-composer-koji.socket b/distribution/osbuild-composer-koji.socket
new file mode 120000
index 000000000..a1ef655a3
--- /dev/null
+++ b/distribution/osbuild-composer-koji.socket
@@ -0,0 +1 @@
+osbuild-composer-api.socket
\ No newline at end of file
diff --git a/osbuild-composer.spec b/osbuild-composer.spec
index 2b8f88f61..b403df090 100644
--- a/osbuild-composer.spec
+++ b/osbuild-composer.spec
@@ -158,6 +158,7 @@ install -m 0644 -vp distribution/osbuild-composer.socket        %{buildroot}%{_u
 install -m 0644 -vp distribution/osbuild-remote-worker.socket   %{buildroot}%{_unitdir}/
 install -m 0644 -vp distribution/osbuild-remote-worker@.service %{buildroot}%{_unitdir}/
 install -m 0644 -vp distribution/osbuild-worker@.service        %{buildroot}%{_unitdir}/
+install -m 0644 -vp distribution/osbuild-composer-api.socket    %{buildroot}%{_unitdir}/
 install -m 0644 -vp distribution/osbuild-composer-koji.socket   %{buildroot}%{_unitdir}/
 install -m 0755 -vd                                             %{buildroot}%{_unitdir}
 install -m 0644 -vp distribution/osbuild-composer.{service,socket} %{buildroot}%{_unitdir}/
@@ -232,13 +233,13 @@ cd $PWD/_build/src/%{goipath}
 %endif
 
 %post
-%systemd_post osbuild-composer.service osbuild-composer.socket osbuild-remote-worker.socket
+%systemd_post osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-remote-worker.socket
 
 %preun
-%systemd_preun osbuild-composer.service osbuild-composer.socket osbuild-remote-worker.socket
+%systemd_preun osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-remote-worker.socket
 
 %postun
-%systemd_postun_with_restart osbuild-composer.service osbuild-composer.socket osbuild-remote-worker.socket
+%systemd_postun_with_restart osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-remote-worker.socket
 
 %files
 %license LICENSE
@@ -248,6 +249,7 @@ cd $PWD/_build/src/%{goipath}
 %{_datadir}/osbuild-composer/
 %{_unitdir}/osbuild-composer.service
 %{_unitdir}/osbuild-composer.socket
+%{_unitdir}/osbuild-composer-api.socket
 %{_unitdir}/osbuild-remote-worker.socket
 %{_sysusersdir}/osbuild-composer.conf
 
@@ -377,7 +379,8 @@ Obsoletes: osbuild-composer-rcm < %{version}-%{release}
 Provides:  osbuild-composer-rcm = %{version}-%{release}
 
 %description koji
-osbulid-composer specifically for pushing images to Koji.
+osbuild-composer specifically for pushing images to Koji. This package is only
+needed for backwards compatibility and will be removed in the future.
 
 %files koji
 %{_unitdir}/osbuild-composer-koji.socket
diff --git a/schutzbot/provision.sh b/schutzbot/provision.sh
index 39ec3ef30..8ce711dca 100755
--- a/schutzbot/provision.sh
+++ b/schutzbot/provision.sh
@@ -11,14 +11,7 @@ sudo chown _osbuild-composer /etc/osbuild-composer/composer-*.pem
 
 sudo systemctl start osbuild-remote-worker.socket
 sudo systemctl start osbuild-composer.socket
-
-if rpm -q osbuild-composer-koji; then
-    sudo systemctl start osbuild-composer-koji.socket
-fi
-
-if rpm -q osbuild-composer-cloud; then
-    sudo systemctl start osbuild-composer-cloud.socket
-fi
+sudo systemctl start osbuild-composer-api.socket
 
 # Basic verification
 sudo composer-cli status show