diff --git a/components/dashboard/src/components/PrebuildLogs.tsx b/components/dashboard/src/components/PrebuildLogs.tsx
index 3cddd1778838e2..e0b1530f04fbd3 100644
--- a/components/dashboard/src/components/PrebuildLogs.tsx
+++ b/components/dashboard/src/components/PrebuildLogs.tsx
@@ -19,7 +19,6 @@ const WorkspaceLogs = React.lazy(() => import("./WorkspaceLogs"));
 
 export interface PrebuildLogsProps {
     workspaceId?: string;
-    onInstanceUpdate?: (instance: WorkspaceInstance) => void;
 }
 
 export default function PrebuildLogs(props: PrebuildLogsProps) {
@@ -81,9 +80,6 @@ export default function PrebuildLogs(props: PrebuildLogsProps) {
     }, [props.workspaceId]);
 
     useEffect(() => {
-        if (props.onInstanceUpdate && workspaceInstance) {
-            props.onInstanceUpdate(workspaceInstance);
-        }
         switch (workspaceInstance?.status.phase) {
             // Preparing means that we haven't actually started the workspace instance just yet, but rather
             // are still preparing for launch. This means we're building the Docker image for the workspace.
diff --git a/components/dashboard/src/projects/Prebuild.tsx b/components/dashboard/src/projects/Prebuild.tsx
index fe7cd3113f6eb4..2bab83b1be939e 100644
--- a/components/dashboard/src/projects/Prebuild.tsx
+++ b/components/dashboard/src/projects/Prebuild.tsx
@@ -5,7 +5,7 @@
  */
 
 import moment from "moment";
-import { PrebuildWithStatus, WorkspaceInstance } from "@gitpod/gitpod-protocol";
+import { PrebuildWithStatus } from "@gitpod/gitpod-protocol";
 import { useContext, useEffect, useState } from "react";
 import { useHistory, useLocation, useRouteMatch } from "react-router";
 import Header from "../components/Header";
@@ -30,7 +30,6 @@ export default function () {
     const prebuildId = match?.params?.prebuildId;
 
     const [prebuild, setPrebuild] = useState<PrebuildWithStatus | undefined>();
-    const [prebuildInstance, setPrebuildInstance] = useState<WorkspaceInstance | undefined>();
     const [isRerunningPrebuild, setIsRerunningPrebuild] = useState<boolean>(false);
     const [isCancellingPrebuild, setIsCancellingPrebuild] = useState<boolean>(false);
 
@@ -56,6 +55,16 @@ export default function () {
             });
             setPrebuild(prebuilds[0]);
         })();
+
+        return getGitpodService().registerClient({
+            onPrebuildUpdate(update: PrebuildWithStatus) {
+                if (update.info.id !== prebuildId) {
+                    return;
+                }
+
+                setPrebuild(update);
+            },
+        }).dispose;
     }, [prebuildId, projectSlug, team, teams]);
 
     const renderTitle = () => {
@@ -109,18 +118,6 @@ export default function () {
         );
     };
 
-    const onInstanceUpdate = async (instance: WorkspaceInstance) => {
-        setPrebuildInstance(instance);
-        if (!prebuild) {
-            return;
-        }
-        const prebuilds = await getGitpodService().server.findPrebuilds({
-            projectId: prebuild.info.projectId,
-            prebuildId,
-        });
-        setPrebuild(prebuilds[0]);
-    };
-
     const rerunPrebuild = async () => {
         if (!prebuild) {
             return;
@@ -161,15 +158,12 @@ export default function () {
             <div className="app-container mt-8">
                 <div className="rounded-xl overflow-hidden bg-gray-100 dark:bg-gray-800 flex flex-col">
                     <div className="h-96 flex">
-                        <PrebuildLogs
-                            workspaceId={prebuild?.info?.buildWorkspaceId}
-                            onInstanceUpdate={onInstanceUpdate}
-                        />
+                        <PrebuildLogs workspaceId={prebuild?.info?.buildWorkspaceId} />
                     </div>
                     <div className="h-20 px-6 bg-gray-50 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-600 flex space-x-2">
                         {prebuild && <PrebuildStatus prebuild={prebuild} />}
                         <div className="flex-grow" />
-                        {prebuild?.status === "aborted" || prebuild?.status === "timeout" || !!prebuild?.error ? (
+                        {["aborted", "timeout", "failed"].includes(prebuild?.status || "") || !!prebuild?.error ? (
                             <button
                                 className="flex items-center space-x-2"
                                 disabled={isRerunningPrebuild}
@@ -178,16 +172,12 @@ export default function () {
                                 {isRerunningPrebuild && (
                                     <img className="h-4 w-4 animate-spin filter brightness-150" src={Spinner} />
                                 )}
-                                <span>Rerun Prebuild ({prebuild.info.branch})</span>
+                                <span>Rerun Prebuild ({prebuild?.info.branch})</span>
                             </button>
-                        ) : prebuild?.status === "building" ? (
+                        ) : ["building", "queued"].includes(prebuild?.status || "") ? (
                             <button
                                 className="danger flex items-center space-x-2"
-                                disabled={
-                                    isCancellingPrebuild ||
-                                    (prebuildInstance?.status.phase !== "initializing" &&
-                                        prebuildInstance?.status.phase !== "running")
-                                }
+                                disabled={isCancellingPrebuild}
                                 onClick={cancelPrebuild}
                             >
                                 {isCancellingPrebuild && (