diff --git a/src/components/configure-application-github/index.js b/src/components/configure-application-github/index.js
index c341031f5..2bbd0f644 100644
--- a/src/components/configure-application-github/index.js
+++ b/src/components/configure-application-github/index.js
@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 
 import Button from '../button';
 import Code from '../code';
@@ -14,6 +14,10 @@ import configHandler from '../../utils/config';
 
 import './style.css';
 import externalUrls from '../../externalUrls';
+import requestStates from '../../state/state-utils/request-states';
+import Spinner from '../spinner';
+import Alert from '../alert';
+import useRegenerateDeployKeyAndSecret from '../page-configuration/use-regenerate-deploy-key-and-secret';
 
 const imageDeployKey = require('./deploy-key02.png').default;
 const imageWebhook = require('./webhook02.png').default;
@@ -21,14 +25,23 @@ const imageWebhook = require('./webhook02.png').default;
 const radixZoneDNS = configHandler.getConfig(configKeys.RADIX_CLUSTER_BASE);
 const webhookURL = `https://webhook.${radixZoneDNS}/events/github`;
 
-export const ConfigureApplicationGithub = ({
-  app,
-  startVisible,
-  deployKeyTitle,
-  webhookTitle,
-  useOtherCiToolOptionVisible,
-}) => {
+export const ConfigureApplicationGithub = (props) => {
+  const {
+    app,
+    startVisible,
+    deployKeyTitle,
+    webhookTitle,
+    useOtherCiToolOptionVisible,
+    onDeployKeyChange,
+  } = props;
   const [useOtherCiTool, setUseOtherCiTool] = useState(false);
+  const [deployKey, setDeployKey] = useState(app.publicKey);
+  const [sharedSecret, setSharedSecret] = useState(app.sharedSecret);
+  const [savedDeployKey, setSavedDeployKey] = useState(deployKey);
+  const [savedSharedSecret, setSavedSharedSecret] = useState(sharedSecret);
+  const [saveState, saveFunc, resetSaveState] = useRegenerateDeployKeyAndSecret(
+    app.name
+  );
   const deployOnlyHelp = (
     <span>
       Select this option if your project is hosted on multiple repositories
@@ -47,6 +60,28 @@ export const ConfigureApplicationGithub = ({
     </span>
   );
 
+  useEffect(() => {
+    setDeployKey(savedDeployKey);
+  }, [savedDeployKey]);
+
+  useEffect(() => {
+    setSharedSecret(savedSharedSecret);
+  }, [savedSharedSecret]);
+
+  useEffect(() => {
+    if (saveState.status !== requestStates.SUCCESS) {
+      return;
+    }
+    setSavedDeployKey(saveState.data.publicDeployKey);
+    setSavedSharedSecret(saveState.data.sharedSecret);
+    resetSaveState();
+    onDeployKeyChange(app.name);
+  }, [saveState, resetSaveState, onDeployKeyChange]);
+
+  const saveDeployKeySetting = () => {
+    saveFunc();
+  };
+
   return (
     <div className="configure-application-github">
       <p>To integrate with GitHub you must add a deploy key and a webhook</p>
@@ -74,12 +109,37 @@ export const ConfigureApplicationGithub = ({
               <li>
                 Copy and paste this key:
                 <Code copy wrap>
-                  {app.publicKey}
+                  {deployKey}
                 </Code>
               </li>
               <li>Press "Add key"</li>
             </ol>
           </div>
+          <div className="o-body-text">
+            <div className="o-action-bar">
+              {saveState.status === requestStates.IN_PROGRESS && (
+                <Spinner>Regenerating…</Spinner>
+              )}
+              {saveState.status === requestStates.FAILURE && (
+                <Alert type="danger">
+                  Failed to regenerate deploy key and webhook secret.
+                  {saveState.error}
+                </Alert>
+              )}
+              {
+                <Button
+                  onClick={() => saveDeployKeySetting()}
+                  btnType="danger"
+                  disabled={
+                    savedDeployKey !== deployKey ||
+                    saveState.status === requestStates.IN_PROGRESS
+                  }
+                >
+                  Regenerate deploy key and webhook secret
+                </Button>
+              }
+            </div>
+          </div>
         </Toggler>
       </Panel>
       <Panel>
@@ -135,9 +195,9 @@ export const ConfigureApplicationGithub = ({
                   </li>
                   <li>
                     The Shared Secret for this application is{' '}
-                    <code>{app.sharedSecret}</code>{' '}
+                    <code>{sharedSecret}</code>{' '}
                     <Button
-                      onClick={() => copyToClipboard(app.sharedSecret)}
+                      onClick={() => copyToClipboard(sharedSecret)}
                       btnType={['default', 'tiny']}
                     >
                       Copy
diff --git a/src/components/page-configuration/change-machine-user-form.js b/src/components/page-configuration/change-machine-user-form.js
index 9f1f9d302..0c55e0d2a 100644
--- a/src/components/page-configuration/change-machine-user-form.js
+++ b/src/components/page-configuration/change-machine-user-form.js
@@ -20,7 +20,9 @@ export const ChangeMachineUserForm = (props) => {
     props.appName
   );
 
-  useEffect(() => setMachineUser(props.machineUser), [props.machineUser]);
+  useEffect(() => {
+    setMachineUser(props.machineUser);
+  }, [props.machineUser]);
 
   useEffect(() => {
     if (saveState.status === requestStates.SUCCESS) {
diff --git a/src/components/page-configuration/index.js b/src/components/page-configuration/index.js
index 91322d9c3..9e4b5cd8a 100644
--- a/src/components/page-configuration/index.js
+++ b/src/components/page-configuration/index.js
@@ -107,6 +107,7 @@ class PageConfiguration extends React.Component {
                   startCollapsed
                   deployKeyTitle="Deploy key"
                   webhookTitle="Webhook"
+                  onDeployKeyChange={refreshApp}
                 />
               </section>
               <section>
diff --git a/src/components/page-configuration/use-regenerate-deploy-key-and-secret.js b/src/components/page-configuration/use-regenerate-deploy-key-and-secret.js
new file mode 100644
index 000000000..cd6b56551
--- /dev/null
+++ b/src/components/page-configuration/use-regenerate-deploy-key-and-secret.js
@@ -0,0 +1,14 @@
+import { usePostJson } from '../../effects';
+var phraseit = require('phraseit');
+
+const useRegenerateDeployKeyAndSecret = (appName) => {
+  const path = `/applications/${appName}/regenerate-deploy-key`;
+  var sharedSecret = phraseit.make('{{an_adjective}} {{adjective}} {{noun}}');
+  return usePostJson(path, () => {
+    return {
+      sharedSecret: sharedSecret,
+    };
+  });
+};
+
+export default useRegenerateDeployKeyAndSecret;