diff --git a/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile b/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile
index 1c9427faae..121b431731 100644
--- a/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile
+++ b/OracleDatabase/SingleInstance/dockerfiles/19.3.0/Dockerfile
@@ -35,7 +35,7 @@ LABEL "provider"="Oracle"                                               \
       "port.oemexpress"="5500"
 
 # Argument to control removal of components not needed after db software installation
-ARG SLIMMING=true
+ARG SLIMMING=false
 ARG INSTALL_FILE_1="LINUX.X64_193000_db_home.zip"
 
 # Environment variables required for this build (do NOT change)
@@ -79,6 +79,11 @@ ENV PATH=$ORACLE_HOME/bin:$ORACLE_HOME/OPatch/:/usr/sbin:$PATH \
     LD_LIBRARY_PATH=$ORACLE_HOME/lib:/usr/lib \
     CLASSPATH=$ORACLE_HOME/jlib:$ORACLE_HOME/rdbms/jlib
 
+# Environment variables for patching
+ENV HOST_PATCH_DIR="patches" \
+    PATCH_DIR=/opt/install/patches \
+    PATCH_DB_BINARIES_FILE="patchDBBinaries.sh"
+
 # Copy files needed during both installation and runtime
 # -------------
 COPY $SETUP_LINUX_FILE $CHECK_SPACE_FILE $INSTALL_DIR/
