diff --git a/cypress/integration/distroSettings/provider_section.ts b/cypress/integration/distroSettings/provider_section.ts
index 740ad09c89..6748ae1e31 100644
--- a/cypress/integration/distroSettings/provider_section.ts
+++ b/cypress/integration/distroSettings/provider_section.ts
@@ -1,38 +1,88 @@
 import { save } from "./utils";
 
 describe("provider section", () => {
-  beforeEach(() => {
-    cy.visit("/distro/localhost/settings/provider");
-  });
+  describe("static", () => {
+    beforeEach(() => {
+      cy.visit("/distro/localhost/settings/provider");
+    });
+
+    it("successfully updates static provider fields", () => {
+      cy.dataCy("provider-select").contains("Static IP/VM");
+
+      // Correct fields are displayed
+      cy.dataCy("provider-settings").within(() => {
+        cy.get("button").should("have.length", 1);
+        cy.get("textarea").should("have.length", 1);
+        cy.get("input[type=checkbox]").should("have.length", 1);
+        cy.get("input[type=text]").should("have.length", 0);
+      });
+
+      cy.getInputByLabel("User Data").type("my user data");
+      cy.getInputByLabel("Merge with existing user data").check({
+        force: true,
+      });
+      cy.contains("button", "Add security group").click();
+      cy.getInputByLabel("Security Group ID").type("group-1234");
+
+      save();
+      cy.validateToast("success");
 
-  it("successfully updates static provider fields", () => {
-    cy.dataCy("provider-select").contains("Static IP/VM");
+      cy.getInputByLabel("User Data").clear();
+      cy.getInputByLabel("Merge with existing user data").uncheck({
+        force: true,
+      });
+      cy.dataCy("delete-item-button").click();
 
-    // Correct fields are displayed
-    cy.dataCy("provider-settings").within(() => {
-      cy.get("button").should("have.length", 1);
-      cy.get("textarea").should("have.length", 1);
-      cy.get("input[type=checkbox]").should("have.length", 1);
-      cy.get("input[type=text]").should("have.length", 0);
+      save();
+      cy.validateToast("success");
     });
+  });
 
-    cy.getInputByLabel("User Data").type("my user data");
-    cy.getInputByLabel("Merge with existing user data").check({
-      force: true,
+  describe.only("docker", () => {
+    beforeEach(() => {
+      cy.visit("/distro/ubuntu1604-container-test/settings/provider");
     });
-    cy.contains("button", "Add security group").click();
-    cy.getInputByLabel("Security Group ID").type("group-1234");
 
-    save();
-    cy.validateToast("success");
+    it("successfully updates docker provider fields", () => {
+      cy.dataCy("provider-select").contains("Docker");
 
-    cy.getInputByLabel("User Data").clear();
-    cy.getInputByLabel("Merge with existing user data").uncheck({
-      force: true,
-    });
-    cy.dataCy("delete-item-button").click();
+      // Correct fields are displayed
+      cy.dataCy("provider-settings").within(() => {
+        cy.getInputByLabel("Docker Image URL").should("exist");
+        cy.getInputByLabel("Image Build Method").should("exist");
+        cy.getInputByLabel("Username for Registries").should("exist");
+        cy.getInputByLabel("Password for Registries").should("exist");
+        cy.getInputByLabel("Container Pool ID").should("exist");
+        cy.getInputByLabel("Pool Mapping Information").should("exist");
+        cy.getInputByLabel("User Data").should("exist");
+        cy.getInputByLabel("Merge with existing user data").should("exist");
+        cy.contains("button", "Add security group").should("exist");
+      });
+
+      // Change field values.
+      cy.selectLGOption("Image Build Method", "Pull");
+      cy.selectLGOption("Container Pool ID", /^test-pool$/);
+      cy.getInputByLabel("Username for Registries").type("username");
+      cy.getInputByLabel("Password for Registries").type("password");
+      cy.getInputByLabel("User Data").type("my user data");
+      cy.getInputByLabel("Merge with existing user data").check({
+        force: true,
+      });
+      save();
+      cy.validateToast("success");
 
-    save();
-    cy.validateToast("success");
+      // Revert fields to original values.
+      cy.selectLGOption("Image Build Method", "Import");
+      cy.selectLGOption("Container Pool ID", "ubuntu-test-pool");
+      cy.getInputByLabel("Username for Registries").clear();
+      cy.getInputByLabel("Password for Registries").clear();
+      cy.getInputByLabel("User Data").clear();
+      cy.getInputByLabel("Merge with existing user data").uncheck({
+        force: true,
+      });
+
+      save();
+      cy.validateToast("success");
+    });
   });
 });
diff --git a/src/components/SpruceForm/Widgets/LeafyGreenWidgets.tsx b/src/components/SpruceForm/Widgets/LeafyGreenWidgets.tsx
index acc89574e9..0ff8389d33 100644
--- a/src/components/SpruceForm/Widgets/LeafyGreenWidgets.tsx
+++ b/src/components/SpruceForm/Widgets/LeafyGreenWidgets.tsx
@@ -339,6 +339,7 @@ export const LeafyGreenTextArea: React.FC<SpruceWidgetProps> = ({
   label,
   onChange,
   options,
+  placeholder,
   rawErrors,
   readonly,
   value,
@@ -368,6 +369,7 @@ export const LeafyGreenTextArea: React.FC<SpruceWidgetProps> = ({
     <ElementWrapper css={elementWrapperCSS}>
       <TextArea
         ref={el}
+        placeholder={placeholder || undefined}
         data-cy={dataCy}
         label={label}
         disabled={disabled || readonly}
diff --git a/src/gql/generated/types.ts b/src/gql/generated/types.ts
index ecf073d85a..66fde5cda5 100644
--- a/src/gql/generated/types.ts
+++ b/src/gql/generated/types.ts
@@ -258,6 +258,19 @@ export enum CommunicationMethod {
   Ssh = "SSH",
 }
 
+export type ContainerPool = {
+  __typename?: "ContainerPool";
+  distro: Scalars["String"]["output"];
+  id: Scalars["String"]["output"];
+  maxContainers: Scalars["Int"]["output"];
+  port: Scalars["Int"]["output"];
+};
+
+export type ContainerPoolsConfig = {
+  __typename?: "ContainerPoolsConfig";
+  pools: Array<ContainerPool>;
+};
+
 export type ContainerResources = {
   __typename?: "ContainerResources";
   cpu: Scalars["Int"]["output"];
@@ -2324,6 +2337,7 @@ export type SpruceConfig = {
   __typename?: "SpruceConfig";
   banner?: Maybe<Scalars["String"]["output"]>;
   bannerTheme?: Maybe<Scalars["String"]["output"]>;
+  containerPools?: Maybe<ContainerPoolsConfig>;
   githubOrgs: Array<Scalars["String"]["output"]>;
   jira?: Maybe<JiraConfig>;
   providers?: Maybe<CloudProviderConfig>;
@@ -7780,41 +7794,6 @@ export type RepoSettingsQuery = {
   };
 };
 
-export type SpruceConfigQueryVariables = Exact<{ [key: string]: never }>;
-
-export type SpruceConfigQuery = {
-  __typename?: "Query";
-  spruceConfig?: {
-    __typename?: "SpruceConfig";
-    banner?: string | null;
-    bannerTheme?: string | null;
-    jira?: { __typename?: "JiraConfig"; host?: string | null } | null;
-    providers?: {
-      __typename?: "CloudProviderConfig";
-      aws?: {
-        __typename?: "AWSConfig";
-        maxVolumeSizePerUser?: number | null;
-        pod?: {
-          __typename?: "AWSPodConfig";
-          ecs?: {
-            __typename?: "ECSConfig";
-            maxCPU: number;
-            maxMemoryMb: number;
-          } | null;
-        } | null;
-      } | null;
-    } | null;
-    slack?: { __typename?: "SlackConfig"; name?: string | null } | null;
-    spawnHost: {
-      __typename?: "SpawnHostConfig";
-      spawnHostsPerUser: number;
-      unexpirableHostsPerUser: number;
-      unexpirableVolumesPerUser: number;
-    };
-    ui?: { __typename?: "UIConfig"; defaultProject: string } | null;
-  } | null;
-};
-
 export type SystemLogsQueryVariables = Exact<{
   id: Scalars["String"]["input"];
   execution?: InputMaybe<Scalars["Int"]["input"]>;
@@ -8641,6 +8620,51 @@ export type SpawnTaskQuery = {
   } | null;
 };
 
+export type SpruceConfigQueryVariables = Exact<{ [key: string]: never }>;
+
+export type SpruceConfigQuery = {
+  __typename?: "Query";
+  spruceConfig?: {
+    __typename?: "SpruceConfig";
+    banner?: string | null;
+    bannerTheme?: string | null;
+    containerPools?: {
+      __typename?: "ContainerPoolsConfig";
+      pools: Array<{
+        __typename?: "ContainerPool";
+        distro: string;
+        id: string;
+        maxContainers: number;
+        port: number;
+      }>;
+    } | null;
+    jira?: { __typename?: "JiraConfig"; host?: string | null } | null;
+    providers?: {
+      __typename?: "CloudProviderConfig";
+      aws?: {
+        __typename?: "AWSConfig";
+        maxVolumeSizePerUser?: number | null;
+        pod?: {
+          __typename?: "AWSPodConfig";
+          ecs?: {
+            __typename?: "ECSConfig";
+            maxCPU: number;
+            maxMemoryMb: number;
+          } | null;
+        } | null;
+      } | null;
+    } | null;
+    slack?: { __typename?: "SlackConfig"; name?: string | null } | null;
+    spawnHost: {
+      __typename?: "SpawnHostConfig";
+      spawnHostsPerUser: number;
+      unexpirableHostsPerUser: number;
+      unexpirableVolumesPerUser: number;
+    };
+    ui?: { __typename?: "UIConfig"; defaultProject: string } | null;
+  } | null;
+};
+
 export type SubnetAvailabilityZonesQueryVariables = Exact<{
   [key: string]: never;
 }>;
diff --git a/src/gql/queries/index.ts b/src/gql/queries/index.ts
index 69b2a98ba8..45251a628d 100644
--- a/src/gql/queries/index.ts
+++ b/src/gql/queries/index.ts
@@ -47,7 +47,6 @@ import GET_PROJECTS from "./get-projects.graphql";
 import GET_MY_PUBLIC_KEYS from "./get-public-keys.graphql";
 import GET_REPO_EVENT_LOGS from "./get-repo-event-logs.graphql";
 import GET_REPO_SETTINGS from "./get-repo-settings.graphql";
-import GET_SPRUCE_CONFIG from "./get-spruce-config.graphql";
 import GET_SYSTEM_LOGS from "./get-system-logs.graphql";
 import GET_TASK_ALL_EXECUTIONS from "./get-task-all-executions.graphql";
 import GET_TASK_EVENT_LOGS from "./get-task-event-logs.graphql";
@@ -71,6 +70,7 @@ import PROJECT_HEALTH_VIEW from "./project-health-view.graphql";
 import GET_PROJECT_PATCHES from "./project-patches.graphql";
 import GET_SPAWN_EXPIRATION_INFO from "./spawn-expiration.graphql";
 import GET_SPAWN_TASK from "./spawn-task.graphql";
+import GET_SPRUCE_CONFIG from "./spruce-config.graphql";
 import GET_SUBNET_AVAILABILITY_ZONES from "./subnet-availability-zones.graphql";
 import TASK_QUEUE_DISTROS from "./task-queue-distros.graphql";
 import USER_DISTRO_SETTINGS_PERMISSIONS from "./user-distro-settings-permissions.graphql";
diff --git a/src/gql/queries/get-spruce-config.graphql b/src/gql/queries/spruce-config.graphql
similarity index 79%
rename from src/gql/queries/get-spruce-config.graphql
rename to src/gql/queries/spruce-config.graphql
index a89b2e2fd6..91922d4390 100644
--- a/src/gql/queries/get-spruce-config.graphql
+++ b/src/gql/queries/spruce-config.graphql
@@ -2,6 +2,14 @@ query SpruceConfig {
   spruceConfig {
     banner
     bannerTheme
+    containerPools {
+      pools {
+        distro
+        id
+        maxContainers
+        port
+      }
+    }
     jira {
       host
     }
diff --git a/src/pages/distroSettings/tabs/ProviderTab/ProviderTab.tsx b/src/pages/distroSettings/tabs/ProviderTab/ProviderTab.tsx
index f6c1b1fcd2..7f898c1fa7 100644
--- a/src/pages/distroSettings/tabs/ProviderTab/ProviderTab.tsx
+++ b/src/pages/distroSettings/tabs/ProviderTab/ProviderTab.tsx
@@ -1,4 +1,8 @@
 import { useMemo } from "react";
+import { DistroSettingsTabRoutes } from "constants/routes";
+import { useSpruceConfig } from "hooks";
+import { useDistroSettingsContext } from "pages/distroSettings/Context";
+import { omitTypename } from "utils/string";
 import { BaseTab } from "../BaseTab";
 import { getFormSchema } from "./getFormSchema";
 import { TabProps } from "./types";
@@ -6,7 +10,22 @@ import { TabProps } from "./types";
 export const ProviderTab: React.FC<TabProps> = ({ distroData }) => {
   const initialFormState = distroData;
 
-  const formSchema = useMemo(() => getFormSchema(), []);
+  const { getTab } = useDistroSettingsContext();
+  const { formData } = getTab(DistroSettingsTabRoutes.Provider);
+
+  const { containerPools } = useSpruceConfig();
+  const { pools = [] } = containerPools || {};
+
+  const selectedPoolId = formData?.providerSettings?.containerPoolId;
+  const selectedPool = pools.find((p) => p.id === selectedPoolId) ?? null;
+  const poolMappingInfo = selectedPool
+    ? JSON.stringify(omitTypename(selectedPool), null, 4)
+    : "";
+
+  const formSchema = useMemo(
+    () => getFormSchema({ pools, poolMappingInfo }),
+    [pools, poolMappingInfo]
+  );
 
   return (
     <BaseTab formSchema={formSchema} initialFormState={initialFormState} />
diff --git a/src/pages/distroSettings/tabs/ProviderTab/getFormSchema.ts b/src/pages/distroSettings/tabs/ProviderTab/getFormSchema.ts
index 3cd2ed863d..4ef41ebef2 100644
--- a/src/pages/distroSettings/tabs/ProviderTab/getFormSchema.ts
+++ b/src/pages/distroSettings/tabs/ProviderTab/getFormSchema.ts
@@ -1,9 +1,17 @@
+import { css } from "@emotion/react";
 import { GetFormSchema } from "components/SpruceForm";
 import { CardFieldTemplate } from "components/SpruceForm/FieldTemplates";
-import { Provider } from "gql/generated/types";
-import { staticProviderSettings } from "./schemaFields";
+import { STANDARD_FIELD_WIDTH } from "components/SpruceForm/utils";
+import { Provider, ContainerPool } from "gql/generated/types";
+import { dockerProviderSettings, staticProviderSettings } from "./schemaFields";
 
-export const getFormSchema = (): ReturnType<GetFormSchema> => ({
+export const getFormSchema = ({
+  poolMappingInfo,
+  pools,
+}: {
+  poolMappingInfo: string;
+  pools: ContainerPool[];
+}): ReturnType<GetFormSchema> => ({
   fields: {},
   schema: {
     type: "object" as "object",
@@ -56,7 +64,46 @@ export const getFormSchema = (): ReturnType<GetFormSchema> => ({
               providerSettings: {
                 type: "object" as "object",
                 title: "",
-                properties: staticProviderSettings,
+                properties: {
+                  userData: staticProviderSettings.userData,
+                  mergeUserData: staticProviderSettings.mergeUserData,
+                  securityGroups: staticProviderSettings.securityGroups,
+                },
+              },
+            },
+          },
+          {
+            properties: {
+              provider: {
+                properties: {
+                  providerName: {
+                    enum: [Provider.Docker],
+                  },
+                },
+              },
+              providerSettings: {
+                type: "object" as "object",
+                title: "",
+                properties: {
+                  imageUrl: dockerProviderSettings.imageUrl,
+                  buildType: dockerProviderSettings.buildType,
+                  registryUsername: dockerProviderSettings.registryUsername,
+                  registryPassword: dockerProviderSettings.registryPassword,
+                  containerPoolId: {
+                    type: "string" as "string",
+                    title: "Container Pool ID",
+                    default: "",
+                    oneOf: pools.map((p) => ({
+                      type: "string" as "string",
+                      title: p.id,
+                      enum: [p.id],
+                    })),
+                  },
+                  poolMappingInfo: dockerProviderSettings.poolMappingInfo,
+                  userData: dockerProviderSettings.userData,
+                  mergeUserData: dockerProviderSettings.mergeUserData,
+                  securityGroups: dockerProviderSettings.securityGroups,
+                },
               },
             },
           },
@@ -77,11 +124,44 @@ export const getFormSchema = (): ReturnType<GetFormSchema> => ({
       "ui:ObjectFieldTemplate": CardFieldTemplate,
       userData: {
         "ui:widget": "textarea",
+        "ui:elementWrapperCSS": textAreaCSS,
       },
       securityGroups: {
         "ui:addButtonText": "Add security group",
         "ui:orderable": false,
       },
+      buildType: {
+        "ui:allowDeselect": false,
+      },
+      registryUsername: {
+        "ui:optional": true,
+      },
+      registryPassword: {
+        "ui:optional": true,
+        "ui:inputType": "password",
+      },
+      containerPoolId: {
+        "ui:allowDeselect": false,
+        "ui:placeholder": "Select a pool",
+      },
+      poolMappingInfo: {
+        "ui:widget": poolMappingInfo.length > 0 ? "textarea" : "hidden",
+        "ui:placeholder": poolMappingInfo,
+        "ui:elementWrapperCSS": poolMappingInfoCss,
+        "ui:readonly": true,
+      },
     },
   },
 });
+
+const textAreaCSS = css`
+  box-sizing: border-box;
+  max-width: ${STANDARD_FIELD_WIDTH}px;
+`;
+
+const poolMappingInfoCss = css`
+  ${textAreaCSS};
+  textarea {
+    min-height: 140px;
+  }
+`;
diff --git a/src/pages/distroSettings/tabs/ProviderTab/schemaFields.ts b/src/pages/distroSettings/tabs/ProviderTab/schemaFields.ts
index eca2061071..e5eafc59a9 100644
--- a/src/pages/distroSettings/tabs/ProviderTab/schemaFields.ts
+++ b/src/pages/distroSettings/tabs/ProviderTab/schemaFields.ts
@@ -1,3 +1,10 @@
+import { BuildType } from "./types";
+
+const userData = {
+  type: "string" as "string",
+  title: "User Data",
+};
+
 const mergeUserData = {
   type: "boolean" as "boolean",
   title: "Merge with existing user data",
@@ -14,9 +21,45 @@ const securityGroups = {
   },
 };
 
-const userData = {
+const imageUrl = {
   type: "string" as "string",
-  title: "User Data",
+  title: "Docker Image URL",
+  default: "",
+  format: "validURL",
+  minLength: 1,
+};
+
+const buildType = {
+  type: "string" as "string",
+  title: "Image Build Method",
+  default: BuildType.Import,
+  oneOf: [
+    {
+      type: "string" as "string",
+      title: "Import",
+      enum: [BuildType.Import],
+    },
+    {
+      type: "string" as "string",
+      title: "Pull",
+      enum: [BuildType.Pull],
+    },
+  ],
+};
+
+const registryUsername = {
+  type: "string" as "string",
+  title: "Username for Registries",
+};
+
+const registryPassword = {
+  type: "string" as "string",
+  title: "Password for Registries",
+};
+
+const poolMappingInfo = {
+  type: "string" as "string",
+  title: "Pool Mapping Information",
 };
 
 export const staticProviderSettings = {
@@ -24,3 +67,14 @@ export const staticProviderSettings = {
   mergeUserData,
   securityGroups,
 };
+
+export const dockerProviderSettings = {
+  imageUrl,
+  buildType,
+  registryUsername,
+  registryPassword,
+  poolMappingInfo,
+  userData,
+  mergeUserData,
+  securityGroups,
+};
diff --git a/src/pages/distroSettings/tabs/ProviderTab/transformerUtils.ts b/src/pages/distroSettings/tabs/ProviderTab/transformerUtils.ts
index 6e9e96e3ba..d39edb8473 100644
--- a/src/pages/distroSettings/tabs/ProviderTab/transformerUtils.ts
+++ b/src/pages/distroSettings/tabs/ProviderTab/transformerUtils.ts
@@ -30,6 +30,42 @@ const getSecurityGroups = ((providerSettings) => ({
   },
 })) satisfies FieldGetter;
 
+const getImageUrl = ((providerSettings) => ({
+  form: {
+    imageUrl: providerSettings.image_url ?? "",
+  },
+  gql: {
+    image_url: providerSettings.imageUrl,
+  },
+})) satisfies FieldGetter;
+
+const getBuildType = ((providerSettings) => ({
+  form: {
+    buildType: providerSettings.build_type ?? "",
+  },
+  gql: {
+    build_type: providerSettings.buildType,
+  },
+})) satisfies FieldGetter;
+
+const getRegistryUsername = ((providerSettings) => ({
+  form: {
+    registryUsername: providerSettings.docker_registry_user ?? "",
+  },
+  gql: {
+    docker_registry_user: providerSettings.registryUsername,
+  },
+})) satisfies FieldGetter;
+
+const getRegistryPassword = ((providerSettings) => ({
+  form: {
+    registryPassword: providerSettings.docker_registry_pw ?? "",
+  },
+  gql: {
+    docker_registry_pw: providerSettings.registryPassword,
+  },
+})) satisfies FieldGetter;
+
 export const staticProviderSettings = ((providerSettings = {}) => {
   const userData = getUserData(providerSettings);
   const mergeUserData = getMergeUserData(providerSettings);
@@ -37,20 +73,49 @@ export const staticProviderSettings = ((providerSettings = {}) => {
 
   return {
     form: {
-      providerSettings: {
-        ...userData.form,
-        ...mergeUserData.form,
-        ...securityGroups.form,
-      },
+      ...userData.form,
+      ...mergeUserData.form,
+      ...securityGroups.form,
     },
-    gql: {
-      providerSettingsList: [
-        {
-          ...userData.gql,
-          ...mergeUserData.gql,
-          ...securityGroups.gql,
-        },
-      ],
+    gql: [
+      {
+        ...userData.gql,
+        ...mergeUserData.gql,
+        ...securityGroups.gql,
+      },
+    ],
+  };
+}) satisfies FieldGetter;
+
+export const dockerProviderSettings = ((providerSettings = {}) => {
+  const imageUrl = getImageUrl(providerSettings);
+  const buildType = getBuildType(providerSettings);
+  const registryUser = getRegistryUsername(providerSettings);
+  const registryPassword = getRegistryPassword(providerSettings);
+  const userData = getUserData(providerSettings);
+  const mergeUserData = getMergeUserData(providerSettings);
+  const securityGroups = getSecurityGroups(providerSettings);
+
+  return {
+    form: {
+      ...imageUrl.form,
+      ...buildType.form,
+      ...registryUser.form,
+      ...registryPassword.form,
+      ...userData.form,
+      ...mergeUserData.form,
+      ...securityGroups.form,
     },
+    gql: [
+      {
+        ...imageUrl.gql,
+        ...buildType.gql,
+        ...registryUser.gql,
+        ...registryPassword.gql,
+        ...userData.gql,
+        ...mergeUserData.gql,
+        ...securityGroups.gql,
+      },
+    ],
   };
 }) satisfies FieldGetter;
diff --git a/src/pages/distroSettings/tabs/ProviderTab/transformers.test.ts b/src/pages/distroSettings/tabs/ProviderTab/transformers.test.ts
index 759789c3ba..f035f2b3c3 100644
--- a/src/pages/distroSettings/tabs/ProviderTab/transformers.test.ts
+++ b/src/pages/distroSettings/tabs/ProviderTab/transformers.test.ts
@@ -1,39 +1,99 @@
 import { DistroInput, Provider } from "gql/generated/types";
 import { distroData } from "../testData";
 import { formToGql, gqlToForm } from "./transformers";
-import { ProviderFormState } from "./types";
+import { BuildType, ProviderFormState } from "./types";
 
 describe("provider tab", () => {
   describe("static provider", () => {
+    const staticDistroData = { ...distroData };
+
+    const staticForm: ProviderFormState = {
+      provider: {
+        providerName: Provider.Static,
+      },
+      providerSettings: {
+        userData: "",
+        mergeUserData: false,
+        securityGroups: ["1"],
+      },
+    };
+
+    const staticGql: DistroInput = {
+      ...distroData,
+      provider: Provider.Static,
+      providerSettingsList: [
+        {
+          merge_user_data_parts: false,
+          security_group_ids: ["1"],
+          user_data: "",
+        },
+      ],
+    };
+
     it("correctly converts from GQL to a form", () => {
-      expect(gqlToForm(distroData)).toStrictEqual(form);
+      expect(gqlToForm(staticDistroData)).toStrictEqual(staticForm);
     });
 
     it("correctly converts from a form to GQL", () => {
-      expect(formToGql(form, distroData)).toStrictEqual(gql);
+      expect(formToGql(staticForm, staticDistroData)).toStrictEqual(staticGql);
     });
   });
-});
 
-const form: ProviderFormState = {
-  provider: {
-    providerName: Provider.Static,
-  },
-  providerSettings: {
-    userData: "",
-    mergeUserData: false,
-    securityGroups: ["1"],
-  },
-};
-
-const gql: DistroInput = {
-  ...distroData,
-  provider: Provider.Static,
-  providerSettingsList: [
-    {
-      merge_user_data_parts: false,
-      security_group_ids: ["1"],
-      user_data: "",
-    },
-  ],
-};
+  describe("docker provider", () => {
+    const dockerDistroData = { ...distroData };
+    dockerDistroData.provider = Provider.Docker;
+    dockerDistroData.containerPool = "pool-1";
+    dockerDistroData.providerSettingsList = [
+      {
+        image_url: "https://some-url",
+        build_type: "import",
+        docker_registry_user: "testuser",
+        docker_registry_pw: "abc-123",
+        user_data: "",
+        merge_user_data: false,
+        security_group_ids: ["1"],
+      },
+    ];
+
+    const dockerForm: ProviderFormState = {
+      provider: {
+        providerName: Provider.Docker,
+      },
+      providerSettings: {
+        imageUrl: "https://some-url",
+        buildType: BuildType.Import,
+        registryUsername: "testuser",
+        registryPassword: "abc-123",
+        containerPoolId: "pool-1",
+        userData: "",
+        mergeUserData: false,
+        securityGroups: ["1"],
+      },
+    };
+
+    const dockerGql: DistroInput = {
+      ...distroData,
+      provider: Provider.Docker,
+      containerPool: "pool-1",
+      providerSettingsList: [
+        {
+          image_url: "https://some-url",
+          build_type: "import",
+          docker_registry_user: "testuser",
+          docker_registry_pw: "abc-123",
+          user_data: "",
+          merge_user_data_parts: false,
+          security_group_ids: ["1"],
+        },
+      ],
+    };
+
+    it("correctly converts from GQL to a form", () => {
+      expect(gqlToForm(dockerDistroData)).toStrictEqual(dockerForm);
+    });
+
+    it("correctly converts from a form to GQL", () => {
+      expect(formToGql(dockerForm, dockerDistroData)).toStrictEqual(dockerGql);
+    });
+  });
+});
diff --git a/src/pages/distroSettings/tabs/ProviderTab/transformers.ts b/src/pages/distroSettings/tabs/ProviderTab/transformers.ts
index e382923d11..87ad514b8f 100644
--- a/src/pages/distroSettings/tabs/ProviderTab/transformers.ts
+++ b/src/pages/distroSettings/tabs/ProviderTab/transformers.ts
@@ -1,14 +1,17 @@
 import { DistroSettingsTabRoutes } from "constants/routes";
 import { Provider } from "gql/generated/types";
 import { FormToGqlFunction, GqlToFormFunction } from "../types";
-import { staticProviderSettings } from "./transformerUtils";
+import {
+  staticProviderSettings,
+  dockerProviderSettings,
+} from "./transformerUtils";
 
 type Tab = DistroSettingsTabRoutes.Provider;
 
 export const gqlToForm = ((data) => {
   if (!data) return null;
 
-  const { provider, providerSettingsList } = data;
+  const { containerPool, provider, providerSettingsList } = data;
 
   switch (provider) {
     case Provider.Static:
@@ -16,7 +19,19 @@ export const gqlToForm = ((data) => {
         provider: {
           providerName: Provider.Static,
         },
-        ...staticProviderSettings(providerSettingsList[0]).form,
+        providerSettings: {
+          ...staticProviderSettings(providerSettingsList[0]).form,
+        },
+      };
+    case Provider.Docker:
+      return {
+        provider: {
+          providerName: Provider.Docker,
+        },
+        providerSettings: {
+          ...dockerProviderSettings(providerSettingsList[0]).form,
+          containerPoolId: containerPool,
+        },
       };
     default:
       throw new Error(`Unknown provider '${provider}'`);
@@ -29,13 +44,24 @@ export const formToGql = ((data, distro) => {
   } = data;
 
   switch (providerName) {
-    case Provider.Static: {
+    case Provider.Static:
+      return {
+        ...distro,
+        provider: Provider.Static,
+        providerSettingsList: [
+          ...staticProviderSettings(data.providerSettings).gql,
+        ],
+      };
+    case Provider.Docker:
       return {
         ...distro,
-        provider: providerName,
-        ...staticProviderSettings(data.providerSettings).gql,
+        provider: Provider.Docker,
+        providerSettingsList: [
+          ...dockerProviderSettings(data.providerSettings).gql,
+        ],
+        // @ts-ignore-error - containerPoolId will exist in DockerFormState.
+        containerPool: data.providerSettings.containerPoolId,
       };
-    }
     default:
       return distro;
   }
diff --git a/src/pages/distroSettings/tabs/ProviderTab/types.ts b/src/pages/distroSettings/tabs/ProviderTab/types.ts
index c100aead99..b5553b916e 100644
--- a/src/pages/distroSettings/tabs/ProviderTab/types.ts
+++ b/src/pages/distroSettings/tabs/ProviderTab/types.ts
@@ -1,5 +1,10 @@
 import { Provider } from "gql/generated/types";
 
+export enum BuildType {
+  Import = "import",
+  Pull = "pull",
+}
+
 interface StaticProviderFormState {
   provider: {
     providerName: Provider.Static;
@@ -11,8 +16,26 @@ interface StaticProviderFormState {
   };
 }
 
+interface DockerProviderFormState {
+  provider: {
+    providerName: Provider.Docker;
+  };
+  providerSettings: {
+    imageUrl: string;
+    buildType: BuildType;
+    registryUsername: string;
+    registryPassword: string;
+    containerPoolId: string;
+    userData: string;
+    mergeUserData: boolean;
+    securityGroups: string[];
+  };
+}
+
 // TODO: Append type with additional provider options, e.g. type ProviderFormState = StaticProviderFormState | DockerProviderFormState
-export type ProviderFormState = StaticProviderFormState;
+export type ProviderFormState =
+  | StaticProviderFormState
+  | DockerProviderFormState;
 
 export type TabProps = {
   distroData: ProviderFormState;