diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
new file mode 100644
index 0000000000..8cce28c31e
--- /dev/null
+++ b/.github/workflows/build-and-push.yml
@@ -0,0 +1,21 @@
+name: build-and-push
+
+on:
+  push:
+    branches: [ master ]
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build and push Docker images
+      run: |
+        docker pull jlundy2/oracle-db:18.4.0-xe
+        docker tag jlundy2/oracle-db:18.4.0-xe oracle/database:18.4.0-xe
+        cd OracleDatabase/SingleInstance/dockerfiles
+        ./buildDockerImage.sh -v 18.4.0 -x
+        docker tag oracle/database:18.4.0-xe jlundy2/oracle-db:18.4.0-xe
+        docker login -u ${{ secrets.DOCKERHUB_USERNAME}} -p ${{ secrets.DOCKERHUB_PASSWORD }}
+        docker push jlundy2/oracle-db:18.4.0-xe
diff --git a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
index ca6bead715..5420b313b3 100644
--- a/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
+++ b/OracleDatabase/SingleInstance/dockerfiles/18.4.0/Dockerfile.xe
@@ -66,17 +66,19 @@ RUN chmod ug+x $INSTALL_DIR/*.sh && \
     mkdir $ORACLE_BASE/scripts/startup && \
     ln -s $ORACLE_BASE/scripts /docker-entrypoint-initdb.d && \
     mkdir -p $ORACLE_BASE/oradata /home/oracle && \
-    chown -R oracle:oinstall $ORACLE_BASE /home/oracle && \
     mv $INSTALL_DIR/$RUN_FILE $ORACLE_BASE/ && \
     mv $INSTALL_DIR/$PWD_FILE $ORACLE_BASE/ && \
     mv $INSTALL_DIR/$CHECK_DB_FILE $ORACLE_BASE/ && \
     mv $INSTALL_DIR/$CONF_FILE /etc/sysconfig/ && \
+    chown -R oracle:oinstall $ORACLE_BASE /home/oracle && \
     ln -s $ORACLE_BASE/$PWD_FILE / && \
     cd $HOME && \
     rm -rf $INSTALL_DIR && \
     chmod ug+x $ORACLE_BASE/*.sh
 
-HEALTHCHECK --interval=1m --start-period=5m \
+VOLUME $ORACLE_BASE/oradata
+
+HEALTHCHECK --interval=1m --start-period=15m \
    CMD "$ORACLE_BASE/$CHECK_DB_FILE" >/dev/null || exit 1
 
 CMD exec $ORACLE_BASE/$RUN_FILE