diff --git a/app/scripts/modules/docker/src/image/DockerImageAndTagSelector.tsx b/app/scripts/modules/docker/src/image/DockerImageAndTagSelector.tsx
index 53690a31d5e..7373ddb4f08 100644
--- a/app/scripts/modules/docker/src/image/DockerImageAndTagSelector.tsx
+++ b/app/scripts/modules/docker/src/image/DockerImageAndTagSelector.tsx
@@ -29,8 +29,6 @@ export interface IDockerImageAndTagSelectorProps {
   digest: string;
   account: string;
   showRegistry?: boolean;
-  labelClass?: string;
-  fieldClass?: string;
   onChange: (changes: IDockerImageAndTagChanges) => void;
   deferInitialization?: boolean;
   showDigest?: boolean;
@@ -57,8 +55,6 @@ export class DockerImageAndTagSelector extends React.Component<
   IDockerImageAndTagSelectorState
 > {
   public static defaultProps: Partial<IDockerImageAndTagSelectorProps> = {
-    fieldClass: 'col-md-8',
-    labelClass: 'col-md-3',
     organization: '',
     registry: '',
     repository: '',
@@ -414,9 +410,7 @@ export class DockerImageAndTagSelector extends React.Component<
     const {
       account,
       digest,
-      fieldClass,
       imageId,
-      labelClass,
       organization,
       repository,
       showDigest,
@@ -672,18 +666,24 @@ export class DockerImageAndTagSelector extends React.Component<
 
     const Digest =
       lookupType === 'digest' ? (
-        <div className="form-group">
-          <div className={`sm-label-right ${labelClass}`}>
-            Digest <HelpField id="pipeline.config.docker.trigger.digest" />
+        <div className="sp-formItem">
+          <div className="sp-formItem__left">
+            <div className="sp-formLabel">
+              Digest <HelpField id="pipeline.config.docker.trigger.digest" />
+            </div>
           </div>
-          <div className={fieldClass}>
-            <input
-              className="form-control input-sm"
-              placeholder="sha256:abc123"
-              value={digest || parsedImageId.digest || ''}
-              onChange={e => this.valueChanged('digest', e.target.value)}
-              required={true}
-            />
+          <div className="sp-formItem__right">
+            <div className="sp-form">
+              <span className="field">
+                <input
+                  className="form-control input-sm"
+                  placeholder="sha256:abc123"
+                  value={digest || parsedImageId.digest || ''}
+                  onChange={e => this.valueChanged('digest', e.target.value)}
+                  required={true}
+                />
+              </span>
+            </div>
           </div>
         </div>
       ) : null;
diff --git a/app/scripts/modules/titus/src/pipeline/stages/runJob/TitusRunJobStageConfig.tsx b/app/scripts/modules/titus/src/pipeline/stages/runJob/TitusRunJobStageConfig.tsx
index 6fd11d65074..e5ba4f3cdc1 100644
--- a/app/scripts/modules/titus/src/pipeline/stages/runJob/TitusRunJobStageConfig.tsx
+++ b/app/scripts/modules/titus/src/pipeline/stages/runJob/TitusRunJobStageConfig.tsx
@@ -222,8 +222,6 @@ export class TitusRunJobStageConfig extends React.Component<IStageConfigProps, I
           showRegistry={false}
           onChange={this.dockerChanged}
           deferInitialization={stage.deferredInitialization}
-          labelClass="col-md-2 col-md-offset-1 sm-label-right"
-          fieldClass="col-md-6"
         />
 
         <StageConfigField label="CPU(s)">
diff --git a/app/scripts/modules/titus/src/serverGroup/configure/wizard/pages/ServerGroupBasicSettings.tsx b/app/scripts/modules/titus/src/serverGroup/configure/wizard/pages/ServerGroupBasicSettings.tsx
index 17d8bd71b49..2356d891e96 100644
--- a/app/scripts/modules/titus/src/serverGroup/configure/wizard/pages/ServerGroupBasicSettings.tsx
+++ b/app/scripts/modules/titus/src/serverGroup/configure/wizard/pages/ServerGroupBasicSettings.tsx
@@ -257,8 +257,6 @@ export class ServerGroupBasicSettings
             tag={values.tag}
             showRegistry={false}
             deferInitialization={values.deferredInitialization}
-            labelClass="col-md-3"
-            fieldClass="col-md-7"
             onChange={this.dockerValuesChanged}
           />
         )}