diff --git a/frontend/src/components/config/util.tsx b/frontend/src/components/config/util.tsx
index 63127e0d3..c00ef1d45 100644
--- a/frontend/src/components/config/util.tsx
+++ b/frontend/src/components/config/util.tsx
@@ -184,6 +184,22 @@ export const DoubleInput = <
   );
 };
 
+export const AccountSelectorConfig = (params: {
+  disabled: boolean;
+  id?: string;
+  type: "Server" | "None" | "Builder";
+  account_type: keyof Types.GetBuilderAvailableAccountsResponse;
+  selected: string | undefined;
+  onSelect: (id: string) => void;
+  placeholder: string;
+}) => {
+  return (
+    <ConfigItem label={`${params.account_type} Account`}>
+      <AccountSelector {...params} />
+    </ConfigItem>
+  );
+};
+
 export const AccountSelector = ({
   disabled,
   id,
@@ -207,30 +223,28 @@ export const AccountSelector = ({
       : ["GetBuilderAvailableAccounts", { builder: id }];
   const accounts = useRead(request as any, params).data;
   return (
-    <ConfigItem label={`${account_type} Account`}>
-      <Select
-        value={type === "Builder" ? selected || undefined : selected}
-        onValueChange={(value) => {
-          onSelect(value === "Empty" ? "" : value);
-        }}
+    <Select
+      value={selected || undefined}
+      onValueChange={(value) => {
+        onSelect(value === "Empty" ? "" : value);
+      }}
+      disabled={disabled}
+    >
+      <SelectTrigger
+        className="w-full lg:w-[200px] max-w-[50%]"
         disabled={disabled}
       >
-        <SelectTrigger
-          className="w-full lg:w-[200px] max-w-[50%]"
-          disabled={disabled}
-        >
-          <SelectValue placeholder={placeholder} />
-        </SelectTrigger>
-        <SelectContent>
-          <SelectItem value={"Empty"}>{placeholder}</SelectItem>
-          {(accounts as any)?.[account_type]?.map((account: string) => (
-            <SelectItem key={account} value={account}>
-              {account}
-            </SelectItem>
-          ))}
-        </SelectContent>
-      </Select>
-    </ConfigItem>
+        <SelectValue placeholder={placeholder} />
+      </SelectTrigger>
+      <SelectContent>
+        <SelectItem value={"Empty"}>{placeholder}</SelectItem>
+        {(accounts as any)?.[account_type]?.map((account: string) => (
+          <SelectItem key={account} value={account}>
+            {account}
+          </SelectItem>
+        ))}
+      </SelectContent>
+    </Select>
   );
 };
 
@@ -440,19 +454,74 @@ export const ImageRegistryConfig = ({
   registry,
   setRegistry,
   disabled,
+  type,
+  resource_id,
+  registry_types,
 }: {
   registry: Types.ImageRegistry | undefined;
   setRegistry: (registry: Types.ImageRegistry) => void;
   disabled: boolean;
+  type: "Build" | "Deployment";
+  // For builds, its builder id. For servers, its server id.
+  resource_id?: string;
+  registry_types?: Types.ImageRegistry["type"][];
 }) => {
   const _registry = registry ?? default_registry_config("None");
+  const cloud_params =
+    _registry.type === "DockerHub" || _registry.type === "Ghcr"
+      ? _registry.params
+      : undefined;
+  if (_registry.type === "None" || _registry.type === "Custom") {
+    return (
+      <ConfigItem label="Image Registry">
+        <RegistryTypeSelector
+          registry={_registry}
+          setRegistry={setRegistry}
+          disabled={disabled}
+          deployment={type === "Deployment"}
+          registry_types={registry_types}
+        />
+      </ConfigItem>
+    );
+  }
   return (
     <ConfigItem label="Image Registry">
-      <RegistryTypeSelector
-        registry={_registry}
-        setRegistry={setRegistry}
-        disabled={disabled}
-      />
+      <div className="flex items-center justify-stretch gap-4">
+        {type === "Build" && (
+          <OrganizationSelector
+            value={cloud_params?.organization}
+            set={(organization) =>
+              setRegistry({
+                ..._registry,
+                params: { ..._registry.params, organization },
+              })
+            }
+            disabled={disabled}
+            type={_registry.type === "DockerHub" ? "Docker" : "Github"}
+          />
+        )}
+        <AccountSelector
+          id={resource_id}
+          type={type === "Build" ? "Builder" : "Server"}
+          account_type={_registry.type === "DockerHub" ? "docker" : "github"}
+          selected={cloud_params?.account}
+          onSelect={(account) =>
+            setRegistry({
+              ..._registry,
+              params: { ..._registry.params, account },
+            })
+          }
+          disabled={disabled}
+          placeholder="None"
+        />
+        <RegistryTypeSelector
+          registry={_registry}
+          setRegistry={setRegistry}
+          disabled={disabled}
+          deployment={type === "Deployment"}
+          registry_types={registry_types}
+        />
+      </div>
     </ConfigItem>
   );
 };
@@ -466,17 +535,23 @@ const REGISTRY_TYPES: Types.ImageRegistry["type"][] = [
 const RegistryTypeSelector = ({
   registry,
   setRegistry,
+  registry_types = REGISTRY_TYPES,
   disabled,
+  deployment,
 }: {
   registry: Types.ImageRegistry;
   setRegistry: (registry: Types.ImageRegistry) => void;
+  registry_types?: Types.ImageRegistry["type"][];
   disabled: boolean;
+  deployment?: boolean;
 }) => {
   return (
     <Select
-      value={registry.type}
-      onValueChange={(type: Types.ImageRegistry["type"]) => {
-        setRegistry(default_registry_config(type));
+      value={to_readable_registry_type(registry.type, deployment)}
+      onValueChange={(type) => {
+        setRegistry(
+          default_registry_config(from_readable_registry_type(type, deployment))
+        );
       }}
       disabled={disabled}
     >
@@ -487,9 +562,45 @@ const RegistryTypeSelector = ({
         <SelectValue placeholder="Select Registry" />
       </SelectTrigger>
       <SelectContent align="end">
-        {REGISTRY_TYPES.map((type) => (
-          <SelectItem key={type} value={type}>
-            {type}
+        {registry_types.map((type) => {
+          const t = to_readable_registry_type(type, deployment);
+          return (
+            <SelectItem key={type} value={t}>
+              {t}
+            </SelectItem>
+          );
+        })}
+      </SelectContent>
+    </Select>
+  );
+};
+
+const OrganizationSelector = ({
+  value,
+  set,
+  disabled,
+  type,
+}: {
+  value?: string;
+  set: (org: string) => void;
+  disabled: boolean;
+  type: "Docker" | "Github";
+}) => {
+  const organizations = useRead(`List${type}Organizations`, {}).data;
+  if (!organizations || organizations.length === 0) return null;
+  return (
+    <Select value={value} onValueChange={set} disabled={disabled}>
+      <SelectTrigger
+        className="w-full lg:w-[300px] max-w-[50%]"
+        disabled={disabled}
+      >
+        <SelectValue placeholder="Select Organization" />
+      </SelectTrigger>
+      <SelectContent>
+        <SelectItem value={"Empty"}>None</SelectItem>
+        {organizations?.map((org) => (
+          <SelectItem key={org} value={org}>
+            {org}
           </SelectItem>
         ))}
       </SelectContent>
@@ -497,6 +608,22 @@ const RegistryTypeSelector = ({
   );
 };
 
+const to_readable_registry_type = (
+  type: Types.ImageRegistry["type"],
+  deployment?: boolean
+) => {
+  if (deployment && type === "None") return "Same as build";
+  return type;
+};
+
+const from_readable_registry_type = (
+  readable: string,
+  deployment?: boolean
+) => {
+  if (deployment && readable === "Same as build") return "None";
+  return readable as Types.ImageRegistry["type"];
+};
+
 const default_registry_config = (
   type: Types.ImageRegistry["type"]
 ): Types.ImageRegistry => {
diff --git a/frontend/src/components/resources/build/config.tsx b/frontend/src/components/resources/build/config.tsx
index 42ab9a78a..86167734b 100644
--- a/frontend/src/components/resources/build/config.tsx
+++ b/frontend/src/components/resources/build/config.tsx
@@ -1,6 +1,6 @@
 import { Config } from "@components/config";
 import {
-  AccountSelector,
+  AccountSelectorConfig,
   AddExtraArgMenu,
   ConfigItem,
   ImageRegistryConfig,
@@ -115,7 +115,7 @@ export const BuildConfig = ({
               github_account:
                 (update.builder_id ?? config.builder_id ? true : false) &&
                 ((account, set) => (
-                  <AccountSelector
+                  <AccountSelectorConfig
                     id={update.builder_id ?? config.builder_id ?? undefined}
                     type="Builder"
                     account_type="github"
@@ -130,13 +130,19 @@ export const BuildConfig = ({
           {
             label: "Docker",
             components: {
-              image_registry: (registry, set) => (
-                <ImageRegistryConfig
-                  registry={registry}
-                  setRegistry={(image_registry) => set({ image_registry })}
-                  disabled={disabled}
-                />
-              ),
+              image_registry: (registry, set) => {
+                const builder_id = update.builder_id ?? config.builder_id;
+                if (!builder_id) return null;
+                return (
+                  <ImageRegistryConfig
+                    registry={registry}
+                    setRegistry={(image_registry) => set({ image_registry })}
+                    type="Build"
+                    resource_id={builder_id}
+                    disabled={disabled}
+                  />
+                );
+              },
               build_path: true,
               dockerfile_path: true,
               // docker_account: (account, set) =>
@@ -437,40 +443,3 @@ const Secrets = ({
   );
 };
 
-// const DockerOrganizations = ({
-//   value,
-//   set,
-//   disabled,
-// }: {
-//   value?: string;
-//   set: (input: Partial<Types.BuildConfig>) => void;
-//   disabled: boolean;
-// }) => {
-//   const docker_organizations = useRead("ListDockerOrganizations", {}).data;
-//   return (
-//     <ConfigItem label="Docker Organization">
-//       <Select
-//         value={value}
-//         onValueChange={(value) =>
-//           set({ docker_organization: value === "Empty" ? "" : value })
-//         }
-//         disabled={disabled}
-//       >
-//         <SelectTrigger
-//           className="w-full lg:w-[300px] max-w-[50%]"
-//           disabled={disabled}
-//         >
-//           <SelectValue placeholder="Select Organization" />
-//         </SelectTrigger>
-//         <SelectContent>
-//           <SelectItem value={"Empty"}>None</SelectItem>
-//           {docker_organizations?.map((org) => (
-//             <SelectItem key={org} value={org}>
-//               {org}
-//             </SelectItem>
-//           ))}
-//         </SelectContent>
-//       </Select>
-//     </ConfigItem>
-//   );
-// };
diff --git a/frontend/src/components/resources/deployment/config/index.tsx b/frontend/src/components/resources/deployment/config/index.tsx
index dcf75074b..e2252783d 100644
--- a/frontend/src/components/resources/deployment/config/index.tsx
+++ b/frontend/src/components/resources/deployment/config/index.tsx
@@ -4,6 +4,7 @@ import { ReactNode, useState } from "react";
 import {
   AddExtraArgMenu,
   ConfigItem,
+  ImageRegistryConfig,
   InputList,
 } from "@components/config/util";
 import { ImageConfig } from "./components/image";
@@ -81,21 +82,29 @@ export const DeploymentConfig = ({
               image: (value, set) => (
                 <ImageConfig image={value} set={set} disabled={disabled} />
               ),
-              // docker_account: (value, set) => (
-              //   <AccountSelector
-              //     id={update.server_id ?? config.server_id}
-              //     account_type="docker"
-              //     type="Server"
-              //     selected={value}
-              //     onSelect={(docker_account) => set({ docker_account })}
-              //     disabled={disabled}
-              //     placeholder={
-              //       (update.image?.type || config.image?.type) === "Build"
-              //         ? "Same as build"
-              //         : "None"
-              //     }
-              //   />
-              // ),
+              image_registry: (registry, set) => {
+                const image_type = update.image?.type ?? config.image?.type;
+                const build_id: string | undefined =
+                  (image_type === "Build" &&
+                    (update.image?.params as any).build_id) ??
+                  (config.image?.params as any).build_id;
+                const build_registry_type = useRead("GetBuild", {
+                  build: build_id!,
+                }).data?.config.image_registry?.type;
+                const server_id = update.server_id ?? config.server_id;
+                return (
+                  <ImageRegistryConfig
+                    registry={registry}
+                    setRegistry={(image_registry) => set({ image_registry })}
+                    type="Deployment"
+                    resource_id={server_id}
+                    disabled={disabled}
+                    registry_types={
+                      build_registry_type && ["None", build_registry_type]
+                    }
+                  />
+                );
+              },
               restart: (value, set) => (
                 <RestartModeSelector
                   selected={value}
diff --git a/frontend/src/components/resources/repo/config.tsx b/frontend/src/components/resources/repo/config.tsx
index d2b26f6c3..422f4758a 100644
--- a/frontend/src/components/resources/repo/config.tsx
+++ b/frontend/src/components/resources/repo/config.tsx
@@ -1,6 +1,6 @@
 import { Config } from "@components/config";
 import {
-  AccountSelector,
+  AccountSelectorConfig,
   ConfigItem,
   SystemCommand,
 } from "@components/config/util";
@@ -55,7 +55,7 @@ export const RepoConfig = ({ id }: { id: string }) => {
               github_account: (value, set) => {
                 const server_id = update.server_id || config.server_id;
                 return (
-                  <AccountSelector
+                  <AccountSelectorConfig
                     id={server_id}
                     account_type="github"
                     type={server_id ? "Server" : "None"}
diff --git a/frontend/src/components/resources/resource-sync/config.tsx b/frontend/src/components/resources/resource-sync/config.tsx
index 24a3a7617..2b43b37ed 100644
--- a/frontend/src/components/resources/resource-sync/config.tsx
+++ b/frontend/src/components/resources/resource-sync/config.tsx
@@ -1,5 +1,5 @@
 import { Config } from "@components/config";
-import { AccountSelector, ConfigItem } from "@components/config/util";
+import { AccountSelectorConfig, ConfigItem } from "@components/config/util";
 import { useRead, useWrite } from "@lib/hooks";
 import { Types } from "@monitor/client";
 import { ReactNode, useState } from "react";
@@ -44,7 +44,7 @@ export const ResourceSyncConfig = ({
               commit: { placeholder: "Enter specific commit hash. Optional." },
               github_account: (value, set) => {
                 return (
-                  <AccountSelector
+                  <AccountSelectorConfig
                     account_type="github"
                     type="None"
                     selected={value}