diff --git a/src/components/DemoPage/DemoPage.tsx b/src/components/DemoPage/DemoPage.tsx
index ddb40353..9594026b 100644
--- a/src/components/DemoPage/DemoPage.tsx
+++ b/src/components/DemoPage/DemoPage.tsx
@@ -267,7 +267,7 @@ export const DemoPage = () => {
               type="text"
               id="inputFieldA"
               name="inputFieldA"
-              value={fields.inputFieldA.value}
+              value={fields.inputFieldA.value as string}
               autoComplete="off"
               onChange={(text) => {
                 onChange('inputFieldA', text);
@@ -278,7 +278,7 @@ export const DemoPage = () => {
             <TextArea
               id="textAreaA"
               name="textAreaA"
-              value={fields.textAreaA.value}
+              value={fields.textAreaA.value as string}
               onChange={(text) => {
                 onChange('textAreaA', text);
               }}
diff --git a/src/components/ProjectCreateEditPage/ProjectCreateEditPage.tsx b/src/components/ProjectCreateEditPage/ProjectCreateEditPage.tsx
index c085d654..8500b229 100644
--- a/src/components/ProjectCreateEditPage/ProjectCreateEditPage.tsx
+++ b/src/components/ProjectCreateEditPage/ProjectCreateEditPage.tsx
@@ -166,7 +166,7 @@ export const ProjectCreateEditPage = ({ isEditPage = false }: IProjectCreateEdit
               type="text"
               id={projectEntityAttributes.name.id}
               name={projectEntityAttributes.name.id}
-              value={fields.name.value}
+              value={fields.name.value as string}
               autoComplete="off"
               onChange={(name) => {
                 onChange('name', name);
@@ -177,7 +177,7 @@ export const ProjectCreateEditPage = ({ isEditPage = false }: IProjectCreateEdit
             <TextArea
               id={projectEntityAttributes.description.id}
               name={projectEntityAttributes.description.id}
-              value={fields.description.value}
+              value={fields.description.value as string}
               onChange={(description) => {
                 onChange('description', description);
               }}
@@ -199,7 +199,7 @@ export const ProjectCreateEditPage = ({ isEditPage = false }: IProjectCreateEdit
               id={projectEntityAttributes.projectUrl.id}
               name={projectEntityAttributes.projectUrl.id}
               autoComplete="off"
-              value={fields.projectUrl.value}
+              value={fields.projectUrl.value as string}
               onChange={(url) => {
                 onChange('projectUrl', url);
               }}
@@ -220,7 +220,7 @@ export const ProjectCreateEditPage = ({ isEditPage = false }: IProjectCreateEdit
               id={projectEntityAttributes.issueTrackerUrl.id}
               name={projectEntityAttributes.issueTrackerUrl.id}
               autoComplete="off"
-              value={fields.issueTrackerUrl.value}
+              value={fields.issueTrackerUrl.value as string}
               onChange={(url) => {
                 onChange('issueTrackerUrl', url);
               }}
@@ -232,7 +232,7 @@ export const ProjectCreateEditPage = ({ isEditPage = false }: IProjectCreateEdit
               id={projectEntityAttributes.engineeringTeam.id}
               name={projectEntityAttributes.engineeringTeam.id}
               autoComplete="off"
-              value={fields.engineeringTeam.value}
+              value={fields.engineeringTeam.value as string}
               onChange={(engineeringTeam) => {
                 onChange('engineeringTeam', engineeringTeam);
               }}
@@ -244,7 +244,7 @@ export const ProjectCreateEditPage = ({ isEditPage = false }: IProjectCreateEdit
               id={projectEntityAttributes.technicalLeader.id}
               name={projectEntityAttributes.technicalLeader.id}
               autoComplete="off"
-              value={fields.technicalLeader.value}
+              value={fields.technicalLeader.value as string}
               onChange={(technicalLeader) => {
                 onChange('technicalLeader', technicalLeader);
               }}
diff --git a/src/components/ScmRepositoryCreateEditPage/ScmRepositoryCreateEditPage.tsx b/src/components/ScmRepositoryCreateEditPage/ScmRepositoryCreateEditPage.tsx
index 3121c53c..f4858c69 100644
--- a/src/components/ScmRepositoryCreateEditPage/ScmRepositoryCreateEditPage.tsx
+++ b/src/components/ScmRepositoryCreateEditPage/ScmRepositoryCreateEditPage.tsx
@@ -7,6 +7,7 @@ import {
   Form,
   FormGroup,
   FormHelperText,
+  Switch,
   TextInput,
 } from '@patternfly/react-core';
 import { useEffect, useState } from 'react';
@@ -40,14 +41,16 @@ const createFormConfig = {
     isRequired: true,
     validators: [{ validator: validateScmUrl, errorMessage: 'Invalid SCM URL format.' }],
   },
-  // preBuildSyncEnabled: {},
+  preBuildSyncEnabled: {
+    value: true,
+  },
 };
 
 const editFormConfig = {
   externalUrl: {
     validators: [{ validator: validateScmUrl, errorMessage: 'Invalid SCM URL format.' }],
   },
-  // preBuildSyncEnabled: {},
+  preBuildSyncEnabled: {},
 };
 
 const flexDirectionColumn: FlexProps['direction'] = { default: 'column' };
@@ -83,7 +86,7 @@ export const ScmRepositoryCreateEditPage = ({ isEditPage = false }: IScmReposito
         serviceData: {
           data: {
             scmUrl: data.scmUrl.value,
-            // preBuildSyncEnabled: data.preBuildSyncEnabled.value,
+            preBuildSyncEnabled: data.preBuildSyncEnabled.value,
           },
         },
       })
@@ -124,7 +127,7 @@ export const ScmRepositoryCreateEditPage = ({ isEditPage = false }: IScmReposito
           setId(scmRepository.id);
           reinitialize({
             externalUrl: scmRepository.externalUrl,
-            // preBuildSyncEnabled: scmRepository.preBuildSyncEnabled,
+            preBuildSyncEnabled: scmRepository.preBuildSyncEnabled,
           });
         });
       } else {
@@ -161,7 +164,7 @@ export const ScmRepositoryCreateEditPage = ({ isEditPage = false }: IScmReposito
                 type="text"
                 id="scmUrl"
                 name="scmUrl"
-                value={fields.scmUrl.value}
+                value={fields.scmUrl.value as string}
                 autoComplete="off"
                 onChange={(scmUrl) => {
                   onChange('scmUrl', scmUrl);
@@ -196,7 +199,7 @@ export const ScmRepositoryCreateEditPage = ({ isEditPage = false }: IScmReposito
                   type="text"
                   id="externalUrl"
                   name="externalUrl"
-                  value={fields.externalUrl.value}
+                  value={fields.externalUrl.value as string}
                   autoComplete="off"
                   onChange={(externalUrl) => {
                     onChange('externalUrl', externalUrl);
@@ -205,7 +208,7 @@ export const ScmRepositoryCreateEditPage = ({ isEditPage = false }: IScmReposito
               </FormGroup>
             </>
           )}
-          {/* <FormGroup
+          <FormGroup
             label="Pre-build Sync"
             fieldId="preBuildSyncEnabled"
             helperText={
@@ -217,12 +220,14 @@ export const ScmRepositoryCreateEditPage = ({ isEditPage = false }: IScmReposito
             <Switch
               id="preBuildSyncEnabled"
               name="preBuildSyncEnabled"
-              isChecked={fields.preBuildSyncEnabled.value?.toLowerCase() === 'true'}
+              label="Pre-build Sync Enabled"
+              labelOff="Pre-build Sync Disabled"
+              isChecked={fields.preBuildSyncEnabled?.value as boolean}
               onChange={(preBuildSyncEnabled) => {
                 onChange('preBuildSyncEnabled', preBuildSyncEnabled);
               }}
             />
-          </FormGroup> */}
+          </FormGroup>
           <ActionGroup>
             <Button
               variant="primary"
diff --git a/src/hooks/useForm.ts b/src/hooks/useForm.ts
index 306d877f..5ad3af88 100644
--- a/src/hooks/useForm.ts
+++ b/src/hooks/useForm.ts
@@ -2,7 +2,7 @@ import { TextInputProps } from '@patternfly/react-core';
 import { useCallback, useEffect, useState } from 'react';
 
 interface IFieldValues {
-  [key: string]: string | undefined;
+  [key: string]: string | boolean | undefined;
 }
 
 interface IValidator {
@@ -11,7 +11,7 @@ interface IValidator {
 }
 
 interface IField {
-  value?: string;
+  value?: string | boolean;
   errorMessages?: string[];
   state?: TextInputProps['validated'];
   isRequired?: boolean;
@@ -98,7 +98,7 @@ export const useForm = (initFields: Omit<Omit<IFields, 'errorMessages'>, 'state'
     // also delete old error messages, new checks are going to be done
     const newField = {
       ...fields[fieldName],
-      value: fieldValue ? fieldValue : '',
+      value: typeof fieldValue === 'boolean' || fieldValue ? fieldValue : '',
       errorMessages: [],
       state: 'default' as TextInputProps['validated'],
     };
@@ -111,7 +111,7 @@ export const useForm = (initFields: Omit<Omit<IFields, 'errorMessages'>, 'state'
   // validate field state and change error messages / state
   const validate = (field: IField) => {
     if (field.isRequired) {
-      if (!field.value?.trim()) {
+      if (typeof field.value === 'string' && !field.value?.trim()) {
         addError(field, 'Field must be filled.');
       }
       setState(field);
@@ -152,15 +152,18 @@ export const useForm = (initFields: Omit<Omit<IFields, 'errorMessages'>, 'state'
     const fieldsCopy = { ...fields };
     for (const key in fieldsCopy) {
       // trim just strings
-      fieldsCopy[key].value = typeof fieldsCopy[key].value === 'string' ? fieldsCopy[key].value?.trim() : fieldsCopy[key].value;
+      fieldsCopy[key].value =
+        typeof fieldsCopy[key].value === 'string' ? (fieldsCopy[key].value as string)?.trim() : fieldsCopy[key].value;
       // reset state to 'default' (valid inputs wont be highlighted)
       fieldsCopy[key].state = 'default';
     }
 
-    submitCallback(fieldsCopy).catch((error: Error) => {
-      // error is displayed by the ServiceContainer
-      console.error(error);
-    });
+    submitCallback(fieldsCopy);
+
+    // submitCallback(fieldsCopy).catch((error: Error) => {
+    //   // error is displayed by the ServiceContainer
+    //   console.error(error);
+    // });
     // .catch((error: any) => {
     // FUTURE IMPLEMENTATION (backend error):
     // const fieldsCopy = { ...fields };
@@ -197,7 +200,7 @@ export const useForm = (initFields: Omit<Omit<IFields, 'errorMessages'>, 'state'
     // are all required inputs filled?
     const areRequiredFilled = () => {
       for (const key in fields) {
-        if (fields[key].isRequired && !fields[key].value?.trim()) {
+        if (fields[key].isRequired && typeof fields[key].value === 'string' && !(fields[key].value as string)?.trim()) {
           return false;
         }
       }
diff --git a/src/utils/patchHelper.ts b/src/utils/patchHelper.ts
index 3fe5e3d3..957dabbf 100644
--- a/src/utils/patchHelper.ts
+++ b/src/utils/patchHelper.ts
@@ -9,8 +9,8 @@ import { IFields } from 'hooks/useForm';
  * @param data - form state
  * @returns Object of non-empty form values
  */
-export const transformFormToValues = (data: IFields): { [key: string]: string | null } => {
-  return Object.fromEntries(Object.entries(data).map(([k, v]) => [k, v.value ? v.value : null]));
+export const transformFormToValues = (data: IFields): { [key: string]: string | boolean | null } => {
+  return Object.fromEntries(Object.entries(data).map(([k, v]) => [k, v.value || v.value === false ? v.value : null]));
 };
 
 // original Angular implementation: