diff --git a/scm-ui/ui-components/src/forms/index.ts b/scm-ui/ui-components/src/forms/index.ts
index 54a5d49b15..de64d40aae 100644
--- a/scm-ui/ui-components/src/forms/index.ts
+++ b/scm-ui/ui-components/src/forms/index.ts
@@ -33,7 +33,7 @@ export { default as Checkbox } from "./Checkbox";
 export { default as Radio } from "./Radio";
 export { default as FilterInput } from "./FilterInput";
 export { default as InputField } from "./InputField";
-export { default as Select } from "./Select";
+export { default as Select, SelectItem } from "./Select";
 export { default as Textarea } from "./Textarea";
 export { default as PasswordConfirmation } from "./PasswordConfirmation";
 export { default as LabelWithHelpIcon } from "./LabelWithHelpIcon";
diff --git a/scm-ui/ui-webapp/src/repos/components/form/RepositoryForm.tsx b/scm-ui/ui-webapp/src/repos/components/form/RepositoryForm.tsx
index b22fd01218..a6d90a0ce3 100644
--- a/scm-ui/ui-webapp/src/repos/components/form/RepositoryForm.tsx
+++ b/scm-ui/ui-webapp/src/repos/components/form/RepositoryForm.tsx
@@ -23,10 +23,10 @@
  */
 import React from "react";
 import styled from "styled-components";
-import {WithTranslation, withTranslation} from "react-i18next";
-import {ExtensionPoint} from "@scm-manager/ui-extensions";
-import {Repository, RepositoryCreation, RepositoryType} from "@scm-manager/ui-types";
-import {Checkbox, InputField, Level, Select, SubmitButton, Subtitle, Textarea} from "@scm-manager/ui-components";
+import { WithTranslation, withTranslation } from "react-i18next";
+import { ExtensionPoint } from "@scm-manager/ui-extensions";
+import { Repository, RepositoryCreation, RepositoryType } from "@scm-manager/ui-types";
+import { Checkbox, InputField, Level, Select, SubmitButton, Subtitle, Textarea } from "@scm-manager/ui-components";
 import * as validator from "./repositoryValidation";
 import { CUSTOM_NAMESPACE_STRATEGY } from "../../modules/repos";
 
@@ -50,6 +50,7 @@ type Props = WithTranslation & {
   repositoryTypes?: RepositoryType[];
   namespaceStrategy?: string;
   loading?: boolean;
+  indexResources: any;
 };
 
 type State = {
@@ -221,11 +222,12 @@ class RepositoryForm extends React.Component<Props, State> {
     if (!this.isCreateMode()) {
       return null;
     }
-    const { repositoryTypes, t } = this.props;
+    const { repositoryTypes, indexResources, t } = this.props;
     const repository = this.state.repository;
     const extensionProps = {
       repository,
-      setCreationContextEntry: this.setCreationContextEntry
+      setCreationContextEntry: this.setCreationContextEntry,
+      indexResources
     };
     return (
       <>
@@ -255,11 +257,11 @@ class RepositoryForm extends React.Component<Props, State> {
               onChange={this.toggleInitCheckbox}
               helpText={t("help.initializeRepository")}
             />
+            {this.state.initRepository && (
+              <ExtensionPoint name="repos.create.initialize" props={extensionProps} renderAll={false} />
+            )}
           </CheckboxWrapper>
         </SpaceBetween>
-        {this.state.initRepository && (
-          <ExtensionPoint name="repos.create.initialize" props={extensionProps} renderAll={false} />
-        )}
       </>
     );
   }
diff --git a/scm-ui/ui-webapp/src/repos/containers/Create.tsx b/scm-ui/ui-webapp/src/repos/containers/Create.tsx
index 1796e7269f..b58791a562 100644
--- a/scm-ui/ui-webapp/src/repos/containers/Create.tsx
+++ b/scm-ui/ui-webapp/src/repos/containers/Create.tsx
@@ -50,6 +50,7 @@ type Props = WithTranslation & {
   createLoading: boolean;
   error: Error;
   repoLink: string;
+  indexResources: any;
 
   // dispatch functions
   fetchNamespaceStrategiesIfNeeded: () => void;
@@ -81,7 +82,7 @@ class Create extends React.Component<Props> {
   };
 
   render() {
-    const { pageLoading, createLoading, repositoryTypes, namespaceStrategies, createRepo, error } = this.props;
+    const { pageLoading, createLoading, repositoryTypes, namespaceStrategies, createRepo, error, indexResources } = this.props;
 
     const { t, repoLink } = this.props;
     return (
@@ -99,6 +100,7 @@ class Create extends React.Component<Props> {
           submitForm={(repo, initRepository) => {
             createRepo(repoLink, repo, initRepository, (repo: Repository) => this.repoCreated(repo));
           }}
+          indexResources={indexResources}
         />
       </Page>
     );
@@ -113,13 +115,16 @@ const mapStateToProps = (state: any) => {
   const error =
     getFetchRepositoryTypesFailure(state) || getCreateRepoFailure(state) || getFetchNamespaceStrategiesFailure(state);
   const repoLink = getRepositoriesLink(state);
+  const indexResources = state?.indexResources;
+
   return {
     repositoryTypes,
     namespaceStrategies,
     pageLoading,
     createLoading,
     error,
-    repoLink
+    repoLink,
+    indexResources
   };
 };
 
@@ -131,7 +136,7 @@ const mapDispatchToProps = (dispatch: any) => {
     fetchNamespaceStrategiesIfNeeded: () => {
       dispatch(fetchNamespaceStrategiesIfNeeded());
     },
-    createRepo: (link: string, repository: Repository, initRepository: boolean, callback: () => void) => {
+    createRepo: (link: string, repository: RepositoryCreation, initRepository: boolean, callback: () => void) => {
       dispatch(createRepo(link, repository, initRepository, callback));
     },
     resetForm: () => {