diff --git a/bitnami/ejbca/7/debian-10/Dockerfile b/bitnami/ejbca/7/debian-10/Dockerfile
index 7a433aebde3c..d8a2e5c560fe 100644
--- a/bitnami/ejbca/7/debian-10/Dockerfile
+++ b/bitnami/ejbca/7/debian-10/Dockerfile
@@ -23,7 +23,7 @@ RUN /opt/bitnami/scripts/ejbca/postunpack.sh
 RUN /opt/bitnami/scripts/java/postunpack.sh
 ENV ALLOW_EMPTY_PASSWORD="no" \
     BITNAMI_APP_NAME="ejbca" \
-    BITNAMI_IMAGE_VERSION="7.4.3-2-debian-10-r68" \
+    BITNAMI_IMAGE_VERSION="7.4.3-2-debian-10-r69" \
     JAVA_HOME="/opt/bitnami/java" \
     MARIADB_HOST="mariadb" \
     MARIADB_PORT_NUMBER="3306" \
diff --git a/bitnami/ejbca/7/debian-10/docker-compose.yml b/bitnami/ejbca/7/debian-10/docker-compose.yml
index e63987cbb461..061c3607dd6a 100644
--- a/bitnami/ejbca/7/debian-10/docker-compose.yml
+++ b/bitnami/ejbca/7/debian-10/docker-compose.yml
@@ -16,7 +16,7 @@ services:
       - 8080:8080
       - 8443:8443
     volumes:
-      - "ejbca_data:/bitnami/ejbca"
+      - "wildfly_data:/bitnami/wildfly"
     environment:
       - EJBCA_DATABASE_HOST=mariadb
       - EJBCA_DATABASE_NAME=bitnami_ejbca
@@ -25,5 +25,5 @@ services:
 volumes:
   mariadb_data:
     driver: local
-  ejbca_data:
+  wildfly_data:
     driver: local
diff --git a/bitnami/ejbca/7/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/ejbca/7/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh
index 6bd564773acb..0a1a92a747f9 100644
--- a/bitnami/ejbca/7/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/ejbca/7/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh
@@ -446,3 +446,19 @@ generate_sha_hash() {
     echo -n "$str" | "sha${algorithm}sum" | awk '{print $1}'
 }
 
