diff --git a/src/components/Connections/ConnectionForm.tsx b/src/components/Connections/ConnectionForm.tsx
index ad0267f77..ec7eb0c7f 100644
--- a/src/components/Connections/ConnectionForm.tsx
+++ b/src/components/Connections/ConnectionForm.tsx
@@ -6,10 +6,11 @@ import { useMemo } from "react";
 import { FaSpinner, FaTrash } from "react-icons/fa";
 import { Button } from "../../ui/Buttons/Button";
 import { AuthorizationAccessCheck } from "../Permissions/AuthorizationAccessCheck";
+import CanEditResource from "../Settings/CanEditResource";
 import { Connection } from "./ConnectionFormModal";
+import { ConnectionType, connectionTypes } from "./connectionTypes";
 import RenderConnectionFormFields from "./RenderConnectionFormFields";
 import { TestConnection } from "./TestConnection";
-import { ConnectionType, connectionTypes } from "./connectionTypes";
 
 interface ConnectionFormProps {
   connectionType: ConnectionType;
@@ -138,44 +139,74 @@ export function ConnectionForm({
             </div>
           </div>
           <div className="flex items-center gap-2 rounded-lg bg-gray-100 px-5 py-4">
-            {formValue?.id && (
-              <AuthorizationAccessCheck
-                resource={tables.connections}
-                action="write"
-              >
+            <div className="flex flex-1 gap-2">
+              {connectionType && !formValue?.id && (
                 <Button
-                  text="Delete"
-                  icon={<FaTrash />}
-                  onClick={handleDelete}
-                  className="btn-danger"
+                  text="Back"
+                  onClick={handleBack}
+                  className="btn-secondary"
                 />
-              </AuthorizationAccessCheck>
-            )}
-            {connectionType && !formValue?.id && (
-              <button
-                className={clsx("btn-secondary-base btn-secondary")}
-                type="button"
-                onClick={handleBack}
-              >
-                Back
-              </button>
-            )}
-            <div className="flex flex-1 justify-end gap-2">
-              {formValue?.id && <TestConnection connectionId={formValue.id} />}
+              )}
+
+              {formValue?.id && (
+                <AuthorizationAccessCheck
+                  resource={tables.connections}
+                  action="write"
+                >
+                  <CanEditResource
+                    id={formValue?.id}
+                    namespace={formValue?.namespace}
+                    name={formValue?.name}
+                    resourceType={"connections"}
+                    source={formValue?.source}
+                    hideSourceLink
+                    className="flex flex-row gap-2"
+                  >
+                    <Button
+                      text="Delete"
+                      icon={<FaTrash />}
+                      onClick={handleDelete}
+                      className="btn-danger"
+                    />
+                  </CanEditResource>
+                </AuthorizationAccessCheck>
+              )}
+              {/* We want to push test connection next to save button, if we have delete and update buttons */}
+              {(formValue?.source === "UI" || !formValue?.source) && (
+                <div className="flex-1" />
+              )}
+              {formValue?.id && (
+                <>
+                  <TestConnection connectionId={formValue.id} />
+                  {/* We want to show Test Connection Button at the start, we we won't show delete button */}
+                  {formValue.source !== "UI" && formValue.source && (
+                    <div className="flex-1" />
+                  )}
+                </>
+              )}
               <AuthorizationAccessCheck
                 resource={tables.connections}
                 action="write"
               >
-                <Button
-                  type="submit"
-                  icon={
-                    isSubmitting ? (
-                      <FaSpinner className="animate-spin" />
-                    ) : undefined
-                  }
-                  text={Boolean(formValue?.id) ? "Update" : "Save"}
-                  className="btn-primary"
-                />
+                <CanEditResource
+                  id={formValue?.id}
+                  namespace={formValue?.namespace}
+                  name={formValue?.name}
+                  resourceType={"connections"}
+                  source={formValue?.source}
+                  className="flex flex-row gap-2"
+                >
+                  <Button
+                    type="submit"
+                    icon={
+                      isSubmitting ? (
+                        <FaSpinner className="animate-spin" />
+                      ) : undefined
+                    }
+                    text={Boolean(formValue?.id) ? "Update" : "Save"}
+                    className="btn-primary"
+                  />
+                </CanEditResource>
               </AuthorizationAccessCheck>
             </div>
           </div>
diff --git a/src/components/Connections/ConnectionFormModal.tsx b/src/components/Connections/ConnectionFormModal.tsx
index b4134ec37..8db2a6dd4 100644
--- a/src/components/Connections/ConnectionFormModal.tsx
+++ b/src/components/Connections/ConnectionFormModal.tsx
@@ -54,6 +54,7 @@ export type Connection = {
   properties?: Record<string, any>;
   ref?: string;
   namespace?: string;
+  source?: string;
 };
 
 type ConnectionFormProps = React.HTMLProps<HTMLDivElement> & {
diff --git a/src/components/Forms/SpecEditorForm.tsx b/src/components/Forms/SpecEditorForm.tsx
index f7f68d126..187770f95 100644
--- a/src/components/Forms/SpecEditorForm.tsx
+++ b/src/components/Forms/SpecEditorForm.tsx
@@ -219,7 +219,15 @@ export default function SpecEditorForm({
                 agentId={initialValues.agent_details?.id}
                 agentName={initialValues.agent_details?.name}
                 source={initialValues.source}
-                onBack={onBack}
+                extraButtons={
+                  onBack && (
+                    <Button
+                      text="Back"
+                      onClick={onBack}
+                      className="btn-secondary"
+                    />
+                  )
+                }
               >
                 {!!initialValues.id && (
                   <DeleteResource
diff --git a/src/components/Integrations/Topology/TopologyResourceForm.tsx b/src/components/Integrations/Topology/TopologyResourceForm.tsx
index 9f80a3ac7..1084811a0 100644
--- a/src/components/Integrations/Topology/TopologyResourceForm.tsx
+++ b/src/components/Integrations/Topology/TopologyResourceForm.tsx
@@ -140,7 +140,15 @@ export default function TopologyResourceForm({
                   name={topology?.name!}
                   agentId={topology?.agent?.id}
                   agentName={topology?.agent?.name}
-                  onBack={onBack}
+                  extraButtons={
+                    onBack && (
+                      <Button
+                        text="Back"
+                        onClick={onBack}
+                        className="btn-secondary"
+                      />
+                    )
+                  }
                 >
                   {!!topology?.id && (
                     <>
diff --git a/src/components/Notifications/NotificationsForm.tsx b/src/components/Notifications/NotificationsForm.tsx
index 1c26cc334..48240e0c9 100644
--- a/src/components/Notifications/NotificationsForm.tsx
+++ b/src/components/Notifications/NotificationsForm.tsx
@@ -7,6 +7,7 @@ import FormikNotificationsTemplateField from "../Forms/Formik/FormikNotification
 import FormikTextInput from "../Forms/Formik/FormikTextInput";
 import NotificationsRecipientsTabs from "../Forms/Notifications/NotificationsRecipientsTabs";
 import DeleteResource from "../SchemaResourcePage/Delete/DeleteResource";
+import CanEditResource from "../Settings/CanEditResource";
 import { Notification } from "./notificationsTableColumns";
 
 type NotificationsFormProps = {
@@ -74,26 +75,33 @@ export default function NotificationsForm({
               />
             </div>
             <div className="flex flex-row rounded-b-md bg-gray-100 p-4">
-              <div className="flex flex-1 flex-row justify-end space-x-4">
-                {!!notification && (
-                  <DeleteResource
-                    resourceId={notification.id}
-                    resourceInfo={{
-                      table: "notifications",
-                      name: "Notifications",
-                      api: "config-db"
-                    }}
-                    onDeleted={onDeleted}
-                  />
-                )}
-                {(notification?.source === "UI" || !notification?.source) && (
-                  <Button
-                    type="submit"
-                    text={!!notification ? "Update" : "Save"}
-                    className="btn-primary"
-                  />
-                )}
-              </div>
+              <CanEditResource
+                id={notification?.id}
+                resourceType={"notifications"}
+                source={notification?.source}
+              >
+                <div className="flex flex-1 flex-row justify-end space-x-4">
+                  {!!notification && (
+                    <DeleteResource
+                      resourceId={notification.id}
+                      resourceInfo={{
+                        table: "notifications",
+                        name: "Notifications",
+                        api: "config-db"
+                      }}
+                      onDeleted={onDeleted}
+                    />
+                  )}
+                  <div className="flex-1" />
+                  {(notification?.source === "UI" || !notification?.source) && (
+                    <Button
+                      type="submit"
+                      text={!!notification ? "Update" : "Save"}
+                      className="btn-primary"
+                    />
+                  )}
+                </div>
+              </CanEditResource>
             </div>
           </Form>
         )}
diff --git a/src/components/Settings/CRDSource.tsx b/src/components/Settings/CRDSource.tsx
index 0f6a792c8..64cb7f21c 100644
--- a/src/components/Settings/CRDSource.tsx
+++ b/src/components/Settings/CRDSource.tsx
@@ -2,11 +2,12 @@ import { Link } from "react-router-dom";
 import { Icon } from "../../ui/Icons/Icon";
 
 type CRDSourceProps = {
-  id: string;
-  namespace: string;
-  name: string;
+  id?: string;
+  namespace?: string;
+  name?: string;
   source?: string;
   showMinimal?: boolean;
+  hideSourceLink?: boolean;
 };
 
 export default function CRDSource({
@@ -14,9 +15,17 @@ export default function CRDSource({
   name,
   namespace,
   source,
-  showMinimal = false
+  showMinimal = false,
+  hideSourceLink = false
 }: CRDSourceProps) {
-  if (source?.toLowerCase() !== "KubernetesCRD".toLowerCase()) {
+  if (
+    source?.toLowerCase() !== "KubernetesCRD".toLowerCase() &&
+    !source?.toLowerCase().startsWith("kubernetes")
+  ) {
+    return null;
+  }
+
+  if (hideSourceLink) {
     return null;
   }
 
@@ -33,16 +42,27 @@ export default function CRDSource({
       ) : (
         <>
           <Icon name="k8s" />
-          <span> CRD linked to</span>{" "}
-          <Link
-            to={`/catalog/${id}`}
-            className="cursor-pointer text-blue-500 underline"
-          >
-            <span>
-              {namespace ? <>{namespace}/</> : ""}
-              {name}
-            </span>
-          </Link>
+          {name ? (
+            <>
+              <span> CRD linked to</span>{" "}
+              <Link
+                to={`/catalog/${id}`}
+                className="cursor-pointer text-blue-500 underline"
+              >
+                <span>
+                  {namespace ? <>{namespace}/</> : ""}
+                  {name}
+                </span>
+              </Link>
+            </>
+          ) : (
+            <Link
+              to={`/catalog/${id}`}
+              className="cursor-pointer text-blue-500 underline"
+            >
+              Linked to CRD
+            </Link>
+          )}
         </>
       )}
     </div>
diff --git a/src/components/Settings/CanEditResource.tsx b/src/components/Settings/CanEditResource.tsx
index 5d84423f6..b4155bb7b 100644
--- a/src/components/Settings/CanEditResource.tsx
+++ b/src/components/Settings/CanEditResource.tsx
@@ -1,4 +1,3 @@
-import { Button } from "@flanksource-ui/ui/Buttons/Button";
 import { Link } from "react-router-dom";
 import { SchemaResourceType } from "../SchemaResourcePage/resourceTypes";
 import CRDSource from "./CRDSource";
@@ -11,9 +10,11 @@ type CanEditResourceProps = {
   agentId?: string;
   agentName?: string;
   children: React.ReactNode;
-  id: string;
-  namespace: string;
-  name: string;
+  id?: string;
+  namespace?: string;
+  name?: string;
+  // do not render alternate content, if crd
+  hideSourceLink?: boolean;
 };
 
 export function CanEditResourceInner({
@@ -22,6 +23,7 @@ export function CanEditResourceInner({
   agentId,
   agentName,
   children,
+  hideSourceLink = false,
   ...props
 }: CanEditResourceProps) {
   // if Agent isn't local, we can't edit it
@@ -29,6 +31,10 @@ export function CanEditResourceInner({
     agentId !== "00000000-0000-0000-0000-000000000000" &&
     agentId !== undefined
   ) {
+    if (hideSourceLink) {
+      return null;
+    }
+
     return (
       <div className="flex flex-row items-center gap-1">
         <span>Linked to </span>{" "}
@@ -43,14 +49,23 @@ export function CanEditResourceInner({
   }
 
   if (source?.startsWith("component")) {
+    if (hideSourceLink) {
+      return null;
+    }
     return <ComponentResourceSource source={source} />;
   }
 
   if (source?.startsWith("kubernetes")) {
+    if (hideSourceLink) {
+      return null;
+    }
     return <CatalogResourceSource source={source} />;
   }
 
   if (source === "ConfigFile") {
+    if (hideSourceLink) {
+      return null;
+    }
     return (
       <div className="flex justify-end p-2">
         <div className="flex flex-row items-center gap-1">
@@ -61,7 +76,9 @@ export function CanEditResourceInner({
   }
 
   if (source && source !== "UI") {
-    return <CRDSource source={source!} {...props} />;
+    return (
+      <CRDSource source={source!} hideSourceLink={hideSourceLink} {...props} />
+    );
   }
 
   // eslint-disable-next-line react/jsx-no-useless-fragment
@@ -69,23 +86,16 @@ export function CanEditResourceInner({
 }
 
 export default function CanEditResource({
-  onBack,
+  extraButtons,
+  className = "flex flex-1 flex-row justify-end gap-2",
   ...props
 }: CanEditResourceProps & {
-  onBack?: () => void;
+  className?: string;
+  extraButtons?: React.ReactNode;
 }) {
   return (
-    <div className="flex flex-1 flex-row justify-end gap-2">
-      <div className="flex flex-1">
-        {onBack && (
-          <Button
-            type="button"
-            text="Back"
-            className="btn-default btn-btn-secondary-base btn-secondary"
-            onClick={onBack}
-          />
-        )}
-      </div>
+    <div className={className}>
+      {extraButtons && <div className="flex-1">{extraButtons}</div>}
       <CanEditResourceInner {...props} />
     </div>
   );