diff --git a/.env.cec-euprd b/.env.cec-euprd
index 5fb535f..59f77ea 100644
--- a/.env.cec-euprd
+++ b/.env.cec-euprd
@@ -8,3 +8,4 @@ REACT_APP_OTA_SERVICE_URL=https://gw.cec-euprd.fiskerinc.com/ota_update
 REACT_APP_SECURITY_DLL_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_32.dll
 REACT_APP_SECURITY_DLL_64_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_64.dll
 REACT_APP_SUPERSET_URL=https://superset.cec-euprd.fiskerinc.com
+REACT_APP_ECCKEY_ENV=
\ No newline at end of file
diff --git a/.env.cec-prd b/.env.cec-prd
index 67d8f04..5815d26 100644
--- a/.env.cec-prd
+++ b/.env.cec-prd
@@ -8,3 +8,4 @@ REACT_APP_OTA_SERVICE_URL=https://gw.cec-prd.fiskerinc.com/ota_update
 REACT_APP_SECURITY_DLL_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_32.dll
 REACT_APP_SECURITY_DLL_64_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_64.dll
 REACT_APP_SUPERSET_URL=https://superset.cec-prd.fiskerinc.com
+REACT_APP_ECCKEY_ENV=
\ No newline at end of file
diff --git a/.env.dev b/.env.dev
index c2e91da..274a799 100644
--- a/.env.dev
+++ b/.env.dev
@@ -8,3 +8,4 @@ REACT_APP_OTA_SERVICE_URL=https://dev-gw.cloud.fiskerinc.com/ota_update
 REACT_APP_SECURITY_DLL_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_32.dll
 REACT_APP_SECURITY_DLL_64_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_64.dll
 REACT_APP_SUPERSET_URL=https://dev-superset-new.cloud.fiskerinc.com
+REACT_APP_ECCKEY_ENV=stage,prod
\ No newline at end of file
diff --git a/.env.local b/.env.local
index 3656474..8fa46ee 100644
--- a/.env.local
+++ b/.env.local
@@ -8,4 +8,4 @@ REACT_APP_OTA_SERVICE_URL=http://localhost/ota_update
 REACT_APP_SECURITY_DLL_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_32.dll
 REACT_APP_SECURITY_DLL_64_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_64.dll
 REACT_APP_SUPERSET_URL=https://dev-superset-new.cloud.fiskerinc.com
-
+REACT_APP_ECCKEY_ENV=dev,stage,prod
diff --git a/.env.prd b/.env.prd
index f075c03..663a705 100644
--- a/.env.prd
+++ b/.env.prd
@@ -8,3 +8,4 @@ REACT_APP_OTA_SERVICE_URL=https://gw.cloud.fiskerinc.com/ota_update
 REACT_APP_SECURITY_DLL_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_32.dll
 REACT_APP_SECURITY_DLL_64_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_64.dll
 REACT_APP_SUPERSET_URL=https://superset.cloud.fiskerinc.com
+REACT_APP_ECCKEY_ENV=stage
\ No newline at end of file
diff --git a/.env.stg b/.env.stg
index ad05398..7338e53 100644
--- a/.env.stg
+++ b/.env.stg
@@ -8,3 +8,4 @@ REACT_APP_OTA_SERVICE_URL=https://stg-gw.cloud.fiskerinc.com/ota_update
 REACT_APP_SECURITY_DLL_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_32.dll
 REACT_APP_SECURITY_DLL_64_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_64.dll
 REACT_APP_SUPERSET_URL=https://stg-superset.cloud.fiskerinc.com
+REACT_APP_ECCKEY_ENV=prod
\ No newline at end of file
diff --git a/.env.template b/.env.template
index e42e4fd..968195b 100644
--- a/.env.template
+++ b/.env.template
@@ -8,3 +8,4 @@ REACT_APP_OTA_SERVICE_URL=http://localhost/ota_update
 REACT_APP_SECURITY_DLL_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_32.dll
 REACT_APP_SECURITY_DLL_64_URL=https://assets.fiskerdps.com/cloud-supplier/fisker_security_64.dll
 REACT_APP_SUPERSET_URL=https://dev-superset.cloud.fiskerinc.com
