diff --git a/components/proxy/conf/Caddyfile b/components/proxy/conf/Caddyfile
index d7107985dfe285..72473f98cba04e 100644
--- a/components/proxy/conf/Caddyfile
+++ b/components/proxy/conf/Caddyfile
@@ -262,6 +262,11 @@ https://{$GITPOD_DOMAIN} {
 	}
 }
 
+# public-api
+https://api.{$GITPOD_DOMAIN} {
+    reverse_proxy public-api-server.{$KUBE_NAMESPACE}.{$KUBE_DOMAIN}:9000
+}
+
 # workspaces
 https://*.*.{$GITPOD_DOMAIN} {
 	import enable_log
diff --git a/components/public-api-server/main.go b/components/public-api-server/main.go
index 5bbc040bda129c..bd3abfac1b1927 100644
--- a/components/public-api-server/main.go
+++ b/components/public-api-server/main.go
@@ -22,6 +22,10 @@ func main() {
 		logger.WithError(err).Fatal("Failed to initialize public api server.")
 	}
 
+	if err := register(srv); err != nil {
+		logger.WithError(err).Fatal("Failed to register services.")
+	}
+
 	if listenErr := srv.ListenAndServe(); listenErr != nil {
 		logger.WithError(listenErr).Fatal("Failed to serve public api server")
 	}