diff --git a/bitnami/osclass/3/.dockerignore b/bitnami/osclass/3/.dockerignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/bitnami/osclass/3/Dockerfile b/bitnami/osclass/3/Dockerfile
index c7524806e36b..edb1a5e2f903 100644
--- a/bitnami/osclass/3/Dockerfile
+++ b/bitnami/osclass/3/Dockerfile
@@ -1,41 +1,41 @@
 FROM bitnami/minideb-extras:jessie-r15
+LABEL maintainer "Bitnami <containers@bitnami.com>"
 
-MAINTAINER Bitnami <containers@bitnami.com>
-
-ENV BITNAMI_APP_NAME=osclass \
-    BITNAMI_IMAGE_VERSION=3.7.3-r1 \
-    PATH=/opt/bitnami/php/bin:/opt/bitnami/mysql/bin/:$PATH
-
-# System packages required
-RUN install_packages libaprutil1 libapr1 libc6 libuuid1 libexpat1 libssl1.0.0 libpcre3 libldap-2.4-2 libsasl2-2 libgnutls-deb0-28 zlib1g libp11-kit0 libtasn1-6 libnettle4 libhogweed2 libgmp10 libffi6 libxslt1.1 libtidy-0.99-0 libreadline6 libncurses5 libtinfo5 libmcrypt4 libstdc++6 libpng12-0 libjpeg62-turbo libbz2-1.0 libxml2 libcurl3 libfreetype6 libicu52 libgcc1 libgcrypt20 liblzma5 libidn11 librtmp1 libssh2-1 libgssapi-krb5-2 libkrb5-3 libk5crypto3 libcomerr2 libgpg-error0 libkrb5support0 libkeyutils1 libsybdb5 libpq5
-
-# Additional modules required
+# Install required system packages and dependencies
+RUN install_packages libapr1 libaprutil1 libbz2-1.0 libc6 libcomerr2 libcurl3 libexpat1 libffi6 libfreetype6 libgcc1 libgcrypt20 libgmp10 libgnutls-deb0-28 libgpg-error0 libgssapi-krb5-2 libhogweed2 libicu52 libidn11 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmcrypt4 libncurses5 libnettle4 libp11-kit0 libpcre3 libpng12-0 libpq5 libreadline6 librtmp1 libsasl2-2 libssh2-1 libssl1.0.0 libstdc++6 libsybdb5 libtasn1-6 libtidy-0.99-0 libtinfo5 libuuid1 libxml2 libxslt1.1 zlib1g
 RUN bitnami-pkg unpack apache-2.4.25-0 --checksum 8b46af7d737772d7d301da8b30a2770b7e549674e33b8a5b07480f53c39f5c3f
 RUN bitnami-pkg unpack php-7.1.3-0 --checksum 0b1270ac702523a9f2f448a71f953c5212db41e59a586b86c1b9422b28b6d5b8
-RUN bitnami-pkg install libphp-7.1.3-0 --checksum 851c928d90c086ea48152fb3947379025cba36a497c3c57bb87ad0f2ff012b51
-RUN bitnami-pkg install mysql-client-10.1.23-0 --checksum 9c38e41f237a4b9ce1aca7b9ecad86be5c55b924880cef45b87d635a4aea9d3d
-
-# Install osclass
+RUN bitnami-pkg install mysql-client-10.1.23-1 --checksum 0be92fcc4f7fec93edfa7f788e2bbb87b5b3aac92dfdec159a10590345362512
+RUN bitnami-pkg install libphp-7.1.5-1 --checksum 970ad6e1a2b69a5a10ec8d0365559d49b39fb669e11e487323d159a615b4fc0f
 RUN bitnami-pkg unpack osclass-3.7.3-0 --checksum 54437a74f6476867c7ec97fb00447bfa935daa901a3401ec71cebbf6f7c5dbe5
 
 COPY rootfs /
 
-ENV APACHE_HTTP_PORT="80" \
-    APACHE_HTTPS_PORT="443" \
+ENV APACHE_HTTPS_PORT="443" \
+    APACHE_HTTP_PORT="80" \
+    BITNAMI_APP_NAME="osclass" \
+    BITNAMI_IMAGE_VERSION="3.7.3-r2" \
+    MARIADB_HOST="mariadb" \
+    MARIADB_PASSWORD="" \
+    MARIADB_PORT="3306" \
+    MARIADB_USER="root" \
+    OSCLASS_EMAIL="user@example.com" \
+    OSCLASS_HOST="127.0.0.1" \
+    OSCLASS_PASSWORD="bitnami1" \
     OSCLASS_PING_ENGINES="1" \
     OSCLASS_SAVE_STATS="1" \
     OSCLASS_USERNAME="user" \
