diff --git a/OracleAnalytics/README.md b/OracleAnalytics/README.md
index b7d1b583e4..8b6c28fd5b 100644
--- a/OracleAnalytics/README.md
+++ b/OracleAnalytics/README.md
@@ -3,8 +3,8 @@
 Sample container configurations facilitate
 installation, configuration, and environment setup for DevOps users.
 This project includes quick start
-[container](dockerfiles/) for Oracle Analytics Server 2022 (6.4)
-based on Oracle Linux 7, Oracle JRE 8 (Server),
+[container](dockerfiles/) for Oracle Analytics Server 2025 (8.2)
+based on Oracle Linux 8, Oracle JRE 8 (Server),
 and Oracle Fusion Middleware Infrastructure 12.2.1.4.0.
 
 For more information about Oracle Analytics Server,
@@ -32,7 +32,7 @@ you must use PDB when creating the schemas because CDB isn’t supported.
 You can create an Oracle Database container by using an
 [OracleDatabase](https://github.com/oracle/docker-images/tree/master/OracleDatabase)
 image.
-Follow these instructions to create a 12.1 or 12.2 Enterprise Edition database.
+Follow these instructions to create a 12.1+ / 12.2+ / 19+ / 21c / 23ai Enterprise Edition database.
 
 ## Oracle Analytics Server Container Image Creation
 
@@ -41,8 +41,8 @@ Before you can build a BI image, you will need to build the [Oracle Java](https:
 ### Building the Oracle Analytics Server Image
 
 Download the binaries for
-[Oracle Analytics Server 2022 (6.4)](https://www-sites.oracle.com/solutions/business-analytics/analytics-server/analytics-server.html)
-for Linux x86-64-bit into the folder `OracleAnalytics/dockerfiles/6.4`.
+[Oracle Analytics Server 2025 (8.2)](https://www-sites.oracle.com/solutions/business-analytics/analytics-server/analytics-server.html)
+for Linux x86-64-bit into the folder `OracleAnalytics/dockerfiles/2025`.
 
 If you need a proxy for the host to access yum.oracle.com during build,
 first set up the appropriate environment. For example:
@@ -57,22 +57,22 @@ Build the image:
 
 ```bash
 cd OracleAnalytics/dockerfiles
-./buildContainerImage.sh -v 6.4
+./buildContainerImage.sh -v 2025
 ```
 
 Sample command(s) for users who don't want to use the above script to build the image:
 
 ```bash
 # without proxy
-docker build --force-rm=true --no-cache=true -t oracle/analyticsserver:6.4 -f Dockerfile .
+docker build --force-rm=true --no-cache=true -t oracle/analyticsserver:2025 -f Dockerfile .
 
 # with proxy
-docker build --force-rm=true --no-cache=true --build-arg http_proxy=http://myproxy.example.com:80 --build-arg https_proxy=https://myproxy.example.com:80 -t oracle/analyticsserver:6.4 -f Dockerfile .
+docker build --force-rm=true --no-cache=true --build-arg http_proxy=http://myproxy.example.com:80 --build-arg https_proxy=https://myproxy.example.com:80 -t oracle/analyticsserver:2025 -f Dockerfile .
 ```
 
 ### Building the Oracle Analytics Server Patched Image
 
-See the [Oracle Analytics patched image documentation](./patches/6.4-patch) for details.
+See the [Oracle Analytics patched image documentation](./patches/2025-patch) for details.
 
 ## Creating an Oracle Analytics Server Container
 
@@ -108,7 +108,7 @@ The following variables are predefined:
 For example:
 
 ```bash
-docker run -d --name bi -p 9500:9500 -p 9502:9502 -e ADMIN_USERNAME=weblogic -e ADMIN_PASSWORD=<admin_password> -e DB_HOST=database -e DB_PORT=1521 -e DB_SERVICE=ORCLPDB1 -e DB_USERNAME=sys -e DB_PASSWORD=<db_password> -e SCHEMA_PREFIX=DEV -e SCHEMA_PASSWORD=<schema_password> oracle/analyticsserver:6.4-patch
+docker run -d --name bi -p 9500:9500 -p 9502:9502 -e ADMIN_USERNAME=weblogic -e ADMIN_PASSWORD=<admin_password> -e DB_HOST=database -e DB_PORT=1521 -e DB_SERVICE=ORCLPDB1 -e DB_USERNAME=sys -e DB_PASSWORD=<db_password> -e SCHEMA_PREFIX=DEV -e SCHEMA_PASSWORD=<schema_password> oracle/analyticsserver:2025-patch
 ```
 
 Change _<...password>_ to your required values, and DB values to match your database.
@@ -138,7 +138,7 @@ you must modify the previous `docker run` command to expose port 9514.
 For example:
 
 ```bash
-docker run -it -p 9500:9500 -p 9502:9502 -p 9514:9514 -e ADMIN_USERNAME=weblogic -e ADMIN_PASSWORD=<admin_password> -e DB_HOST=database -e DB_PORT=1521 -e DB_SERVICE=ORCLPDB1 -e DB_USERNAME=sys -e DB_PASSWORD=<db_password> -e SCHEMA_PREFIX=DEV -e SCHEMA_PASSWORD=<schema_password> oracle/analyticsserver:6.4-patch
+docker run -it -p 9500:9500 -p 9502:9502 -p 9514:9514 -e ADMIN_USERNAME=weblogic -e ADMIN_PASSWORD=<admin_password> -e DB_HOST=database -e DB_PORT=1521 -e DB_SERVICE=ORCLPDB1 -e DB_USERNAME=sys -e DB_PASSWORD=<db_password> -e SCHEMA_PREFIX=DEV -e SCHEMA_PASSWORD=<schema_password> -e BI_APP_LITE_PASSWORD=<bi_app_lite_password> oracle/analyticsserver:2025-patch
 ```
 
 ### Using a Host Directory for Persistent Data
@@ -177,7 +177,7 @@ For example,
 
 3. Start a BI container that uses the database by name:
 
-   $ docker run --name bi --network=bi_net -e DB_HOST=database ...... oracle/analyticsserver:6.4-patch
+   $ docker run --name bi --network=bi_net -e DB_HOST=database ...... oracle/analyticsserver:2025-patch
 
 Note: In the above container run examples, other parameters are omitted for clarity.
 
@@ -247,4 +247,4 @@ released under the Universal Permissive License v 1.0 as shown at <https://oss.o
 
 ## Copyright
 
-Copyright (c) 2022 Oracle and/or its affiliates.
+Copyright (c) 2025 Oracle and/or its affiliates.
diff --git a/OracleAnalytics/dockerfiles/2025/Checksum.md5 b/OracleAnalytics/dockerfiles/2025/Checksum.md5
new file mode 100644
index 0000000000..cf3f47f4f8
--- /dev/null
+++ b/OracleAnalytics/dockerfiles/2025/Checksum.md5
@@ -0,0 +1,9 @@
+# Copyright (c) 2025 Oracle and/or its affiliates.
+#
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+#
+# Download Oracle Analytics Server Installer 2025
+# 
+# - https://www-sites.oracle.com/solutions/business-analytics/analytics-server/analytics-server.html
+#
+f6f7558bdc8f430fdccca49e3cbcd105  Oracle_Analytics_Server_Linux_2025(8.2).zip
diff --git a/OracleAnalytics/dockerfiles/6.4/Dockerfile b/OracleAnalytics/dockerfiles/2025/Dockerfile
similarity index 82%
rename from OracleAnalytics/dockerfiles/6.4/Dockerfile
rename to OracleAnalytics/dockerfiles/2025/Dockerfile
index 1209216c31..aa17bd9723 100644
--- a/OracleAnalytics/dockerfiles/6.4/Dockerfile
+++ b/OracleAnalytics/dockerfiles/2025/Dockerfile
@@ -1,21 +1,21 @@
-# Copyright (c) 2022 Oracle and/or its affiliates.
+# Copyright (c) 2025 Oracle and/or its affiliates.
 #
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #
 # ORACLE DOCKERFILES PROJECT
 # --------------------------
-# This is the Dockerfile for Oracle Analytics Server 2022 (6.4)
+# This is the Dockerfile for Oracle Analytics Server 2025 (8.2)
 # 
 # REQUIRED FILE(S) TO BUILD THIS IMAGE
 # ----------------------------------
-# (1) Oracle_Analytics_Server_Linux_2022(6.4).zip
+# (1) Oracle_Analytics_Server_Linux_2025(8.2).zip
 #     Download the installer file from https://www-sites.oracle.com/solutions/business-analytics/analytics-server/analytics-server.html
 #
 # HOW TO BUILD THIS IMAGE
 # -----------------------
 # Put all downloaded files in the same directory as this Dockerfile
 # Run: 
-#      $ docker build -t oracle/analyticsserver:6.4 .
+#      $ docker build -t oracle/analyticsserver:2025 .
 #
 # Pull base image
 # ---------------
@@ -32,8 +32,8 @@ ENV ORACLE_HOME=/u01/oracle
 # Environment variables required for this build (do NOT change)
 # (DOMAIN_NAME/HOME are reset here, to avoid FMW Infra environment leaking through)
 # -------------------------------------------------------------
-ENV BI_DISTRO_ZIP1=Oracle_Analytics_Server_Linux_2022(6.4).zip \
-    BI_INSTALLER1=Oracle_Analytics_Server_Linux_6.4.0.jar \
+ENV BI_DISTRO_ZIP1=Oracle_Analytics_Server_Linux_2025(8.2).zip \
+    BI_INSTALLER1=Oracle_Analytics_Server_2025_Linux.jar \
     DOMAIN_NAME="${BI_DOMAIN_NAME:-bi}" \
     DOMAINS_DIR=$ORACLE_HOME/user_projects/domains \
     DOMAIN_HOME=$ORACLE_HOME/user_projects/domains/${BI_DOMAIN_NAME:-bi}
@@ -47,7 +47,7 @@ COPY $BI_DISTRO_ZIP1 install.file oraInst.loc /u01/
 USER root
 
 # tools for installing and running BI
-RUN yum -y install unzip hostname && rm -rf /var/cache/yum
+RUN dnf -y install unzip hostname libnsl && dnf clean all
 
 USER oracle
 RUN unzip "/u01/$BI_DISTRO_ZIP1" -d /u01 && \
diff --git a/OracleAnalytics/dockerfiles/6.4/createAndStartDomain.sh b/OracleAnalytics/dockerfiles/2025/createAndStartDomain.sh
similarity index 96%
rename from OracleAnalytics/dockerfiles/6.4/createAndStartDomain.sh
rename to OracleAnalytics/dockerfiles/2025/createAndStartDomain.sh
index de5f7d84a7..1d390ee870 100755
--- a/OracleAnalytics/dockerfiles/6.4/createAndStartDomain.sh
+++ b/OracleAnalytics/dockerfiles/2025/createAndStartDomain.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 #
-# Copyright (c) 2022 Oracle and/or its affiliates.
+# Copyright (c) 2025 Oracle and/or its affiliates.
 #
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #
@@ -121,7 +121,7 @@ validateMandatoryParameter() {
 }
 
 # TODO only ORACLE_HOME/DOMAIN_NAME/DOMAINS_DIR is mandatory once domain is configured
-mandatoryParameters=(ORACLE_HOME DOMAIN_NAME DOMAINS_DIR ADMIN_USERNAME ADMIN_PASSWORD DB_HOST DB_PORT DB_SERVICE DB_USERNAME DB_PASSWORD SCHEMA_PREFIX SCHEMA_PASSWORD)
+mandatoryParameters=(ORACLE_HOME DOMAIN_NAME DOMAINS_DIR ADMIN_USERNAME ADMIN_PASSWORD DB_HOST DB_PORT DB_SERVICE DB_USERNAME DB_PASSWORD SCHEMA_PREFIX SCHEMA_PASSWORD BI_APP_LITE_PASSWORD)
 missingMandatoryParameters=()
 for mandatoryParameter in "${mandatoryParameters[@]}"; do
   missingParam=$(validateMandatoryParameter "$mandatoryParameter")
@@ -190,6 +190,9 @@ if [ ! -f "$domainCheckFile" ]; then
   replacements+=" -e \"s|@@DEFAULT_SI_KEY@@|ssi|g\""
   replacements+=" -e \"s|@@PORT_RANGE_START@@|9500|g\""
   replacements+=" -e \"s|@@PORT_RANGE_END@@|9999|g\""
+  replacements+=" -e \"s|@@ENABLE_SSL@@|false|g\""
+  replacements+=" -e \"s|@@DB_ROLE@@|SYSDBA|g\""
+  replacements+=" -e \"s|@@APP_PASSWORD@@|$BI_APP_LITE_PASSWORD|g\""
 
   eval sed -i "$replacements" "$responseFile"
 
diff --git a/OracleAnalytics/dockerfiles/6.4/install.file b/OracleAnalytics/dockerfiles/2025/install.file
similarity index 83%
rename from OracleAnalytics/dockerfiles/6.4/install.file
rename to OracleAnalytics/dockerfiles/2025/install.file
index dd7c525d95..f6f20fd4b0 100644
--- a/OracleAnalytics/dockerfiles/6.4/install.file
+++ b/OracleAnalytics/dockerfiles/2025/install.file
@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Oracle and/or its affiliates.
+# Copyright (c) 2025 Oracle and/or its affiliates.
 #
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #
diff --git a/OracleAnalytics/dockerfiles/6.4/oraInst.loc b/OracleAnalytics/dockerfiles/2025/oraInst.loc
similarity index 100%
rename from OracleAnalytics/dockerfiles/6.4/oraInst.loc
rename to OracleAnalytics/dockerfiles/2025/oraInst.loc
diff --git a/OracleAnalytics/dockerfiles/6.4/wait_for_db.sh b/OracleAnalytics/dockerfiles/2025/wait_for_db.sh
similarity index 92%
rename from OracleAnalytics/dockerfiles/6.4/wait_for_db.sh
rename to OracleAnalytics/dockerfiles/2025/wait_for_db.sh
index ba676a5eae..6b17aff124 100755
--- a/OracleAnalytics/dockerfiles/6.4/wait_for_db.sh
+++ b/OracleAnalytics/dockerfiles/2025/wait_for_db.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2022 Oracle and/or its affiliates.
+# Copyright (c) 2025 Oracle and/or its affiliates.
 #
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
diff --git a/OracleAnalytics/dockerfiles/6.4/Checksum.md5 b/OracleAnalytics/dockerfiles/6.4/Checksum.md5
deleted file mode 100644
index 966204a88d..0000000000
--- a/OracleAnalytics/dockerfiles/6.4/Checksum.md5
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2022 Oracle and/or its affiliates.
-#
-# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
-#
-# Download Oracle Business Intelligence Installer 12.2.1.3
-# 
-# - http://www.oracle.com/technetwork/middleware/bi/downloads/default-3852322.html
-#
-223126d67c38042da06e7635bd9ffd1b  Oracle_Analytics_Server_Linux_2022(6.4).zip
diff --git a/OracleAnalytics/patches/2025-patch/Dockerfile b/OracleAnalytics/patches/2025-patch/Dockerfile
new file mode 100644
index 0000000000..8f6a7f2e8c
--- /dev/null
+++ b/OracleAnalytics/patches/2025-patch/Dockerfile
@@ -0,0 +1,109 @@
+# Copyright (c) 2025 Oracle and/or its affiliates.
+#
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+#
+# ORACLE DOCKERFILES PROJECT
+# --------------------------
+# This Dockerfile extends the Oracle Analytics Server 2025 (8.2), and applies necessary
+# patches required.
+
+# REQUIRED FILES TO BUILD THIS IMAGE
+# ----------------------------------
+# (1) p37804819_122140_Generic.zip
+# (2) p34809489_122140_Generic.zip
+# (3) p36649916_122140_Generic.zip
+# (4) p37284722_122140_Generic.zip
+# (5) p37684007_122140_Generic.zip
+# (6) p36316422_122140_Generic.zip
+# (7) p36946553_122140_Generic.zip
+# (8) p37388935_122140_Generic.zip
+# (9) p37526122_122140_Linux-x86-64.zip
+# (10) p37665839_122140_Linux-x86-64.zip
+
+#     Download the patches from https://support.oracle.com
+#
+# HOW TO BUILD THIS IMAGE
+# -----------------------
+# Put all downloaded files in the same directory as this Dockerfile
+# Run:
+#      $ docker build --force-rm=true --no-cache=true -t oracle/analyticsserver:2025-patch .
+#
+
+# Pull base image
+# ---------------
+FROM oracle/analyticsserver:2025
+
+# Labels
+# ------
+LABEL "maintainer"="Padam Bengani <padam.bengani@oracle.com>"
+
+# Install
+#-------------------------------------------------------------
+USER root
+
+# tools for applying patches
+RUN dnf install -y binutils make gcc glibc-devel && dnf clean all
+
+# Common ENV
+#-----------
+ENV OPATCH_NO_FUSER=true
+
+# Environment variables required for this build (do NOT change)
+# -------------------------------------------------------------
+ENV PATCH_PKG_37804819="p37804819_122140_Generic.zip" \
+    PATCH_PKG_34809489="p34809489_122140_Generic.zip" \
+    PATCH_PKG_36649916="p36649916_122140_Generic.zip" \
+    PATCH_PKG_37284722="p37284722_122140_Generic.zip" \
+    PATCH_PKG_37684007="p37684007_122140_Generic.zip" \
+    PATCH_PKG_36316422="p36316422_122140_Generic.zip" \
+    PATCH_PKG_36946553="p36946553_122140_Generic.zip" \
+    PATCH_PKG_37388935="p37388935_122140_Generic.zip" \
+    PATCH_PKG_37526122="p37526122_122140_Linux-x86-64.zip" \
+    PATCH_PKG_37665839="p37665839_122140_Linux-x86-64.zip"
+
+# Copy supplemental package and scripts
+# --------------------------------
+COPY --chown=oracle:oracle \
+    $PATCH_PKG_37804819 $PATCH_PKG_34809489 $PATCH_PKG_36649916 $PATCH_PKG_37284722 \
+    $PATCH_PKG_37526122 $PATCH_PKG_37684007 $PATCH_PKG_36316422 $PATCH_PKG_36946553 \
+    $PATCH_PKG_37388935 $PATCH_PKG_37665839 /u01/
+
+# Installation of Supplemental Quick Installer and Patches
+# --------------------------------------------------------
+USER oracle
+
+RUN unzip "/u01/$PATCH_PKG_37804819" -d /u01 && \
+    chmod +x /u01/WLS_SPB_12.2.1.4.250408/tools/spbat/generic/SPBAT/spbat.sh && \
+    /u01/WLS_SPB_12.2.1.4.250408/tools/spbat/generic/SPBAT/spbat.sh -phase apply -oracle_home "$ORACLE_HOME" && \
+    rm "/u01/$PATCH_PKG_37804819" && \
+    unzip "/u01/$PATCH_PKG_34809489" -d /u01 && \
+    "$ORACLE_HOME/OPatch/opatch" apply -silent /u01/34809489 && \
+    rm "/u01/$PATCH_PKG_34809489" && \
+    unzip "/u01/$PATCH_PKG_36649916" -d /u01 && \
+    "$ORACLE_HOME/OPatch/opatch" apply -silent /u01/36649916 && \
+    rm "/u01/$PATCH_PKG_36649916" && \
+    unzip "/u01/$PATCH_PKG_37284722" -d /u01 && \
+    "$ORACLE_HOME/OPatch/opatch" apply -silent /u01/37284722 && \
+    rm "/u01/$PATCH_PKG_37284722" && \
+    unzip "/u01/$PATCH_PKG_37684007" -d /u01 && \
+    "$ORACLE_HOME/OPatch/opatch" apply -silent /u01/37684007 && \
+    rm "/u01/$PATCH_PKG_37684007" && \
+    unzip "/u01/$PATCH_PKG_36316422" -d /u01 && \
+    "$ORACLE_HOME/OPatch/opatch" apply -silent /u01/36316422 && \
+    rm "/u01/$PATCH_PKG_36316422" && \
+    unzip "/u01/$PATCH_PKG_36946553" -d /u01 && \
+    "$ORACLE_HOME/OPatch/opatch" apply -silent /u01/36946553 && \
+    rm "/u01/$PATCH_PKG_36946553" && \
+    unzip "/u01/$PATCH_PKG_37388935" -d /u01 && \
+    "$ORACLE_HOME/OPatch/opatch" apply -silent /u01/37388935 && \
+    rm "/u01/$PATCH_PKG_37388935" && \
+    unzip "/u01/$PATCH_PKG_37526122" -d /u01 && \
+    "$ORACLE_HOME/OPatch/opatch" apply -silent /u01/37526122 && \
+    rm "/u01/$PATCH_PKG_37526122" && \
+    unzip "/u01/$PATCH_PKG_37665839" -d /u01 && \
+    "$ORACLE_HOME/OPatch/opatch" apply -silent /u01/36749613 && \
+    rm "/u01/$PATCH_PKG_37665839"
+
+WORKDIR ${ORACLE_HOME}
+
+CMD ["/u01/createAndStartDomain.sh"]
diff --git a/OracleAnalytics/patches/2025-patch/README.md b/OracleAnalytics/patches/2025-patch/README.md
new file mode 100644
index 0000000000..10067f9692
--- /dev/null
+++ b/OracleAnalytics/patches/2025-patch/README.md
@@ -0,0 +1,33 @@
+# Build a Oracle Analytics Server 2025 (8.2) Patched Image
+
+This Dockerfile extends the Oracle Analytics Server 2025 (8.2) image,
+and applies necessary patches.
+
+## How to build and run
+
+First make sure you have built `oracle/analyticsserver:2025`.
+
+Download the following patches from
+[My Oracle Support](https://support.oracle.com)
+and place them in the same directory as this README.
+
+1. p37804819_122140_Generic.zip
+2. p34809489_122140_Generic.zip
+3. p36649916_122140_Generic.zip
+4. p37284722_122140_Generic.zip
+5. p37684007_122140_Generic.zip
+6. p36316422_122140_Generic.zip
+7. p36946553_122140_Generic.zip
+8. p37388935_122140_Generic.zip
+9. p37526122_122140_Linux-x86-64.zip
+10. p37665839_122140_Linux-x86-64.zip
+
+To build, run:
+
+```bash
+docker build --force-rm=true --no-cache=true -t oracle/analyticsserver:2025-patch .
+```
+
+## Copyright
+
+Copyright (c) 2025 Oracle and/or its affiliates.
diff --git a/OracleAnalytics/patches/6.4-patch/Dockerfile b/OracleAnalytics/patches/6.4-patch/Dockerfile
deleted file mode 100644
index 6fb2d1161e..0000000000
--- a/OracleAnalytics/patches/6.4-patch/Dockerfile
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright (c) 2022 Oracle and/or its affiliates.
-#
-# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
-#
-# ORACLE DOCKERFILES PROJECT
-# --------------------------
-# This Dockerfile extends the Oracle Analytics Server 6.4, and applies necessary
-# patches required.
-
-# REQUIRED FILES TO BUILD THIS IMAGE
-# ----------------------------------
-# (1) p34080315_122140_Generic.zip
-# (2) p33958532_122140_Generic.zip
-# (3) p34044738_122140_Generic.zip
-# (4) p32784652_122140_Generic.zip
-# (5) p30613424_122140_Generic.zip
-# (6) p31403376_122140_Generic.zip
-# (7) p33618954_122140_Generic.zip
-# (8) p33546536_12214211129_Generic.zip
-# (9) p32575741_122140_Linux-x86-64.zip
-# (10) p33950717_122140_Generic.zip
-# (11) p34065178_122140_Generic.zip
-
-#     Download the patches from https://support.oracle.com
-#
-# HOW TO BUILD THIS IMAGE
-# -----------------------
-# Put all downloaded files in the same directory as this Dockerfile
-# Run:
-#      $ docker build --force-rm=true --no-cache=true -t oracle/fmw-infrastructure:12.2.1.4-patched-for-oas64 .
-#
-
-# Pull base image
-# ---------------
-FROM oracle/analyticsserver:6.4
-
-# Labels
-# ------
-LABEL "maintainer"="Padam Bengani <padam.bengani@oracle.com>"
-
-#Common ENV
-#-----------
-ENV OPATCH_NO_FUSER=true
-
-# Environment variables required for this build (do NOT change)
-# -------------------------------------------------------------
-ENV PATCH_PKG_34080315="p34080315_122140_Generic.zip" \
-    PATCH_PKG_33958532="p33958532_122140_Generic.zip" \
-    PATCH_PKG_34044738="p34044738_122140_Generic.zip" \
-    PATCH_PKG_32784652="p32784652_122140_Generic.zip" \
-    PATCH_PKG_30613424="p30613424_122140_Generic.zip" \
-    PATCH_PKG_31403376="p31403376_122140_Generic.zip" \
-    PATCH_PKG_33618954="p33618954_122140_Generic.zip" \
-    PATCH_PKG_33546536="p33546536_12214211129_Generic.zip" \
-    PATCH_PKG_32575741="p32575741_122140_Linux-x86-64.zip" \
-    PATCH_PKG_33950717="p33950717_122140_Generic.zip" \
-    PATCH_PKG_34065178="p34065178_122140_Generic.zip"
-
-
-# Copy supplemental package and scripts
-# --------------------------------
-COPY --chown=oracle:oracle $PATCH_PKG_34080315 $PATCH_PKG_33958532 $PATCH_PKG_34044738 $PATCH_PKG_32784652 $PATCH_PKG_30613424 $PATCH_PKG_31403376 $PATCH_PKG_33618954 $PATCH_PKG_33546536 $PATCH_PKG_32575741 $PATCH_PKG_33950717 $PATCH_PKG_34065178 /u01/
-
-# Installation of Supplemental Quick Installer
-# --------------------------------------------
-USER oracle
-
-RUN unzip "/u01/$PATCH_PKG_34080315" -d /u01 && \
-    chmod +x /u01/WLS_SPB_12.2.1.4.220418/tools/spbat/generic/SPBAT/spbat.sh && \
-    /u01/WLS_SPB_12.2.1.4.220418/tools/spbat/generic/SPBAT/spbat.sh -phase apply -oracle_home "$ORACLE_HOME" && \
-    rm "/u01/$PATCH_PKG_34080315" && \
-    unzip "/u01/$PATCH_PKG_33958532" -d /u01 && \
-    "$ORACLE_HOME/OPatch/opatch" apply -silent /u01/33958532 && \
-    rm "/u01/$PATCH_PKG_33958532" && \
-    unzip "/u01/$PATCH_PKG_34044738" -d /u01 && \
-    "$ORACLE_HOME/OPatch/opatch" apply -silent /u01/34044738 && \
-    rm "/u01/$PATCH_PKG_34044738" && \
-    unzip "/u01/$PATCH_PKG_32784652" -d /u01 && \
-    "$ORACLE_HOME/OPatch/opatch" apply -silent /u01/32784652 && \
-    rm "/u01/$PATCH_PKG_32784652" && \
-    unzip "/u01/$PATCH_PKG_30613424" -d /u01 && \
-    "$ORACLE_HOME/OPatch/opatch" apply -silent /u01/30613424 && \
-    rm "/u01/$PATCH_PKG_30613424" && \
-    unzip "/u01/$PATCH_PKG_31403376" -d /u01 && \
-    "$ORACLE_HOME/OPatch/opatch" apply -silent /u01/31403376 && \
-    rm "/u01/$PATCH_PKG_31403376" && \
-    unzip "/u01/$PATCH_PKG_33618954" -d /u01 && \
-    "$ORACLE_HOME/OPatch/opatch" apply -silent /u01/33618954 && \
-    rm "/u01/$PATCH_PKG_33618954" && \
-    unzip "/u01/$PATCH_PKG_33546536" -d /u01 && \
-    "$ORACLE_HOME/OPatch/opatch" apply -silent /u01/33546536 && \
-    rm "/u01/$PATCH_PKG_33546536" && \
-    unzip "/u01/$PATCH_PKG_32575741" -d /u01 && \
-    "$ORACLE_HOME/OPatch/opatch" apply -silent /u01/32575741 && \
-    rm "/u01/$PATCH_PKG_32575741" && \
-    unzip "/u01/$PATCH_PKG_33950717" -d /u01 && \
-    "$ORACLE_HOME/OPatch/opatch" apply -silent /u01/33950717 && \
-    rm "/u01/$PATCH_PKG_33950717" && \
-    unzip "/u01/$PATCH_PKG_34065178" -d /u01 && \
-    "$ORACLE_HOME/OPatch/opatch" apply -silent /u01/34065178 && \
-    rm "/u01/$PATCH_PKG_34065178"
-
-WORKDIR ${ORACLE_HOME}
-
-CMD ["/u01/createAndStartDomain.sh"]
diff --git a/OracleAnalytics/patches/6.4-patch/README.md b/OracleAnalytics/patches/6.4-patch/README.md
deleted file mode 100644
index b8c822a195..0000000000
--- a/OracleAnalytics/patches/6.4-patch/README.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# Build a Oracle Analytics Server 6.4 Patched Image
-
-This Dockerfile extends the Oracle Analytics Server image (6.4),
-and applies necessary patches.
-
-## How to build and run
-
-First make sure you have built `oracle/analyticsserver:6.4`.
-
-Download the following patches from
-[My Oracle Support](https://support.oracle.com)
-and place them in the same directory as this README.
-
-1. p34080315_122140_Generic.zip
-2. p33958532_122140_Generic.zip
-3. p34044738_122140_Generic.zip
-4. p32784652_122140_Generic.zip
-5. p30613424_122140_Generic.zip
-6. p31403376_122140_Generic.zip
-7. p33618954_122140_Generic.zip
-8. p33546536_12214211129_Generic.zip
-9. p32575741_122140_Linux-x86-64.zip
-10. p33950717_122140_Generic.zip
-11. p34065178_122140_Generic.zip
-
-To build, run:
-
-```bash
-docker build --force-rm=true --no-cache=true -t oracle/analyticsserver:6.4-patch .
-```
-
-## Copyright
-
-Copyright (c) 2022 Oracle and/or its affiliates.