+REACT_APP_ECCKEY_ENV=dev,stage,prod
\ No newline at end of file
diff --git a/src/components/Manifest/Update/__snapshots__/index.test.jsx.snap b/src/components/Manifest/Update/__snapshots__/index.test.jsx.snap
index fa51235..9874fa0 100644
--- a/src/components/Manifest/Update/__snapshots__/index.test.jsx.snap
+++ b/src/components/Manifest/Update/__snapshots__/index.test.jsx.snap
@@ -218,6 +218,122 @@ exports[`Manifest Details Component Render 1`] = `
                 </fieldset>
               </div>
             </div>
+            <div
+              class="MuiFormControl-root MuiFormControl-marginNormal"
+            >
+              <label
+                class="MuiFormLabel-root MuiInputLabel-root makeStyles-whiteBackground-0 MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-outlined"
+                data-shrink="false"
+              >
+                Rollback
+              </label>
+              <div
+                class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-formControl"
+              >
+                <select
+                  aria-invalid="false"
+                  class="MuiSelect-root MuiSelect-select MuiSelect-outlined MuiInputBase-input MuiOutlinedInput-input"
+                >
+                  <option
+                    value="true"
+                  >
+                    True
+                  </option>
+                  <option
+                    value="false"
+                  >
+                    False
+                  </option>
+                </select>
+                <svg
+                  aria-hidden="true"
+                  class="MuiSvgIcon-root MuiSelect-icon MuiSelect-iconOutlined"
+                  focusable="false"
+                  viewBox="0 0 24 24"
+                >
+                  <path
+                    d="M7 10l5 5 5-5z"
+                  />
+                </svg>
+                <fieldset
+                  aria-hidden="true"
+                  class="PrivateNotchedOutline-root-0 MuiOutlinedInput-notchedOutline"
+                  style="padding-left: 8px;"
+                >
+                  <legend
+                    class="PrivateNotchedOutline-legend-0"
+                    style="width: 0.01px;"
+                  >
+                    <span>
+                      ​
+                    </span>
+                  </legend>
+                </fieldset>
+              </div>
+            </div>
+            <div
+              class="MuiFormControl-root MuiFormControl-marginNormal"
+            >
+              <label
+                class="MuiFormLabel-root MuiInputLabel-root makeStyles-whiteBackground-0 MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled"
+                data-shrink="true"
+              >
+                ECC Keys
+              </label>
+              <div
+                class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-formControl"
+              >
+                <select
+                  aria-invalid="false"
+                  class="MuiSelect-root MuiSelect-select MuiSelect-outlined MuiInputBase-input MuiOutlinedInput-input"
+                >
+                  <option
+                    value="current"
+                  >
+                    local
+                  </option>
+                  <option
+                    value="dev"
+                  >
+                    dev
+                  </option>
+                  <option
+                    value="stage"
+                  >
+                    stage
+                  </option>
+                  <option
+                    value="prod"
+                  >
+                    prod
+                  </option>
+                </select>
+                <svg
+                  aria-hidden="true"
+                  class="MuiSvgIcon-root MuiSelect-icon MuiSelect-iconOutlined"
+                  focusable="false"
+                  viewBox="0 0 24 24"
+                >
+                  <path
+                    d="M7 10l5 5 5-5z"
+                  />
+                </svg>
+                <fieldset
+                  aria-hidden="true"
+                  class="PrivateNotchedOutline-root-0 MuiOutlinedInput-notchedOutline"
+                  style="padding-left: 8px;"
+                >
+                  <legend
+                    class="PrivateNotchedOutline-legend-0"
+                    style="width: 0.01px;"
+                  >
+                    <span>
+                      ​
+                    </span>
+                  </legend>
+                </fieldset>
+              </div>
+            </div>
             <button
               aria-label="send command"
               class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-0 MuiButton-containedPrimary MuiButton-fullWidth"
diff --git a/src/components/Manifest/Update/index.jsx b/src/components/Manifest/Update/index.jsx
index b8a4565..704b6e6 100644
--- a/src/components/Manifest/Update/index.jsx
+++ b/src/components/Manifest/Update/index.jsx
@@ -2,6 +2,7 @@ import { Button, FormControl, TextField } from "@material-ui/core";
 import React, { useEffect, useState } from "react";
 import { Redirect } from "react-router";
 import { useParams } from "react-router-dom";
+import { ENVS } from "../../../utils/key-envs";
 import { ManifestsProvider, useManifestsContext } from "../../Contexts/ManifestsContext";
 import { useStatusContext } from "../../Contexts/StatusContext";
 import { useUserContext } from "../../Contexts/UserContext";
@@ -18,6 +19,11 @@ const activeStates = [
   {value: false, label: "Archived" },
 ];
 
+const booleanStates = [
+  {value: true, label: "True" },
+  {value: false, label: "False" },
+];
+
 const emptyManifest = {
   name: "",
   version: "",
@@ -43,7 +49,8 @@ const MainForm = () => {
   const [name, setName] = useState("");
   const [type, setType] = useState("");
   const [active, setActive] = useState(true); // So !active = archived
-
+  const [rollback, setRollback] = useState(true);
+  const [env, setEnv] = useState("current");
 
   const changeName = (e) => {
     setName(e.target.value);
@@ -57,10 +64,18 @@ const MainForm = () => {
     setActive(e.target.value === 'true')
   }
 
+  const changeRollback = (e) => {
+    setRollback(e.target.value === 'true')
+  }
+
+  const changeEnv = (e) => {
+    setEnv(e.target.value)
+  }
+
   const onSubmit = async (e) => {
     e.preventDefault();
     try {
-      const result = await updateManifest(manifest_id, { name, type, active }, token);
+      const result = await updateManifest(manifest_id, { name, type, active, rollback, env }, token);
       if (!result || result.error) return;
 
       setMessage(`Updated manifest ${manifest_id}`);
@@ -81,7 +96,9 @@ const MainForm = () => {
           setManifest(result);
           setName(result.name);
           setType(result.type);
-          setActive(result.active)
+          setActive(result.active);
+          setRollback(result.rollback);
+          setEnv(result.env ?? "current");
         }
       } catch (e) {
         setMessage(e.message);
@@ -146,6 +163,10 @@ const MainForm = () => {
         />
         <DropDownList label="Type" data={manifestTypes} classes={classes} onChange={changeType} value={type} />
         <DropDownList label="Active" data={activeStates} classes={classes} onChange={changeActive} value={active}/>
+        <DropDownList label="Rollback" data={booleanStates} classes={classes} onChange={changeRollback} value={rollback}/>
+        {
+          ENVS.length > 1 && <DropDownList label="ECC Keys" data={ENVS} classes={classes} onChange={changeEnv} value={env}/>
+        }
         <Button
           type="submit"
           aria-label="send command"
diff --git a/src/utils/key-envs.js b/src/utils/key-envs.js
new file mode 100644
index 0000000..8ea9c87
--- /dev/null
+++ b/src/utils/key-envs.js
@@ -0,0 +1,35 @@
+const KEY_ENVS = process.env.REACT_APP_ECCKEY_ENV;
+const ENV = process.env.REACT_APP_ENV;
+
+export const CURRENT_ENV = "current";
+
+const GetEnvName = (value) => {
+  if (value === "cec-prd" || value === "cec-euprd") return "prd";
+  return value;
+}
+
+const MakeList = () => {
+  const result = [];
+  const list = KEY_ENVS.split(",");
+
+  list.forEach((env) => {
+    if (env.length > 0) result.push({
+      value: env,
+      label: env,
+    })
+  })
+result.unshift({
+    value: CURRENT_ENV,
+    label: GetEnvName(ENV),
+  });
+
+  return result;
+}
+
+export const GetEnvValue = (value) => {
+  if (value === ENV) return CURRENT_ENV;
+  return value;
+}
+
+
+export const ENVS = MakeList();