diff --git a/public/version.json b/public/version.json
index dba87fa5d4c8..b2e85d7083a9 100644
--- a/public/version.json
+++ b/public/version.json
@@ -1,3 +1,3 @@
 {
-  "version": "7.0.5"
+  "version": "7.1.0"
 }
diff --git a/src/components/CippFormPages/CippSchedulerForm.jsx b/src/components/CippFormPages/CippSchedulerForm.jsx
index 3049dba77660..e18e9c57421a 100644
--- a/src/components/CippFormPages/CippSchedulerForm.jsx
+++ b/src/components/CippFormPages/CippSchedulerForm.jsx
@@ -120,7 +120,12 @@ const CippSchedulerForm = (props) => {
         <Skeleton width={"100%"} />
       )}
       <Grid item xs={12} md={12}>
-        <CippFormTenantSelector label="Select a Tenant" formControl={formControl} type="single" />
+        <CippFormTenantSelector
+          label="Select a Tenant"
+          formControl={formControl}
+          type="single"
+          allTenants={true}
+        />
       </Grid>
 
       <Grid item xs={12} md={12}>
diff --git a/src/pages/endpoint/MEM/list-templates/index.js b/src/pages/endpoint/MEM/list-templates/index.js
index 75e54a4c88bb..e61d3930aedc 100644
--- a/src/pages/endpoint/MEM/list-templates/index.js
+++ b/src/pages/endpoint/MEM/list-templates/index.js
@@ -1,12 +1,35 @@
 import { Layout as DashboardLayout } from "/src/layouts/index.js";
 import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx";
-import { EyeIcon, TrashIcon } from "@heroicons/react/24/outline";
+import { EyeIcon, PencilIcon, TrashIcon } from "@heroicons/react/24/outline";
 import CippJsonView from "../../../../components/CippFormPages/CippJSONView";
 
 const Page = () => {
   const pageTitle = "Available Endpoint Manager Templates";
 
   const actions = [
+    {
+      label: "Edit Template Name and Description",
+      type: "POST",
+      url: "/api/ExecEditTemplate",
+      fields: [
+        {
+          type: "textField",
+          name: "displayName",
+          label: "Display Name",
+        },
+        {
+          type: "textField",
+          name: "description",
+          label: "Description",
+        },
+      ],
+      data: { GUID: "GUID", Type: "!IntuneTemplate" },
+      confirmText:
+        "Enter the new name and description for the template. Warning: This will disconnect the template from a template library if applied.",
+      multiPost: false,
+      icon: <PencilIcon />,
+      color: "info",
+    },
     {
       label: "Delete Template",
       type: "GET",