diff --git a/components/dashboard/src/dedicated-setup/SetupLayout.tsx b/components/dashboard/src/dedicated-setup/SetupLayout.tsx
index e0c2603e07e25e..22f85d525110a0 100644
--- a/components/dashboard/src/dedicated-setup/SetupLayout.tsx
+++ b/components/dashboard/src/dedicated-setup/SetupLayout.tsx
@@ -38,7 +38,7 @@ export const SetupLayout: FC<Props> = ({
         <div className="container">
             <div className="app-container">
                 <div className="flex justify-between items-center">
-                    <div className="flex items-center justify-start items-center py-3 space-x-1">
+                    <div className="flex items-center justify-start py-3 space-x-1">
                         <img src={gitpodIcon} className="w-6 h-6" alt="Gitpod's logo" />
                         {showOrg ? (
                             <div className="pr-1 flex font-semibold whitespace-nowrap max-w-xs overflow-hidden">
@@ -55,7 +55,7 @@ export const SetupLayout: FC<Props> = ({
                         )}
                     </div>
                 </div>
-                <div className={`mt-24 ${noMaxWidth ? "" : "max-w-md"}`}>
+                <div className={`mt-24 ${noMaxWidth ? "" : "max-w-md"} pb-4`}>
                     {/* generate the rounded dots for the progress  */}
                     {progressCurrent !== undefined && progressTotal !== undefined ? (
                         <div className="flex flex-row space-x-2 mb-4">
diff --git a/components/dashboard/src/teams/TeamSettings.tsx b/components/dashboard/src/teams/TeamSettings.tsx
index 8b8e5cc9e5e502..93fa4c47c8d141 100644
--- a/components/dashboard/src/teams/TeamSettings.tsx
+++ b/components/dashboard/src/teams/TeamSettings.tsx
@@ -227,6 +227,28 @@ export default function TeamSettingsPage() {
                         />
                     </ConfigurationSettingsField>
 
+                    {org?.id && (
+                        <ConfigurationSettingsField>
+                            <Heading3>Docker Registry authentication</Heading3>
+                            <Subheading>Configure Docker registry permissions for the whole organization.</Subheading>
+
+                            <NamedOrganizationEnvvarItem
+                                disabled={!isOwner}
+                                name={EnvVar.GITPOD_IMAGE_AUTH_ENV_VAR_NAME}
+                                organizationId={org.id}
+                                variable={gitpodImageAuthEnvVar}
+                            />
+                        </ConfigurationSettingsField>
+                    )}
+
+                    {showImageEditModal && (
+                        <OrgDefaultWorkspaceImageModal
+                            settings={settings}
+                            installationDefaultWorkspaceImage={installationDefaultImage}
+                            onClose={() => setShowImageEditModal(false)}
+                        />
+                    )}
+
                     {isCommitAnnotationEnabled && (
                         <ConfigurationSettingsField>
                             <Heading3>Insights</Heading3>
@@ -255,28 +277,6 @@ export default function TeamSettingsPage() {
                         </ConfigurationSettingsField>
                     )}
 
-                    {showImageEditModal && (
-                        <OrgDefaultWorkspaceImageModal
-                            settings={settings}
-                            installationDefaultWorkspaceImage={installationDefaultImage}
-                            onClose={() => setShowImageEditModal(false)}
-                        />
-                    )}
-
-                    {org?.id && (
-                        <ConfigurationSettingsField>
-                            <Heading3>Docker Registry authentication</Heading3>
-                            <Subheading>Configure Docker registry permissions for the whole organization.</Subheading>
-
-                            <NamedOrganizationEnvvarItem
-                                disabled={!isOwner}
-                                name={EnvVar.GITPOD_IMAGE_AUTH_ENV_VAR_NAME}
-                                organizationId={org.id}
-                                variable={gitpodImageAuthEnvVar}
-                            />
-                        </ConfigurationSettingsField>
-                    )}
-
                     {user?.organizationId !== org?.id && isOwner && (
                         <ConfigurationSettingsField>
                             <Heading3>Delete organization</Heading3>