-    OSCLASS_PASSWORD="bitnami1" \
     OSCLASS_WEB_TITLE="Sample Web Page" \
-    OSCLASS_EMAIL="user@example.com" \
-    MARIADB_USER="root" \
-    MARIADB_HOST="mariadb" \
-    MARIADB_PORT="3306"
+    PATH="/opt/bitnami/apache/bin:/opt/bitnami/php/bin:/opt/bitnami/mysql/bin:$PATH" \
+    SMTP_HOST="" \
+    SMTP_PASSWORD="" \
+    SMTP_PORT="" \
+    SMTP_PROTOCOL="" \
+    SMTP_USER=""
 
-VOLUME ["/bitnami/osclass", "/bitnami/apache"]
+VOLUME ["/bitnami/apache","/bitnami/osclass","/bitnami/php"]
 
 EXPOSE 80 443
 
 ENTRYPOINT ["/app-entrypoint.sh"]
-
-CMD ["nami", "start", "--foreground", "apache"]
+CMD ["nami","start","--foreground","apache"]
diff --git a/bitnami/osclass/3/rootfs/app-entrypoint.sh b/bitnami/osclass/3/rootfs/app-entrypoint.sh
index 8990ed160de3..b2079417c29b 100755
--- a/bitnami/osclass/3/rootfs/app-entrypoint.sh
+++ b/bitnami/osclass/3/rootfs/app-entrypoint.sh
@@ -1,4 +1,5 @@
 #!/bin/bash -e
+
 . /opt/bitnami/base/functions
 . /opt/bitnami/base/helpers
 
@@ -7,7 +8,7 @@ check_for_updates &
 
 if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then
   nami_initialize apache php osclass
-  info "Starting osclass..."
+  info "Starting osclass... "
 fi
 
 exec tini -- "$@"
diff --git a/bitnami/osclass/3/rootfs/osclass-inputs.json b/bitnami/osclass/3/rootfs/osclass-inputs.json
index 43f5a59addcc..877dd2a7b0c0 100644
--- a/bitnami/osclass/3/rootfs/osclass-inputs.json
+++ b/bitnami/osclass/3/rootfs/osclass-inputs.json
@@ -1,18 +1,18 @@
 {
-  "pingEngines": "{{$global.env.OSCLASS_PING_ENGINES}}",
-  "saveStats": "{{$global.env.OSCLASS_SAVE_STATS}}",
-  "username": "{{$global.env.OSCLASS_USERNAME}}",
-  "password": "{{$global.env.OSCLASS_PASSWORD}}",
-  "webTitle": "{{$global.env.OSCLASS_WEB_TITLE}}",
+  "databaseAdminPassword": "{{$global.env.MARIADB_PASSWORD}}",
+  "databaseAdminUser": "{{$global.env.MARIADB_USER}}",
+  "databaseServerHost": "{{$global.env.MARIADB_HOST}}",
+  "databaseServerPort": "{{$global.env.MARIADB_PORT}}",
   "email": "{{$global.env.OSCLASS_EMAIL}}",
   "host": "{{$global.env.OSCLASS_HOST}}",
+  "password": "{{$global.env.OSCLASS_PASSWORD}}",
+  "pingEngines": "{{$global.env.OSCLASS_PING_ENGINES}}",
+  "saveStats": "{{$global.env.OSCLASS_SAVE_STATS}}",
   "smtpHost": "{{$global.env.SMTP_HOST}}",
-  "smtpPort": "{{$global.env.SMTP_PORT}}",
-  "smtpUser": "{{$global.env.SMTP_USER}}",
   "smtpPassword": "{{$global.env.SMTP_PASSWORD}}",
+  "smtpPort": "{{$global.env.SMTP_PORT}}",
   "smtpProtocol": "{{$global.env.SMTP_PROTOCOL}}",
-  "databaseAdminUser": "{{$global.env.MARIADB_USER}}",
-  "databaseAdminPassword": "{{$global.env.MARIADB_PASSWORD}}",
-  "databaseServerHost": "{{$global.env.MARIADB_HOST}}",
-  "databaseServerPort": "{{$global.env.MARIADB_PORT}}"
+  "smtpUser": "{{$global.env.SMTP_USER}}",
+  "username": "{{$global.env.OSCLASS_USERNAME}}",
+  "webTitle": "{{$global.env.OSCLASS_WEB_TITLE}}"
 }
\ No newline at end of file