diff --git a/src/app/[orgId]/settings/clients/machine/create/page.tsx b/src/app/[orgId]/settings/clients/machine/create/page.tsx
index f1c231a0..3971fb74 100644
--- a/src/app/[orgId]/settings/clients/machine/create/page.tsx
+++ b/src/app/[orgId]/settings/clients/machine/create/page.tsx
@@ -426,32 +426,32 @@ export default function Page() {
                                                 )}
                                             />
 
-                                            <FormField
-                                                control={form.control}
-                                                name="subnet"
-                                                render={({ field }) => (
-                                                    <FormItem>
-                                                        <FormLabel>
-                                                            {t("address")}
-                                                        </FormLabel>
-                                                        <FormControl>
-                                                            <Input
-                                                                autoComplete="off"
-                                                                placeholder={t(
-                                                                    "subnetPlaceholder"
-                                                                )}
-                                                                {...field}
-                                                            />
-                                                        </FormControl>
-                                                        <FormMessage />
-                                                        <FormDescription>
-                                                            {t(
-                                                                "addressDescription"
-                                                            )}
-                                                        </FormDescription>
-                                                    </FormItem>
-                                                )}
-                                            />
+                                            {/* <FormField */}
+                                            {/*     control={form.control} */}
+                                            {/*     name="subnet" */}
+                                            {/*     render={({ field }) => ( */}
+                                            {/*         <FormItem> */}
+                                            {/*             <FormLabel> */}
+                                            {/*                 {t("address")} */}
+                                            {/*             </FormLabel> */}
+                                            {/*             <FormControl> */}
+                                            {/*                 <Input */}
+                                            {/*                     autoComplete="off" */}
+                                            {/*                     placeholder={t( */}
+                                            {/*                         "subnetPlaceholder" */}
+                                            {/*                     )} */}
+                                            {/*                     {...field} */}
+                                            {/*                 /> */}
+                                            {/*             </FormControl> */}
+                                            {/*             <FormMessage /> */}
+                                            {/*             <FormDescription> */}
+                                            {/*                 {t( */}
+                                            {/*                     "addressDescription" */}
+                                            {/*                 )} */}
+                                            {/*             </FormDescription> */}
+                                            {/*         </FormItem> */}
+                                            {/*     )} */}
+                                            {/* /> */}
 
                                             {/* <FormField */}
                                             {/*     control={form.control} */}
diff --git a/src/app/[orgId]/settings/sites/create/page.tsx b/src/app/[orgId]/settings/sites/create/page.tsx
index 740644d5..6866025e 100644
--- a/src/app/[orgId]/settings/sites/create/page.tsx
+++ b/src/app/[orgId]/settings/sites/create/page.tsx
@@ -708,7 +708,7 @@ WantedBy=default.target`
                                                     </FormItem>
                                                 )}
                                             />
-                                            {form.watch("method") ===
+                                            {/*form.watch("method") ===
                                                 "newt" && (
                                                 <FormField
                                                     control={form.control}
@@ -751,36 +751,31 @@ WantedBy=default.target`
                                                         </FormItem>
                                                     )}
                                                 />
-                                            )}
+                                            )*/}
                                         </form>
                                     </Form>
                                 </SettingsSectionForm>
+
+                                {tunnelTypes.length > 1 && (
+                                    <>
+                                        <div className="mb-2">
+                                            <span>{t("type")}</span>
+                                        </div>
+                                        <StrategySelect
+                                            options={tunnelTypes}
+                                            defaultValue={form.getValues(
+                                                "method"
+                                            )}
+                                            onChange={(value) => {
+                                                form.setValue("method", value);
+                                            }}
+                                            cols={3}
+                                        />
+                                    </>
+                                )}
                             </SettingsSectionBody>
                         </SettingsSection>
 
-                        {tunnelTypes.length > 1 && (
-                            <SettingsSection>
-                                <SettingsSectionHeader>
-                                    <SettingsSectionTitle>
-                                        {t("tunnelType")}
-                                    </SettingsSectionTitle>
-                                    <SettingsSectionDescription>
-                                        {t("siteTunnelDescription")}
-                                    </SettingsSectionDescription>
-                                </SettingsSectionHeader>
-                                <SettingsSectionBody>
-                                    <StrategySelect
-                                        options={tunnelTypes}
-                                        defaultValue={form.getValues("method")}
-                                        onChange={(value) => {
-                                            form.setValue("method", value);
-                                        }}
-                                        cols={3}
-                                    />
-                                </SettingsSectionBody>
-                            </SettingsSection>
-                        )}
-
                         {form.watch("method") === "newt" && (
                             <>
                                 <SettingsSection>