diff --git a/cmd/osbuild-composer/main.go b/cmd/osbuild-composer/main.go
index 0add590f5..c8df14236 100644
--- a/cmd/osbuild-composer/main.go
+++ b/cmd/osbuild-composer/main.go
@@ -91,14 +91,20 @@ func main() {
 	}
 
 	if l, exists := listeners["osbuild-composer.socket"]; exists {
-		if len(l) != 1 {
-			logrus.Fatal("The osbuild-composer.socket unit is misconfigured. It should contain only one socket.")
+		if len(l) != 2 {
+			logrus.Fatal("The osbuild-composer.socket unit is misconfigured. It should contain two sockets.")
 		}
 
 		err = composer.InitWeldr(repositoryConfigs, l[0], config.weldrDistrosImageTypeDenyList())
 		if err != nil {
 			logrus.Fatalf("Error initializing weldr API: %v", err)
 		}
+
+		// Start cloudapi using the 2nd socket and no certs
+		err = composer.InitAPI(ServerCertFile, ServerKeyFile, false, false, false, l[1])
+		if err != nil {
+			logrus.Fatalf("Error initializing Cloud API using local socket: %v", err)
+		}
 	}
 
 	if l, exists := listeners["osbuild-local-worker.socket"]; exists {
diff --git a/distribution/osbuild-composer.socket b/distribution/osbuild-composer.socket
index fe5dd229f..90f7547b3 100644
--- a/distribution/osbuild-composer.socket
+++ b/distribution/osbuild-composer.socket
@@ -3,6 +3,7 @@ Description=OSBuild Composer Weldr API socket
 
 [Socket]
 ListenStream=/run/weldr/api.socket
+ListenStream=/run/cloudapi/api.socket
 SocketGroup=weldr
 SocketMode=660