diff --git a/src/fireedge/src/public/containers/Application/Create/Steps/Tiers/Steps/Template/List/Docker.js b/src/fireedge/src/public/containers/Application/Create/Steps/Tiers/Steps/Template/List/Docker.js
index d118176045..54fb3bcf3c 100644
--- a/src/fireedge/src/public/containers/Application/Create/Steps/Tiers/Steps/Template/List/Docker.js
+++ b/src/fireedge/src/public/containers/Application/Create/Steps/Tiers/Steps/Template/List/Docker.js
@@ -1,19 +1,55 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-const ImportDockerFile = ({ backButton }) => (
-  <div style={{ display: 'flex', alignItems: 'center' }}>
-    {backButton}
-    <h1 style={{ marginLeft: 5, flexGrow: 1 }}>Docker file</h1>
-  </div>
-);
+import AceEditor from 'react-ace';
+import 'ace-builds/src-noconflict/mode-dockerfile';
+import 'ace-builds/src-noconflict/theme-github';
 
-ImportDockerFile.propTypes = {
-  backButton: PropTypes.node
+const DockerFile = ({ backButton, handleSetData, currentValue, ...props }) => {
+  const handleChange = newValue => {
+    handleSetData(newValue);
+  };
+
+  return (
+    <>
+      <div style={{ display: 'flex', alignItems: 'center' }}>
+        {backButton}
+        <h1 style={{ marginLeft: 5, flexGrow: 1 }}>Docker file</h1>
+      </div>
+      <AceEditor
+        style={{ border: '1px solid lightgray' }}
+        wrapEnabled
+        defaultValue={currentValue}
+        fontSize={16}
+        mode="dockerfile"
+        theme="github"
+        width="100%"
+        height="100%"
+        minLines={10}
+        onChange={handleChange}
+        name="form-control-code"
+        showPrintMargin={false}
+        editorProps={{ $blockScrolling: true }}
+        setOptions={{
+          useWorker: false,
+          tabSize: 2
+        }}
+        {...props}
+      />
+    </>
+  );
 };
 
-ImportDockerFile.defaultProps = {
-  backButton: null
+DockerFile.propTypes = {
+  backButton: PropTypes.node,
+  currentValue: PropTypes.string,
+  handleSetData: PropTypes.func
 };
 
-export default ImportDockerFile;
+DockerFile.defaultProps = {
+  backButton: null,
+  currentValue: undefined,
+  handleSetData: PropTypes.func
+};
+
+export default DockerFile;