diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..50ca329
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.sh eol=lf
diff --git a/.gitignore b/.gitignore
index e43b0f9..d825d8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .DS_Store
+.project
diff --git a/Dockerfile b/Dockerfile
index d9d88f9..643c464 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,10 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
-MAINTAINER Wei-Ming Wu <wnameless@gmail.com>
-
-ADD assets /assets
+COPY assets /assets
 RUN /assets/setup.sh
 
 EXPOSE 22
 EXPOSE 1521
 EXPOSE 8080
 
-CMD /usr/sbin/startup.sh && /usr/sbin/sshd -D
+CMD /usr/sbin/startup.sh && tail -f /dev/null
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
index f05ac35..2ec1bb8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,13 +1,201 @@
-Copyright 2014 Wei-Ming Wu
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-    http://www.apache.org/licenses/LICENSE-2.0
+   1. Definitions.
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2014 Wei-Ming Wu
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/README.md b/README.md
index 86968de..14f50cd 100644
--- a/README.md
+++ b/README.md
@@ -1,30 +1,80 @@
 docker-oracle-xe-11g
 ============================
 
-Oracle Express Edition 11g Release 2 on Ubuntu 16.04 LTS
+Oracle Express Edition 11g Release 2 on Ubuntu 18.04 LTS
 