@@ -111,6 +116,14 @@ RUN chmod ug+x $INSTALL_DIR/*.sh && \
     sync && \
     $INSTALL_DIR/$INSTALL_DB_BINARIES_FILE $DB_EDITION
 
+# Copy DB patches
+COPY --chown=oracle:dba $HOST_PATCH_DIR $PATCH_DB_BINARIES_FILE $PATCH_DIR/
+
+# Apply DB Patches
+RUN chmod ug+x $PATCH_DIR/*.sh && \
+    sync && \
+    $PATCH_DIR/$PATCH_DB_BINARIES_FILE
+
 
 
 #############################################
@@ -134,6 +147,19 @@ WORKDIR /home/oracle
 # Add a bashrc file to capitalize ORACLE_SID in the environment
 RUN echo 'ORACLE_SID=${ORACLE_SID:-ORCLCDB}; export ORACLE_SID=${ORACLE_SID^^}' > .bashrc
 
+# Environment variables for patching
+ENV DATAPATCH_FILE="runDatapatch.sh" \
+    LSPATCHES_FILE="savePatchSummary.sh" \
+    SKIP_DATAPATCH=false
+
+# Copy script to run datapatch
+COPY --chown=oracle:dba $DATAPATCH_FILE $ORACLE_BASE/scripts/extensions/startup/
+RUN chmod ug+x $ORACLE_BASE/scripts/extensions/startup/*.sh && sync
+
+# Copy script to run lspatches
+COPY --chown=oracle:dba $LSPATCHES_FILE $ORACLE_BASE/scripts/extensions/setup/
+RUN chmod ug+x $ORACLE_BASE/scripts/extensions/setup/*.sh && sync
+
 HEALTHCHECK --interval=1m --start-period=5m --timeout=30s \
    CMD "$ORACLE_BASE/$CHECK_DB_FILE" >/dev/null || exit 1
 
diff --git a/OracleDatabase/SingleInstance/dockerfiles/19.3.0/patchDBBinaries.sh b/OracleDatabase/SingleInstance/dockerfiles/19.3.0/patchDBBinaries.sh
new file mode 100644
index 0000000000..5abad4b14e
--- /dev/null
+++ b/OracleDatabase/SingleInstance/dockerfiles/19.3.0/patchDBBinaries.sh
@@ -0,0 +1,99 @@
+#!/bin/bash
+# LICENSE UPL 1.0
+#
+# Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+#
+# Since: March, 2020
+# Author: rishabh.y.gupta@oracle.com
+# Description: Applies the patches provided by the user on the oracle home.
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#
+
+RU_DIR="${PATCH_DIR}/release_update"
+ONE_OFFS_DIR="${PATCH_DIR}/one_offs"
+
+ru_count=$(ls $RU_DIR/*.zip 2> /dev/null | wc -l)
+if [ $ru_count -ge 2 ]; then
+    echo "Error: Only 1 Release Update can be applied."
+    exit 1;
+elif [ $ru_count == 1 ]; then
+    ru_patch="$(ls $RU_DIR/*.zip)"
+    echo "Unzipping $ru_patch";
+    unzip -qo $ru_patch -d $PATCH_DIR;
+    ru_patch=$(echo ${ru_patch##*/} | cut -d_ -f1 | cut -dp -f2)
+else
+    echo "No Release Update to be installed."
+fi
+
+ONE_OFFS_LIST=()
+
+if ls $ONE_OFFS_DIR/*.zip 2> /dev/null; then
+    for patch_zip in $ONE_OFFS_DIR/*.zip; do
+        patch_no=$(echo ${patch_zip##*/} | cut -d_ -f1 | cut -dp -f2)
+        if [ $patch_no == "6880880" ]; then
+            echo "Removing directory ${ORACLE_HOME}/OPatch";
+            rm -rf ${ORACLE_HOME}/OPatch;
+            echo "Unzipping OPatch archive $patch_zip to ${ORACLE_HOME}";
+            unzip -qo $patch_zip -d $ORACLE_HOME;
+        else
+            ONE_OFFS_LIST+=($patch_no);
+            echo "Unzipping $patch_zip";
+            unzip -qo $patch_zip -d $PATCH_DIR;
+        fi
+    done
+else
+    echo "No one-offs to be installed."
+fi
+
+export PATH=${ORACLE_HOME}/perl/bin:$PATH;
+
+if [ ! -z $ru_patch ]; then
+    echo "Applying Release Update: $ru_patch";
+    cmd="${ORACLE_HOME}/OPatch/opatchauto apply -binary -oh $ORACLE_HOME ${PATCH_DIR}/${ru_patch} -target_type rac_database";
+    echo "Running: $cmd";
+    $cmd || {
+        echo "RU application failed for patchset: ${ru_patch}";
+        exit 1;
+    }
+fi
+
+for patch in ${ONE_OFFS_LIST[@]}; do
+    echo "Applying patch: $patch";
+    cmd="${ORACLE_HOME}/OPatch/opatchauto apply -binary -oh $ORACLE_HOME ${PATCH_DIR}/${patch} -target_type rac_database";
+    echo "Running: $cmd";
+    $cmd || {
+        echo "Patch application failed for ${patch}";
+        exit 1;
+    }
+done
+
+# Remove not needed components
+# APEX
+rm -rf "$ORACLE_HOME"/apex && \
+# ORDS
+rm -rf "$ORACLE_HOME"/ords && \
+# SQL Developer
+rm -rf "$ORACLE_HOME"/sqldeveloper && \
+# UCP connection pool
+rm -rf "$ORACLE_HOME"/ucp && \
+# All installer files
+rm -rf "$ORACLE_HOME"/lib/*.zip && \
+# OUI backup
+rm -rf "$ORACLE_HOME"/inventory/backup/* && \
+# Network tools help
+rm -rf "$ORACLE_HOME"/network/tools/help && \
+# Database upgrade assistant
+rm -rf "$ORACLE_HOME"/assistants/dbua && \
+# Database migration assistant
+rm -rf "$ORACLE_HOME"/dmu && \
+# Remove pilot workflow installer
+rm -rf "$ORACLE_HOME"/install/pilot && \
+# Support tools
+rm -rf "$ORACLE_HOME"/suptools && \
+# Temp location
+rm -rf /tmp/* && \
+# Database files directory
+rm -rf "$INSTALL_DIR"/database
+# Database patch directories
+rm -rf $PATCH_DIR/* $ORACLE_HOME/.patch_storage
diff --git a/OracleDatabase/SingleInstance/dockerfiles/19.3.0/patches/one_offs/.keep b/OracleDatabase/SingleInstance/dockerfiles/19.3.0/patches/one_offs/.keep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/OracleDatabase/SingleInstance/dockerfiles/19.3.0/patches/release_update/.keep b/OracleDatabase/SingleInstance/dockerfiles/19.3.0/patches/release_update/.keep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/OracleDatabase/SingleInstance/dockerfiles/19.3.0/runDatapatch.sh b/OracleDatabase/SingleInstance/dockerfiles/19.3.0/runDatapatch.sh
new file mode 100644
index 0000000000..697afef29f
--- /dev/null
+++ b/OracleDatabase/SingleInstance/dockerfiles/19.3.0/runDatapatch.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+# LICENSE UPL 1.0
+#
+# Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+#
+# Since: March, 2020
+# Author: rishabh.y.gupta@oracle.com
+# Description: Runs datapatch in a container while using existing datafiles if container is at different RU level
+#              than the container which created the datafiles
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#
+
+if [ "${SKIP_DATAPATCH}" = "true" ]; then
+  echo "Skipping Datapatch"
+  exit 0;
+fi
+
+# LSPATCHES_FILE will have the patch summary of the datafiles.
+DBCONFIG_DIR="${ORACLE_BASE}/oradata/dbconfig/${ORACLE_SID}"
+LSPATCHES_FILE="${DBCONFIG_DIR}/${ORACLE_SID}.lspatches"
+
+# tmp.lspatches will have the patch summary of the oracle home.
+temp_lspatches_file="/tmp/tmp.lspatches"
+$ORACLE_HOME/OPatch/opatch lspatches > ${temp_lspatches_file};
+
+if diff ${LSPATCHES_FILE} ${temp_lspatches_file} 2> /dev/null; then
+    echo "Datafiles are already patched. Skipping datapatch run."
+else
+    echo "Running datapatch...";
+    if ! $ORACLE_HOME/OPatch/datapatch -skip_upgrade_check; then
+        echo "Datapatch execution has failed.";
+        exit 1;
+    else
+        echo "DONE: Datapatch execution."
+        cp ${temp_lspatches_file} ${LSPATCHES_FILE};
+    fi
+fi
diff --git a/OracleDatabase/SingleInstance/dockerfiles/19.3.0/savePatchSummary.sh b/OracleDatabase/SingleInstance/dockerfiles/19.3.0/savePatchSummary.sh
new file mode 100644
index 0000000000..8eff8a9a62
--- /dev/null
+++ b/OracleDatabase/SingleInstance/dockerfiles/19.3.0/savePatchSummary.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+# LICENSE UPL 1.0
+#
+# Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+#
+# Since: March, 2020
+# Author: rishabh.y.gupta@oracle.com
+# Description: Runs lspatches to save summary of installed patches just after new db is created.
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#
+
+LSPATCHES_FILE="${ORACLE_SID}.lspatches"
+LSPATCHES_FILE_PATH="${ORACLE_BASE}/oradata/dbconfig/${ORACLE_SID}/${LSPATCHES_FILE}"
+
+$ORACLE_HOME/OPatch/opatch lspatches > ${LSPATCHES_FILE_PATH};
\ No newline at end of file
diff --git a/OracleDatabase/SingleInstance/dockerfiles/21.3.0/Dockerfile b/OracleDatabase/SingleInstance/dockerfiles/21.3.0/Dockerfile
index 0ba206efc3..d264fd34ed 100644
--- a/OracleDatabase/SingleInstance/dockerfiles/21.3.0/Dockerfile
+++ b/OracleDatabase/SingleInstance/dockerfiles/21.3.0/Dockerfile
@@ -35,7 +35,7 @@ LABEL "provider"="Oracle"                                               \
       "port.oemexpress"="5500"
 
 # Argument to control removal of components not needed after db software installation
-ARG SLIMMING=true
+ARG SLIMMING=false
 ARG INSTALL_FILE_1="LINUX.X64_213000_db_home.zip"
 
 # Environment variables required for this build (do NOT change)
@@ -80,6 +80,11 @@ ENV PATH=$ORACLE_HOME/bin:$ORACLE_HOME/OPatch/:/usr/sbin:$PATH \
     LD_LIBRARY_PATH=$ORACLE_HOME/lib:/usr/lib \
     CLASSPATH=$ORACLE_HOME/jlib:$ORACLE_HOME/rdbms/jlib
 
+# Environment variables for patching
+ENV HOST_PATCH_DIR="patches" \
+    PATCH_DIR=/opt/install/patches \
+    PATCH_DB_BINARIES_FILE="patchDBBinaries.sh"
+
 # Copy files needed during both installation and runtime
 # -------------
 COPY $SETUP_LINUX_FILE $CHECK_SPACE_FILE $INSTALL_DIR/
@@ -112,6 +117,14 @@ RUN chmod ug+x $INSTALL_DIR/*.sh && \
     sync && \
     $INSTALL_DIR/$INSTALL_DB_BINARIES_FILE $DB_EDITION
 
+# Copy DB patches
+COPY --chown=oracle:dba $HOST_PATCH_DIR $PATCH_DB_BINARIES_FILE $PATCH_DIR/
+
+# Apply DB Patches
+RUN chmod ug+x $PATCH_DIR/*.sh && \
+    sync && \
+    $PATCH_DIR/$PATCH_DB_BINARIES_FILE
+
 
 
 #############################################
@@ -135,6 +148,19 @@ WORKDIR /home/oracle
 # Add a bashrc file to capitalize ORACLE_SID in the environment
 RUN echo 'ORACLE_SID=${ORACLE_SID:-ORCLCDB}; export ORACLE_SID=${ORACLE_SID^^}' > .bashrc
 
+# Environment variables for patching
+ENV DATAPATCH_FILE="runDatapatch.sh" \
+    LSPATCHES_FILE="savePatchSummary.sh" \
+    SKIP_DATAPATCH=false
+
+# Copy script to run datapatch
+COPY --chown=oracle:dba $DATAPATCH_FILE $ORACLE_BASE/scripts/extensions/startup/
+RUN chmod ug+x $ORACLE_BASE/scripts/extensions/startup/*.sh && sync
+
+# Copy script to run lspatches
+COPY --chown=oracle:dba $LSPATCHES_FILE $ORACLE_BASE/scripts/extensions/setup/
+RUN chmod ug+x $ORACLE_BASE/scripts/extensions/setup/*.sh && sync
+
 HEALTHCHECK --interval=1m --start-period=5m --timeout=30s \
    CMD "$ORACLE_BASE/$CHECK_DB_FILE" >/dev/null || exit 1
 
diff --git a/OracleDatabase/SingleInstance/dockerfiles/21.3.0/patchDBBinaries.sh b/OracleDatabase/SingleInstance/dockerfiles/21.3.0/patchDBBinaries.sh
new file mode 100644
index 0000000000..5abad4b14e
--- /dev/null
+++ b/OracleDatabase/SingleInstance/dockerfiles/21.3.0/patchDBBinaries.sh
@@ -0,0 +1,99 @@
+#!/bin/bash
+# LICENSE UPL 1.0
+#
+# Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+#
+# Since: March, 2020
+# Author: rishabh.y.gupta@oracle.com
+# Description: Applies the patches provided by the user on the oracle home.
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#
+
+RU_DIR="${PATCH_DIR}/release_update"
+ONE_OFFS_DIR="${PATCH_DIR}/one_offs"
+
+ru_count=$(ls $RU_DIR/*.zip 2> /dev/null | wc -l)
+if [ $ru_count -ge 2 ]; then
+    echo "Error: Only 1 Release Update can be applied."
+    exit 1;
+elif [ $ru_count == 1 ]; then
+    ru_patch="$(ls $RU_DIR/*.zip)"
+    echo "Unzipping $ru_patch";
+    unzip -qo $ru_patch -d $PATCH_DIR;
+    ru_patch=$(echo ${ru_patch##*/} | cut -d_ -f1 | cut -dp -f2)
+else
+    echo "No Release Update to be installed."
+fi
+
+ONE_OFFS_LIST=()
+
+if ls $ONE_OFFS_DIR/*.zip 2> /dev/null; then
+    for patch_zip in $ONE_OFFS_DIR/*.zip; do
+        patch_no=$(echo ${patch_zip##*/} | cut -d_ -f1 | cut -dp -f2)
+        if [ $patch_no == "6880880" ]; then
+            echo "Removing directory ${ORACLE_HOME}/OPatch";
+            rm -rf ${ORACLE_HOME}/OPatch;
+            echo "Unzipping OPatch archive $patch_zip to ${ORACLE_HOME}";
+            unzip -qo $patch_zip -d $ORACLE_HOME;
+        else
+            ONE_OFFS_LIST+=($patch_no);
+            echo "Unzipping $patch_zip";
+            unzip -qo $patch_zip -d $PATCH_DIR;
+        fi
+    done
+else
+    echo "No one-offs to be installed."
+fi
+
+export PATH=${ORACLE_HOME}/perl/bin:$PATH;
+
+if [ ! -z $ru_patch ]; then
+    echo "Applying Release Update: $ru_patch";
+    cmd="${ORACLE_HOME}/OPatch/opatchauto apply -binary -oh $ORACLE_HOME ${PATCH_DIR}/${ru_patch} -target_type rac_database";
+    echo "Running: $cmd";
+    $cmd || {
+        echo "RU application failed for patchset: ${ru_patch}";
+        exit 1;
+    }
+fi
+
+for patch in ${ONE_OFFS_LIST[@]}; do
+    echo "Applying patch: $patch";
+    cmd="${ORACLE_HOME}/OPatch/opatchauto apply -binary -oh $ORACLE_HOME ${PATCH_DIR}/${patch} -target_type rac_database";
+    echo "Running: $cmd";
+    $cmd || {
+        echo "Patch application failed for ${patch}";
+        exit 1;
+    }
+done
+
+# Remove not needed components
+# APEX
+rm -rf "$ORACLE_HOME"/apex && \
+# ORDS
+rm -rf "$ORACLE_HOME"/ords && \
+# SQL Developer
+rm -rf "$ORACLE_HOME"/sqldeveloper && \
+# UCP connection pool
+rm -rf "$ORACLE_HOME"/ucp && \
+# All installer files
+rm -rf "$ORACLE_HOME"/lib/*.zip && \
+# OUI backup
+rm -rf "$ORACLE_HOME"/inventory/backup/* && \
+# Network tools help
+rm -rf "$ORACLE_HOME"/network/tools/help && \
+# Database upgrade assistant
+rm -rf "$ORACLE_HOME"/assistants/dbua && \
+# Database migration assistant
+rm -rf "$ORACLE_HOME"/dmu && \
+# Remove pilot workflow installer
+rm -rf "$ORACLE_HOME"/install/pilot && \
+# Support tools
+rm -rf "$ORACLE_HOME"/suptools && \
+# Temp location
+rm -rf /tmp/* && \
+# Database files directory
+rm -rf "$INSTALL_DIR"/database
+# Database patch directories
+rm -rf $PATCH_DIR/* $ORACLE_HOME/.patch_storage
diff --git a/OracleDatabase/SingleInstance/dockerfiles/21.3.0/patches/one_offs/.keep b/OracleDatabase/SingleInstance/dockerfiles/21.3.0/patches/one_offs/.keep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/OracleDatabase/SingleInstance/dockerfiles/21.3.0/patches/release_update/.keep b/OracleDatabase/SingleInstance/dockerfiles/21.3.0/patches/release_update/.keep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/OracleDatabase/SingleInstance/dockerfiles/21.3.0/runDatapatch.sh b/OracleDatabase/SingleInstance/dockerfiles/21.3.0/runDatapatch.sh
new file mode 100644
index 0000000000..697afef29f
--- /dev/null
+++ b/OracleDatabase/SingleInstance/dockerfiles/21.3.0/runDatapatch.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+# LICENSE UPL 1.0
+#
+# Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+#
+# Since: March, 2020
+# Author: rishabh.y.gupta@oracle.com
+# Description: Runs datapatch in a container while using existing datafiles if container is at different RU level
+#              than the container which created the datafiles
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#
+
+if [ "${SKIP_DATAPATCH}" = "true" ]; then
+  echo "Skipping Datapatch"
+  exit 0;
+fi
+
+# LSPATCHES_FILE will have the patch summary of the datafiles.
+DBCONFIG_DIR="${ORACLE_BASE}/oradata/dbconfig/${ORACLE_SID}"
+LSPATCHES_FILE="${DBCONFIG_DIR}/${ORACLE_SID}.lspatches"
+
+# tmp.lspatches will have the patch summary of the oracle home.
+temp_lspatches_file="/tmp/tmp.lspatches"
+$ORACLE_HOME/OPatch/opatch lspatches > ${temp_lspatches_file};
+
+if diff ${LSPATCHES_FILE} ${temp_lspatches_file} 2> /dev/null; then
+    echo "Datafiles are already patched. Skipping datapatch run."
+else
+    echo "Running datapatch...";
+    if ! $ORACLE_HOME/OPatch/datapatch -skip_upgrade_check; then
+        echo "Datapatch execution has failed.";
+        exit 1;
+    else
+        echo "DONE: Datapatch execution."
+        cp ${temp_lspatches_file} ${LSPATCHES_FILE};
+    fi
+fi
diff --git a/OracleDatabase/SingleInstance/dockerfiles/21.3.0/savePatchSummary.sh b/OracleDatabase/SingleInstance/dockerfiles/21.3.0/savePatchSummary.sh
new file mode 100644
index 0000000000..8eff8a9a62
--- /dev/null
+++ b/OracleDatabase/SingleInstance/dockerfiles/21.3.0/savePatchSummary.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+# LICENSE UPL 1.0
+#
+# Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+#
+# Since: March, 2020
+# Author: rishabh.y.gupta@oracle.com
+# Description: Runs lspatches to save summary of installed patches just after new db is created.
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#
+
+LSPATCHES_FILE="${ORACLE_SID}.lspatches"
+LSPATCHES_FILE_PATH="${ORACLE_BASE}/oradata/dbconfig/${ORACLE_SID}/${LSPATCHES_FILE}"
+
+$ORACLE_HOME/OPatch/opatch lspatches > ${LSPATCHES_FILE_PATH};
\ No newline at end of file