+########################
+# Converts a string to its hexadecimal representation
+# Arguments:
+#   $1 - string
+# Returns:
+#   hexadecimal representation of the string
+#########################
+convert_to_hex() {
+    local -r str=${1:?missing input string}
+    local -i iterator
+    local char
+    for ((iterator=0; iterator<${#str}; iterator++)); do
+        char=${str:iterator:1}
+        printf '%x' "'${char}"
+    done
+}
diff --git a/bitnami/ejbca/7/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/ejbca/7/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index 459f99c7d1cd..503650210583 100644
--- a/bitnami/ejbca/7/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/ejbca/7/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh
@@ -177,6 +177,8 @@ web_server_reload() {
 #   --document-root - Path to document root directory
 # Apache-specific flags:
 #   --apache-additional-configuration - Additional vhost configuration (no default)
+#   --apache-additional-http-configuration - Additional HTTP vhost configuration (no default)
+#   --apache-additional-https-configuration - Additional HTTPS vhost configuration (no default)
 #   --apache-before-vhost-configuration - Configuration to add before the <VirtualHost> directive (no default)
 #   --apache-allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no' and type is not defined)
 #   --apache-extra-directory-configuration - Extra configuration for the document root directory
@@ -224,6 +226,8 @@ ensure_web_server_app_configuration_exists() {
 
             # Specific Apache flags
             --apache-additional-configuration \
+            | --apache-additional-http-configuration \
+            | --apache-additional-https-configuration \
             | --apache-before-vhost-configuration \
             | --apache-allow-override \
             | --apache-extra-directory-configuration \
diff --git a/bitnami/ejbca/7/debian-10/rootfs/opt/bitnami/scripts/libejbca.sh b/bitnami/ejbca/7/debian-10/rootfs/opt/bitnami/scripts/libejbca.sh
index e8eb6515f86b..d8263eac18b6 100644
--- a/bitnami/ejbca/7/debian-10/rootfs/opt/bitnami/scripts/libejbca.sh
+++ b/bitnami/ejbca/7/debian-10/rootfs/opt/bitnami/scripts/libejbca.sh
@@ -273,7 +273,7 @@ ejbca_create_management_user() {
 #########################
 ejbca_wildfly_deploy() {
     local -r file_to_deploy="${1:?Missing file to deploy}"
-    deployed_file="${EJBCA_WILDFLY_DEPLOY_DIR}/$(basename ${file_to_deploy}).deployed"
+    deployed_file="${EJBCA_WILDFLY_DEPLOY_DIR}/$(basename "$file_to_deploy").deployed"
 
     if [[ ! -f "$deployed_file" ]]; then
         cp "$file_to_deploy" "$EJBCA_WILDFLY_DEPLOY_DIR"/
diff --git a/bitnami/ejbca/README.md b/bitnami/ejbca/README.md
index c39e29c27de4..5ea0e8bd67b2 100644
--- a/bitnami/ejbca/README.md
+++ b/bitnami/ejbca/README.md
@@ -43,7 +43,7 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/).
 
 
-* [`7`, `7-debian-10`, `7.4.3-2`, `7.4.3-2-debian-10-r68`, `latest` (7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-ejbca/blob/7.4.3-2-debian-10-r68/7/debian-10/Dockerfile)
+* [`7`, `7-debian-10`, `7.4.3-2`, `7.4.3-2-debian-10-r69`, `latest` (7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-ejbca/blob/7.4.3-2-debian-10-r69/7/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/ejbca GitHub repo](https://github.com/bitnami/bitnami-docker-ejbca).
 
@@ -116,7 +116,7 @@ $ docker run -d --name ejbca \
   --env EJBCA_DATABASE_HOST=mariadb \
   --env EJBCA_DATABASE_NAME=bitnami_ejbca \
   --network ejbca-network \
-  --volume ejbca_data:/bitnami/ejbca \
+  --volume wildfly_data:/bitnami/wildfly \
   bitnami/ejbca:latest
 ```
 
@@ -126,11 +126,11 @@ Access your application at `http://your-ip:8080/ejbca/`
 
 If you remove the container all your data will be lost, and the next time you run the image the database will be reinitialized. To avoid this loss of data, you should mount a volume that will persist even after the container is removed.
 
-For persistence you should mount a directory at the `/bitnami/ejbca` path. If the mounted directory is empty, it will be initialized on the first run.
+For persistence you should mount a directory at the `/bitnami/wildfly` path. If the mounted directory is empty, it will be initialized on the first run.
 
 ```console
 $ docker run \
-    -v /path/to/ejbca-persistence:/bitnami/ejbca \
+    -v /path/to/ejbca-persistence:/bitnami/wildfly \
     bitnami/ejbca:latest
 ```
 
@@ -140,8 +140,8 @@ You can also do this with a minor change to the [`docker-compose.yml`](https://g
    ejbca:
      ...
      volumes:
--      - 'ejbca_data:/bitnami/ejbca'
-+      - /path/to/ejbca-persistence:/bitnami/ejbca
+-      - 'wildfly_data:/bitnami/wildfly'
++      - /path/to/ejbca-persistence:/bitnami/wildfly
    ...
 -volumes:
 -  ejbca_data:
@@ -212,6 +212,16 @@ Re-create your container from the new image.
 $ docker run --name ejbca bitnami/ejbca:latest
 ```
 
+## Notable Changes
+
+### 7.4.3-2-debian-10-r68
+
+The persistence has been refactorized and the volume mount point was moved from `/bitnami/ejbca` to `/bitnami/wildfly`.
+
+In previous versions only password files were persisted, making the container was unable to restart. The initialization logic has been changed as well as the persisted data directories. The Wildlfy configuration and data directories are now persisted, making the container able to automatically restart.
+The time that the container takes to restart has also been improved.
+Due to the mentioned changes, the automatic upgrade from previous image versions is not supported and requires a manual migration.
+
 ## Contributing
 
 We'd love for you to contribute to this container. You can request new features by creating an [issue](https://github.com/bitnami/bitnami-docker-ejbca/issues), or submit a [pull request](https://github.com/bitnami/bitnami-docker-ejbca/pulls) with your contribution.
diff --git a/bitnami/ejbca/docker-compose.yml b/bitnami/ejbca/docker-compose.yml
index e63987cbb461..061c3607dd6a 100644
--- a/bitnami/ejbca/docker-compose.yml
+++ b/bitnami/ejbca/docker-compose.yml
@@ -16,7 +16,7 @@ services:
       - 8080:8080
       - 8443:8443
     volumes:
-      - "ejbca_data:/bitnami/ejbca"
+      - "wildfly_data:/bitnami/wildfly"
     environment:
       - EJBCA_DATABASE_HOST=mariadb
       - EJBCA_DATABASE_NAME=bitnami_ejbca
@@ -25,5 +25,5 @@ services:
 volumes:
   mariadb_data:
     driver: local
-  ejbca_data:
+  wildfly_data:
     driver: local