-This **Dockerfile** is a [trusted build](https://registry.hub.docker.com/u/wnameless/oracle-xe-11g/) of [Docker Registry](https://registry.hub.docker.com/).
+<del>This **Dockerfile** is a [trusted build](https://registry.hub.docker.com/u/wnameless/oracle-xe-11g/) of [Docker Registry](https://registry.hub.docker.com/).</del>
 
-### Installation(with Ubuntu 16.04)
+<del>Since 2019-Feb-13(the Valentine's day eve) this docker image has been removed by DockerHub due to the Docker DMCA Takedown Notice from the Copyright owner which is the Oracle.</del>
+
+<del>Happy Valentine's day!</del>
+
+```diff
++ The new DockerHub [wnameless/oracle-xe-11g-r2] has been released, because
++ the old [wnameless/oracle-xe-11g] is banned by DockerHub and I cannot restore it.
++ Thanks for the help from the staff in Oracle with my DMCA Takedown issue, however this problem
++ is totally ignored by the DockerHub and I barely can't do anything but to open a new repo.
++ Sep 29 2019
+```
+
+## Installation(Local)
 ```
-docker pull wnameless/oracle-xe-11g
+git clone https://github.com/wnameless/docker-oracle-xe-11g.git
+cd docker-oracle-xe-11g
+docker build -t wnameless/oracle-xe-11g .
 ```
 
-### Installation(with older Ubuntu 14.04.4)
+## Installation(DockerHub)
 ```
-docker pull wnameless/oracle-xe-11g:14.04.4
+docker pull wnameless/oracle-xe-11g-r2
 ```
+SSH server has been removed since 18.04, please use "docker exec"
 
-Run with 22 and 1521 ports opened:
+## Quick Start
+
+Run with 1521 port opened:
 ```
-docker run -d -p 49160:22 -p 49161:1521 wnameless/oracle-xe-11g
+docker run -d -p 49161:1521 wnameless/oracle-xe-11g-r2
 ```
 
 Run this, if you want the database to be connected remotely:
 ```
-docker run -d -p 49160:22 -p 49161:1521 -e ORACLE_ALLOW_REMOTE=true wnameless/oracle-xe-11g
+docker run -d -p 49161:1521 -e ORACLE_ALLOW_REMOTE=true wnameless/oracle-xe-11g-r2
+```
+
+For performance concern, you may want to disable the disk asynch IO:
+```
+docker run -d -p 49161:1521 -e ORACLE_DISABLE_ASYNCH_IO=true wnameless/oracle-xe-11g-r2
+```
+
+Enable XDB user with default password: xdb, run this:
+```
+docker run -d -p 49161:1521 -e ORACLE_ENABLE_XDB=true wnameless/oracle-xe-11g-r2
+```
+
+For APEX user:
+```
+docker run -d -p 49161:1521 -p 8080:8080 wnameless/oracle-xe-11g-r2
 ```
 
+```
+# Login http://localhost:8080/apex/apex_admin with following credential:
+username: ADMIN
+password: admin
+```
+
+For latest APEX(18.1) user, please pull wnameless/oracle-xe-11g-r2:18.04-apex first:
+```
+docker run -d -p 49161:1521 -p 8080:8080 wnameless/oracle-xe-11g-r2:18.04-apex
+```
+
+```
+# Login http://localhost:8080/apex/apex_admin with following credential:
+username: ADMIN
+password: Oracle_11g
+```
+
+By default, the password verification is disable(password never expired)<br/>
 Connect database with following setting:
 ```
 hostname: localhost
@@ -39,16 +89,12 @@ Password for SYS & SYSTEM
 oracle
 ```
 
-Login by SSH
-```
-ssh root@localhost -p 49160
-password: admin
-```
-
-Support custom DB Initialization
+Support custom DB Initialization and running shell scripts
 ```
 # Dockerfile
-FROM wnameless/oracle-xe-11g
+FROM wnameless/oracle-xe-11g-r2
 
 ADD init.sql /docker-entrypoint-initdb.d/
+ADD script.sh /docker-entrypoint-initdb.d/
 ```
+Running order is alphabetically. 
diff --git a/assets/apex-default-pwd.sql b/assets/apex-default-pwd.sql
new file mode 100644
index 0000000..65e5b70
--- /dev/null
+++ b/assets/apex-default-pwd.sql
@@ -0,0 +1,25 @@
+alter session set current_schema = APEX_040000;
+
+begin
+
+    wwv_flow_security.g_security_group_id := 10;
+    wwv_flow_security.g_user := 'ADMIN';
+    wwv_flow_security.g_import_in_progress := true;
+
+    for c1 in (select user_id
+                 from wwv_flow_fnd_user
+                where security_group_id = wwv_flow_security.g_security_group_id
+                  and user_name = wwv_flow_security.g_user) loop
+
+        wwv_flow_fnd_user_api.edit_fnd_user(
+            p_user_id       => c1.user_id,
+            p_user_name     => wwv_flow_security.g_user,
+            p_web_password  => 'admin',
+            p_new_password  => 'admin');
+    end loop;
+
+    wwv_flow_security.g_import_in_progress := false;
+
+end;
+/
+commit;
\ No newline at end of file
diff --git a/assets/setup.sh b/assets/setup.sh
index e7c5aab..2f0dfa3 100755
--- a/assets/setup.sh
+++ b/assets/setup.sh
@@ -1,48 +1,52 @@
 #!/bin/bash
+set -Eeuo pipefail
 
 # avoid dpkg frontend dialog / frontend warnings
 export DEBIAN_FRONTEND=noninteractive
 
-cat /assets/oracle-xe_11.2.0-1.0_amd64.deba* > /assets/oracle-xe_11.2.0-1.0_amd64.deb
-
-# Install OpenSSH
-apt-get update &&
-apt-get install -y openssh-server &&
-mkdir /var/run/sshd &&
-echo 'root:admin' | chpasswd &&
-sed -i 's/^PermitRootLogin .*/PermitRootLogin yes/' /etc/ssh/sshd_config &&
-sed -i 's/session\s*required\s*pam_loginuid.so/session optional pam_loginuid.so/g' /etc/pam.d/sshd &&
-echo 'export VISIBLE=now' >> /etc/profile &&
-
 # Prepare to install Oracle
-apt-get install -y libaio1 net-tools bc &&
-ln -s /usr/bin/awk /bin/awk &&
-mkdir /var/lock/subsys &&
-mv /assets/chkconfig /sbin/chkconfig &&
-chmod 755 /sbin/chkconfig &&
+apt-get update
+apt-get install -y libaio1 net-tools bc
+ln -s /usr/bin/awk /bin/awk
+mkdir /var/lock/subsys
+mv /assets/chkconfig /sbin/chkconfig
+chmod 755 /sbin/chkconfig
 
 # Install Oracle
-dpkg --install /assets/oracle-xe_11.2.0-1.0_amd64.deb &&
+cat /assets/oracle-xe_11.2.0-1.0_amd64.deba* > /assets/oracle-xe_11.2.0-1.0_amd64.deb
+dpkg --install /assets/oracle-xe_11.2.0-1.0_amd64.deb
 
 # Backup listener.ora as template
-cp /u01/app/oracle/product/11.2.0/xe/network/admin/listener.ora /u01/app/oracle/product/11.2.0/xe/network/admin/listener.ora.tmpl &&
-cp /u01/app/oracle/product/11.2.0/xe/network/admin/tnsnames.ora /u01/app/oracle/product/11.2.0/xe/network/admin/tnsnames.ora.tmpl &&
+cp /u01/app/oracle/product/11.2.0/xe/network/admin/listener.ora /u01/app/oracle/product/11.2.0/xe/network/admin/listener.ora.tmpl
+cp /u01/app/oracle/product/11.2.0/xe/network/admin/tnsnames.ora /u01/app/oracle/product/11.2.0/xe/network/admin/tnsnames.ora.tmpl
 
-mv /assets/init.ora /u01/app/oracle/product/11.2.0/xe/config/scripts &&
-mv /assets/initXETemp.ora /u01/app/oracle/product/11.2.0/xe/config/scripts &&
+mv /assets/init.ora /u01/app/oracle/product/11.2.0/xe/config/scripts
+mv /assets/initXETemp.ora /u01/app/oracle/product/11.2.0/xe/config/scripts
 
-printf 8080\\n1521\\noracle\\noracle\\ny\\n | /etc/init.d/oracle-xe configure &&
+printf 8080\\n1521\\noracle\\noracle\\ny\\n | /etc/init.d/oracle-xe configure
 
-echo 'export ORACLE_HOME=/u01/app/oracle/product/11.2.0/xe' >> /etc/bash.bashrc &&
-echo 'export PATH=$ORACLE_HOME/bin:$PATH' >> /etc/bash.bashrc &&
-echo 'export ORACLE_SID=XE' >> /etc/bash.bashrc &&
+echo 'export ORACLE_HOME=/u01/app/oracle/product/11.2.0/xe' >> /etc/bash.bashrc
+echo 'export PATH=$ORACLE_HOME/bin:$PATH' >> /etc/bash.bashrc
+echo 'export ORACLE_SID=XE' >> /etc/bash.bashrc
 
 # Install startup script for container
-mv /assets/startup.sh /usr/sbin/startup.sh &&
-chmod +x /usr/sbin/startup.sh &&
+mv /assets/startup.sh /usr/sbin/startup.sh
+chmod +x /usr/sbin/startup.sh
+
+# Create initialization script folders
+mkdir /docker-entrypoint-initdb.d
+
+# Disable Oracle password expiration
+export ORACLE_HOME=/u01/app/oracle/product/11.2.0/xe
+export PATH=$ORACLE_HOME/bin:$PATH
+export ORACLE_SID=XE
+
+echo "ALTER PROFILE DEFAULT LIMIT PASSWORD_VERIFY_FUNCTION NULL;" | sqlplus -s SYSTEM/oracle
+echo "alter profile DEFAULT limit password_life_time UNLIMITED;" | sqlplus -s SYSTEM/oracle
+echo "alter user SYSTEM identified by oracle account unlock;" | sqlplus -s SYSTEM/oracle
+cat /assets/apex-default-pwd.sql | sqlplus -s SYSTEM/oracle
 
 # Remove installation files
 rm -r /assets/
 
-
 exit $?
diff --git a/assets/startup.sh b/assets/startup.sh
index f4d8ab6..42d4bc3 100644
--- a/assets/startup.sh
+++ b/assets/startup.sh
@@ -1,13 +1,14 @@
 #!/bin/bash
+set -Eeuo pipefail
 LISTENER_ORA=/u01/app/oracle/product/11.2.0/xe/network/admin/listener.ora
 TNSNAMES_ORA=/u01/app/oracle/product/11.2.0/xe/network/admin/tnsnames.ora
 
-cp "${LISTENER_ORA}.tmpl" "$LISTENER_ORA" &&
-sed -i "s/%hostname%/$HOSTNAME/g" "${LISTENER_ORA}" &&
-sed -i "s/%port%/1521/g" "${LISTENER_ORA}" &&
-cp "${TNSNAMES_ORA}.tmpl" "$TNSNAMES_ORA" &&
-sed -i "s/%hostname%/$HOSTNAME/g" "${TNSNAMES_ORA}" &&
-sed -i "s/%port%/1521/g" "${TNSNAMES_ORA}" &&
+cp "${LISTENER_ORA}.tmpl" "$LISTENER_ORA"
+sed -i "s/%hostname%/$HOSTNAME/g" "${LISTENER_ORA}"
+sed -i "s/%port%/1521/g" "${LISTENER_ORA}"
+cp "${TNSNAMES_ORA}.tmpl" "$TNSNAMES_ORA"
+sed -i "s/%hostname%/$HOSTNAME/g" "${TNSNAMES_ORA}"
+sed -i "s/%port%/1521/g" "${TNSNAMES_ORA}"
 
 service oracle-xe start
 
@@ -15,15 +16,30 @@ export ORACLE_HOME=/u01/app/oracle/product/11.2.0/xe
 export PATH=$ORACLE_HOME/bin:$PATH
 export ORACLE_SID=XE
 
+if [ "$ORACLE_ENABLE_XDB" = true ]; then
+  echo "ALTER USER XDB ACCOUNT UNLOCK;" | sqlplus -s SYSTEM/oracle
+  echo "ALTER USER XDB IDENTIFIED BY xdb;" | sqlplus -s SYSTEM/oracle
+fi
+
 if [ "$ORACLE_ALLOW_REMOTE" = true ]; then
   echo "alter system disable restricted session;" | sqlplus -s SYSTEM/oracle
 fi
 
+if [ "$ORACLE_DISABLE_ASYNCH_IO" = true ]; then
+  echo "ALTER SYSTEM SET disk_asynch_io = FALSE SCOPE = SPFILE;" | sqlplus -s SYSTEM/oracle
+  service oracle-xe restart
+fi
+
 for f in /docker-entrypoint-initdb.d/*; do
+  [ -f "$f" ] || continue
   case "$f" in
     *.sh)     echo "$0: running $f"; . "$f" ;;
-    *.sql)    echo "$0: running $f"; echo "exit" | /u01/app/oracle/product/11.2.0/xe/bin/sqlplus "SYSTEM/oracle" @"$f"; echo ;;
+    *.sql)    echo "$0: running $f"; echo "exit" | /u01/app/oracle/product/11.2.0/xe/bin/sqlplus "SYS/oracle" AS SYSDBA @"$f"; echo ;;
     *)        echo "$0: ignoring $f" ;;
   esac
   echo
 done
+
+echo "#########################"
+echo "DATABASE IS READY TO USE!"
+echo "#########################"