diff --git a/lib/nodes/addon/components/driver-amazonec2/component.js b/lib/nodes/addon/components/driver-amazonec2/component.js
index 4a10f140d..a48b3185e 100644
--- a/lib/nodes/addon/components/driver-amazonec2/component.js
+++ b/lib/nodes/addon/components/driver-amazonec2/component.js
@@ -473,7 +473,7 @@ export default Component.extend(NodeDriver, {
 
       return resolve(set(this, 'allKmsKeys', kmsKeys));
     } catch (err) {
-      console.warn('Unable to load KMS Keys.', err); // eslint-disable-line
+      // console.warn('Unable to load KMS Keys.', err); // eslint-disable-line
       // node template owners MAY not have access to KMS keys via IAM so dont kill everything because they dont
       // its not required
       set(this, 'loadFailedKmsKeys', true);
@@ -488,7 +488,7 @@ export default Component.extend(NodeDriver, {
 
       KMS.listKeys({}, (err, data) => {
         if (err) {
-          console.error(err, err.stack);
+          // console.warn(err, err.stack);
 
           return reject(err);
         }
diff --git a/lib/shared/addon/components/form-engine-opts/component.js b/lib/shared/addon/components/form-engine-opts/component.js
index f6a2119a3..8546878f9 100644
--- a/lib/shared/addon/components/form-engine-opts/component.js
+++ b/lib/shared/addon/components/form-engine-opts/component.js
@@ -62,6 +62,10 @@ export default Component.extend({
         label: get(this, 'intl').t('formEngineOpts.engineInstallUrl.latest'),
         value: 'https://get.docker.com'
       },
+      {
+        label: get(this, 'intl').t('formEngineOpts.engineInstallUrl.none.label'),
+        value: 'None'
+      },
     ];
 
     return out;
diff --git a/lib/shared/addon/components/form-engine-opts/template.hbs b/lib/shared/addon/components/form-engine-opts/template.hbs
index f648379c1..81ff62aca 100644
--- a/lib/shared/addon/components/form-engine-opts/template.hbs
+++ b/lib/shared/addon/components/form-engine-opts/template.hbs
@@ -36,6 +36,11 @@
             </BasicDropdown>
           </div>
         </div>
+        {{#if (eq machine.engineInstallURL "None")}}
+          <p class="help-block pt-5 text-warning">
+            {{t "formEngineOpts.engineInstallUrl.none.help"}}
+          </p>
+        {{/if}}
       </div>
     </div>
     <hr />
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index fa9f410b7..eefdb582d 100644
--- a/translations/en-us.yaml
+++ b/translations/en-us.yaml
@@ -6327,6 +6327,9 @@ formEngineOpts:
     placeholder: e.g. http://get.docker.com/
     recommended: Recommended
     latest: Latest
+    none:
+      label: None
+      help: "Warning: When selecting a value of 'None', Rancher will not install docker under the assumption that the docker is already installed."
   engineStorageDriver:
     label: Storage Driver
     placeholder: e.g. overlay