diff --git a/OracleGoldenGate/README.md b/OracleGoldenGate/README.md
index 276d6e8bbf..062fd40360 100644
--- a/OracleGoldenGate/README.md
+++ b/OracleGoldenGate/README.md
@@ -28,6 +28,8 @@ This project provides a Dockerfile tested with:
 - Oracle GoldenGate 12.2.0.1.1 for Oracle
 - Oracle GoldenGate 12.3.0.1.4 for Oracle
 - Oracle GoldenGate 12.3.0.1.4 Microservices for Oracle
+- Oracle GoldenGate 18.1.0.0.0 for Oracle
+- Oracle GoldenGate 18.1.0.0.0 Microservices for Oracle
 
 To build the images, use the [dockerBuild.sh](dockerBuild.sh) script or follow the instructions for manually building an image.
 
diff --git a/OracleGoldenGate/runOracleGoldenGate.sh b/OracleGoldenGate/runOracleGoldenGate.sh
index 324c6542d8..3e1cac9364 100755
--- a/OracleGoldenGate/runOracleGoldenGate.sh
+++ b/OracleGoldenGate/runOracleGoldenGate.sh
@@ -133,7 +133,6 @@ function initSSL {
         chown     oracle:oinstall        ${OGG_DEPLOY_BASE}/ssl
         ${runAsUser} mkdir -p            ${OGG_DEPLOY_BASE}/ssl/${HOSTNAME} 2>/dev/null || return 1
         ${orapki} wallet create  -wallet ${OGG_DEPLOY_BASE}/ssl/${HOSTNAME} -pwd "${OGG_WALLET_PWD}" -auto_login
-        ${orapki} wallet add     -wallet ${OGG_DEPLOY_BASE}/ssl/${HOSTNAME} -pwd "${OGG_WALLET_PWD}" -dn "CN=${HOSTNAME},${CommonOU}"       -keysize 2048 -self_signed -validity 7300
         ${orapki} wallet add     -wallet ${OGG_DEPLOY_BASE}/ssl/${HOSTNAME} -pwd "${OGG_WALLET_PWD}" -dn "CN=${deploymentName},${CommonOU}" -keysize 2048 -self_signed -validity 7300
 
         chmod 644               ${nginxCert}