diff --git a/e2e/feed-sources.spec.js b/e2e/feed-sources.spec.js
index d9ceae55f..fe46480cf 100644
--- a/e2e/feed-sources.spec.js
+++ b/e2e/feed-sources.spec.js
@@ -26,8 +26,8 @@ const feedSourcesJson = {
     {
       "@id": "/v2/feed-sources/01JB9MSQEH75HC3GG75XCVP2WH",
       "@type": "FeedSource",
-      title: "Ny feed source test 3",
-      description: "Ny feed source test 3",
+      title: "Ny datakilde test 3",
+      description: "Ny datakilde test 3",
       outputType: "",
       feedType: "App\\Feed\\RssFeedType",
       secrets: [],
@@ -75,7 +75,7 @@ const feedSourcesJson = {
     {
       "@id": "/v2/feed-sources/01JB1DH8G4CXKGX5JRTYDHDPSP",
       "@type": "FeedSource",
-      title: "Calendar feed source test",
+      title: "Calendar datakilde test",
       description: "test",
       outputType: "",
       feedType: "App\\Feed\\CalendarApiFeedType",
@@ -217,8 +217,8 @@ test.describe("fest", () => {
     await page.locator("#login").click();
   });
 
-  test("It loads create feed source page", async ({ page }) => {
-    page.getByText("Opret ny feed source").click();
+  test("It loads create datakilde page", async ({ page }) => {
+    page.getByText("Opret ny datakilde").click();
     await expect(page.locator("#save_feed-source")).toBeVisible();
   });
 
@@ -232,7 +232,7 @@ test.describe("fest", () => {
       };
       await route.fulfill({ status: 500, json });
     });
-    page.getByText("Opret ny feed source").click();
+    page.getByText("Opret ny datakilde").click();
 
     // Displays error toast and stays on page
     await expect(
@@ -251,8 +251,8 @@ test.describe("fest", () => {
     ).toBeVisible();
     await expect(page).toHaveURL(/feed-sources\/create/);
   });
-  test("Cancel create feed source", async ({ page }) => {
-    page.getByText("Opret ny feed source").click();
+  test("Cancel create datakilde", async ({ page }) => {
+    page.getByText("Opret ny datakilde").click();
     await expect(page.locator("#cancel_feed-source")).toBeVisible();
     await page.locator("#cancel_feed-source").click();
     await expect(page.locator("#cancel_feed-source")).not.toBeVisible();
@@ -260,7 +260,7 @@ test.describe("fest", () => {
 });
 
 
-test.describe("Feed source list work", () => {
+test.describe("datakilde list work", () => {
   test.beforeEach(async ({ page }) => {
     await page.goto("/admin/feed-sources/list");
     await page.route("**/token", async (route) => {
@@ -291,7 +291,7 @@ test.describe("Feed source list work", () => {
     await page.locator("#login").click();
   });
 
-  test("It loads feed source list", async ({ page }) => {
+  test("It loads datakilde list", async ({ page }) => {
     await expect(page.locator("table").locator("tbody")).not.toBeEmpty();
     await expect(page.locator("tbody").locator("tr td").first()).toBeVisible();
   });
diff --git a/src/components/feed-sources/feed-source-form.jsx b/src/components/feed-sources/feed-source-form.jsx
index 49e474c19..6ad5746fc 100644
--- a/src/components/feed-sources/feed-source-form.jsx
+++ b/src/components/feed-sources/feed-source-form.jsx
@@ -10,6 +10,9 @@ import FormSelect from "../util/forms/select";
 import ContentBody from "../util/content-body/content-body";
 import ContentFooter from "../util/content-footer/content-footer";
 import FormInput from "../util/forms/form-input";
+import CalendarFeedType from "./templates/calendar-feed-type.jsx";
+import NotifiedFeedType from "./templates/notified-feed-type.jsx";
+import EventDatabaseFeedType from "./templates/event-database-feed-type.jsx";
 
 /**
  * The feed-source form component.
@@ -25,7 +28,6 @@ import FormInput from "../util/forms/form-input";
  *   spinner. Default is `""`
  * @param {object} props.feedSource The feed source object
  * @param {object} props.feedSourceTypeOptions The options for feed source types
- * @param {element} props.dynamicFormElement The dynamic form element
  * @param {string} props.mode The mode
  * @returns {object} The feed-source form.
  */
@@ -37,7 +39,8 @@ function FeedSourceForm({
   loadingMessage = "",
   feedSource = null,
   feedSourceTypeOptions = null,
-  dynamicFormElement = null,
+  onFeedTypeChange = () => {},
+  handleSecretInput = () => {},
   mode = null,
 }) {
   const { t } = useTranslation("common", { keyPrefix: "feed-source-form" });
@@ -67,15 +70,23 @@ function FeedSourceForm({
             onChange={handleInput}
           />
           <FormSelect
-            label={t("feed-source-feed-type-label")}
             name="feedType"
+            label={t("feed-source-feed-type-label")}
             value={feedSource.feedType}
-            onChange={handleInput}
+            onChange={onFeedTypeChange}
             disabled={mode === "PUT"}
             options={feedSourceTypeOptions}
           />
 
-          {dynamicFormElement}
+          {feedSource?.feedType === "App\\Feed\\CalendarApiFeedType" &&
+            (<CalendarFeedType handleInput={handleSecretInput} formStateObject={feedSource.secrets} mode={mode} />)
+          }
+          {feedSource?.feedType === "App\\Feed\\NotifiedFeedType" &&
+            (<NotifiedFeedType handleInput={handleSecretInput} formStateObject={feedSource.secrets} mode={mode} />)
+          }
+          {feedSource?.feedType === "App\\Feed\\EventDatabaseApiFeedType" &&
+            (<EventDatabaseFeedType handleInput={handleSecretInput} formStateObject={feedSource.secrets} mode={mode} />)
+          }
         </ContentBody>
         <ContentFooter>
           <Button
diff --git a/src/components/feed-sources/feed-source-manager.jsx b/src/components/feed-sources/feed-source-manager.jsx
index 75097217b..455b10625 100644
--- a/src/components/feed-sources/feed-source-manager.jsx
+++ b/src/components/feed-sources/feed-source-manager.jsx
@@ -11,9 +11,9 @@ import {
   displayError,
   displaySuccess,
 } from "../util/list/toast-component/display-toast";
-import EventDatabaseApiFeedTypeTemplate from "./feed-source-type-templates/EventDatabaseApiFeedType.template";
-import NotifiedFeedTypeTemplate from "./feed-source-type-templates/NotifiedFeedType.template";
-import CalendarFeedTypeTemplate from "./feed-source-type-templates/CalendarFeedType.template";
+import EventDatabaseFeedType from "./templates/event-database-feed-type.jsx";
+import NotifiedFeedType from "./templates/notified-feed-type.jsx";
+import CalendarFeedType from "./templates/calendar-feed-type.jsx";
 
 /**
  * The theme manager component.
@@ -50,7 +50,7 @@ function FeedSourceManager({
 
   const [dynamicFormElement, setDynamicFormElement] = useState();
   const [submitting, setSubmitting] = useState(false);
-  const [formStateObject, setFormStateObject] = useState();
+  const [formStateObject, setFormStateObject] = useState({});
 
   const [
     postV2FeedSources,
@@ -67,28 +67,31 @@ function FeedSourceManager({
       value: "App\\Feed\\EventDatabaseApiFeedType",
       title: t("dynamic-fields.event-database-api-feed-type.title"),
       key: "1",
-      secrets: "host",
-      template: <EventDatabaseApiFeedTypeTemplate mode={saveMethod} />,
+      secretsDefault: {
+        "host": ""
+      },
     },
     {
       value: "App\\Feed\\NotifiedFeedType",
       title: t("dynamic-fields.notified-feed-type.title"),
       key: "2",
-      secrets: "token",
-      template: <NotifiedFeedTypeTemplate mode={saveMethod} />,
+      secretsDefault: {
+        "token": "",
+      },
     },
     {
       value: "App\\Feed\\CalendarApiFeedType",
       title: t("dynamic-fields.calendar-api-feed-type.title"),
       key: "3",
-      secrets: "resources",
-      template: <CalendarFeedTypeTemplate mode={saveMethod} />,
+      secretsDefault: {
+        "resources": []
+      },
     },
     {
       value: "App\\Feed\\RssFeedType",
       title: t("dynamic-fields.rss-feed-type.title"),
-      key: "5",
-      template: null,
+      key: "4",
+      secretsDefault: {},
     },
   ];
 
@@ -109,46 +112,28 @@ function FeedSourceManager({
     setFormStateObject({ ...initialState });
   }, [initialState]);
 
-  useEffect(() => {
-    if (formStateObject) {
-      const option = feedSourceTypeOptions.find(
-        (opt) => opt.value === formStateObject.feedType
-      );
-      if (option && option.template) {
-        setDynamicFormElement(
-          cloneElement(option.template, {
-            handleInput,
-            formStateObject,
-          })
-        );
-      } else {
-        setDynamicFormElement(null);
-      }
+  const handleSecretInput = ({target}) => {
+    const localFormStateObject = { ...formStateObject };
+    if (!localFormStateObject.secrets) {
+      localFormStateObject.secrets = {};
     }
-  }, [formStateObject]);
+    localFormStateObject.secrets[target.id] = target.value;
+    setFormStateObject(localFormStateObject);
+  };
 
-  useEffect(() => {
-    if (formStateObject?.feedType) {
-      const selectedFeedTypeSecret = feedSourceTypeOptions.find(
-        (option) => option.value === formStateObject.feedType
-      ).secrets;
-
-      if (selectedFeedTypeSecret) {
-        const secretsArray = selectedFeedTypeSecret
-          .split(",")
-          .map((prop) => prop.trim());
-
-        formStateObject.secrets = secretsArray?.reduce((acc, secret) => {
-          acc[secret] = formStateObject[secret];
-          return acc;
-        }, {});
-      }
-    }
-  }, [formStateObject, formStateObject?.feedType]);
+  const onFeedTypeChange = ({target}) => {
+    const value = target.value
+    const option = feedSourceTypeOptions.find((opt) => opt.value === value);
+    const newFormStateObject = {...formStateObject};
+    newFormStateObject.feedType = value;
+    newFormStateObject.secrets = {...option.secretsDefault};
+    setFormStateObject(newFormStateObject);
+  }
 
   /** Save feed source. */
   function saveFeedSource() {
     setLoadingMessage(t("loading-messages.saving-feed-source"));
+
     if (saveMethod === "POST") {
       postV2FeedSources({
         feedSourceFeedSourceInput: JSON.stringify(formStateObject),
@@ -205,6 +190,8 @@ function FeedSourceManager({
           handleSubmit={handleSubmit}
           isLoading={isLoading || submitting}
           loadingMessage={loadingMessage}
+          onFeedTypeChange={onFeedTypeChange}
+          handleSecretInput={handleSecretInput}
           feedSourceTypeOptions={feedSourceTypeOptions}
           dynamicFormElement={dynamicFormElement}
           mode={saveMethod}
diff --git a/src/components/feed-sources/feed-sources-list.jsx b/src/components/feed-sources/feed-sources-list.jsx
index 5d9901e23..3f0021dd6 100644
--- a/src/components/feed-sources/feed-sources-list.jsx
+++ b/src/components/feed-sources/feed-sources-list.jsx
@@ -45,6 +45,7 @@ function FeedSourcesList() {
     page: { get: page },
     createdBy: { get: createdBy },
   } = useContext(ListContext);
+
   const {
     data,
     error: feedSourcesGetError,
@@ -97,6 +98,7 @@ function FeedSourcesList() {
       displayError(t("error-messages.feed-source-delete-error"), isDeleteError);
     }
   }, [isDeleteError]);
+
   const handleDelete = () => {
     setIsDeleting(true);
     setLoadingMessage(t("loading-messages.deleting-feed-source"));
diff --git a/src/components/feed-sources/feed-source-type-templates/CalendarFeedType.template.jsx b/src/components/feed-sources/templates/calendar-feed-type.jsx
similarity index 82%
rename from src/components/feed-sources/feed-source-type-templates/CalendarFeedType.template.jsx
rename to src/components/feed-sources/templates/calendar-feed-type.jsx
index 2a1730f44..275d9a56b 100644
--- a/src/components/feed-sources/feed-source-type-templates/CalendarFeedType.template.jsx
+++ b/src/components/feed-sources/templates/calendar-feed-type.jsx
@@ -3,10 +3,11 @@ import PropTypes from "prop-types";
 import { useTranslation } from "react-i18next";
 import FormInput from "../../util/forms/form-input";
 
-const CalendarFeedTypeTemplate = ({ handleInput, formStateObject, mode }) => {
+const CalendarFeedType = ({ handleInput, formStateObject, mode }) => {
   const { t } = useTranslation("common", {
     keyPrefix: "feed-source-manager.dynamic-fields.calendar-api-feed-type",
   });
+
   return (
     <>
       <FormInput
@@ -25,11 +26,12 @@ const CalendarFeedTypeTemplate = ({ handleInput, formStateObject, mode }) => {
   );
 };
 
-CalendarFeedTypeTemplate.propTypes = {
+CalendarFeedType.propTypes = {
   handleInput: PropTypes.func,
   formStateObject: PropTypes.shape({
     resources: PropTypes.string,
   }),
   mode: PropTypes.string,
 };
-export default CalendarFeedTypeTemplate;
+
+export default CalendarFeedType;
diff --git a/src/components/feed-sources/feed-source-type-templates/EventDatabaseApiFeedType.template.jsx b/src/components/feed-sources/templates/event-database-feed-type.jsx
similarity index 95%
rename from src/components/feed-sources/feed-source-type-templates/EventDatabaseApiFeedType.template.jsx
rename to src/components/feed-sources/templates/event-database-feed-type.jsx
index c04f7515c..d49d3ca17 100644
--- a/src/components/feed-sources/feed-source-type-templates/EventDatabaseApiFeedType.template.jsx
+++ b/src/components/feed-sources/templates/event-database-feed-type.jsx
@@ -21,7 +21,7 @@ const EventDatabaseApiTemplate = ({
             ? t("redacted-value-input-placeholder")
             : ""
         }
-        value={formStateObject.host}
+        value={formStateObject?.host}
       />
     </>
   );
@@ -36,4 +36,5 @@ EventDatabaseApiTemplate.propTypes = {
   }),
   mode: PropTypes.string,
 };
+
 export default EventDatabaseApiTemplate;
diff --git a/src/components/feed-sources/feed-source-type-templates/NotifiedFeedType.template.jsx b/src/components/feed-sources/templates/notified-feed-type.jsx
similarity index 87%
rename from src/components/feed-sources/feed-source-type-templates/NotifiedFeedType.template.jsx
rename to src/components/feed-sources/templates/notified-feed-type.jsx
index bfee25457..091556ce1 100644
--- a/src/components/feed-sources/feed-source-type-templates/NotifiedFeedType.template.jsx
+++ b/src/components/feed-sources/templates/notified-feed-type.jsx
@@ -3,7 +3,7 @@ import PropTypes from "prop-types";
 import { useTranslation } from "react-i18next";
 import FormInput from "../../util/forms/form-input";
 
-const NotifiedFeedTypeTemplate = ({
+const NotifiedFeedType = ({
   handleInput,
   formStateObject,
   mode,
@@ -11,6 +11,7 @@ const NotifiedFeedTypeTemplate = ({
   const { t } = useTranslation("common", {
     keyPrefix: "feed-source-manager.dynamic-fields.notified-feed-type",
   });
+
   return (
     <>
       <FormInput
@@ -29,11 +30,12 @@ const NotifiedFeedTypeTemplate = ({
   );
 };
 
-NotifiedFeedTypeTemplate.propTypes = {
+NotifiedFeedType.propTypes = {
   handleInput: PropTypes.func,
   formStateObject: PropTypes.shape({
     token: PropTypes.string,
   }),
   mode: PropTypes.string,
 };
-export default NotifiedFeedTypeTemplate;
+
+export default NotifiedFeedType;
diff --git a/src/translations/da/common.json b/src/translations/da/common.json
index 11a2ac015..4cbc85ad5 100644
--- a/src/translations/da/common.json
+++ b/src/translations/da/common.json
@@ -227,40 +227,37 @@
     "create-new-theme": "Opret nyt tema"
   },
   "feed-sources-list": {
-    "header": "Feed sources",
-    "create-new-feed-source": "Opret ny feed source",
-    "number-of-slides": "Slides tilknyttede",
+    "header": "Datakilder",
+    "number-of-slides": "Tilkoblede slides",
+    "create-new-feed-source": "Opret ny datakilde",
     "loading-messages": {
-      "deleting-feed-source": "Sletter feed source(s)",
-      "loading-feed-sources": "Henter feed sources"
+      "deleting-feed-source": "Sletter datakilde(r)",
+      "loading-feed-sources": "Henter datakilder"
     },
     "error-messages": {
-      "feed-source-delete-error": "Der skete en fejl da feed sourcen skulle slettes:"
+      "feed-source-delete-error": "Der skete en fejl da datakilden skulle slettes:"
     },
     "success-messages": {
-      "feed-source-delete": "Feed sourcen er blevet slettet"
+      "feed-source-delete": "Datakilden er blevet slettet"
     },
     "columns": {
       "feed-type": "Type"
     },
     "info-modal": {
-      "slides": "Feed sourcen er tilknyttet følgende slides"
+      "slides": "Datakilde er tilknyttet følgende slides"
     }
   },
   "feed-source-manager": {
-    "edit-feed-source": "Rediger følgende feed source",
-    "create-new-feed-source": "Opret ny feed source",
+    "edit-feed-source": "Rediger følgende datakilde",
+    "create-new-feed-source": "Opret ny datakilde",
     "loading-messages": {
-      "loading-feed-source": "Henter feed source",
-      "saving-feed-source": "Gemmer feed source",
-      "saving-media": "Mediet bliver gemt"
+      "loading-feed-source": "Henter datakilde",
+      "saving-feed-source": "Gemmer datakilde"
     },
     "success-messages": {
-      "saved-media": "Mediet er gemt",
       "saved-feed-source": "Feed source er gemt"
     },
     "error-messages": {
-      "save-media-error": "Der skete en fejl da mediet skulle gemmes:",
       "save-feed-source-error": "Der skete en fejl da feed source skulle gemmes:",
       "load-feed-source-error": "Der skete en fejl da feed source med følgende id: {{id}} skulle hentes:"
     },
@@ -271,7 +268,7 @@
         "redacted-value-input-placeholder": "Skjult værdi"
       },
       "notified-feed-type": {
-        "title": "Notified feed",
+        "title": "Notified",
         "token": "Notified API token",
         "redacted-value-input-placeholder": "Skjult værdi"
       },
@@ -286,13 +283,10 @@
     }
   },
   "feed-source-form": {
-    "logo-title": "Tilføj logo til feed source",
-    "feed-source-name-label": "Feed source navn",
-    "feed-source-description-label": "Feed source beskrivelse",
-    "feed-source-feed-type-label": "Feed source type",
-    "feed-source-supported-feed-output-type-label": "Feed output type",
-    "feed-source-css-label": "Feed source CSS",
-    "save-button": "Gem feed source",
+    "feed-source-name-label": "Navn",
+    "feed-source-description-label": "Beskrivelse",
+    "feed-source-feed-type-label": "Type",
+    "save-button": "Gem datakilde",
     "cancel-button": "Annuller"
   },
   "media-list": {
@@ -799,7 +793,7 @@
     "configuration-themes": "Temaer",
     "configuration-users": "Brugere",
     "activation-codes": "Aktiveringskoder",
-    "configuration-feedsources": "Feed sources"
+    "configuration-feedsources": "Datakilde"
   },
   "topbar": {
     "brand": "OS2Display",