diff --git a/Dockerfile b/Dockerfile
index 256eb750..39433f35 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -149,7 +149,8 @@ RUN apk add libcap && \
     /bin/sh /build/init-crond.sh && \
     /bin/sh /build/init-backend.sh && \
     rm -rf /build && \
-    apk del libcap
+    apk del libcap &&
+    date +%s > ${NETALERTX_FRONT}/buildtimestamp.txt
 
 
 ENTRYPOINT ["/bin/sh","/entrypoint.sh"]
diff --git a/install/production-filesystem/services/scripts/check-first-run-db.sh b/install/production-filesystem/services/scripts/check-first-run-db.sh
index 501b4de3..d893c731 100644
--- a/install/production-filesystem/services/scripts/check-first-run-db.sh
+++ b/install/production-filesystem/services/scripts/check-first-run-db.sh
@@ -19,7 +19,7 @@ EOF
 >&2 printf "%s" "${RESET}"
 
 # Write all text to db file until we see "end-of-database-schema"
-cat << end-of-database-schema > "${NETALERTX_DB_FILE}"
+cat << end-of-database-schema > "${NETALERTX_DB_FILE}.sql"
 CREATE TABLE sqlite_stat1(tbl,idx,stat);
 CREATE TABLE Events (eve_MAC STRING (50) NOT NULL COLLATE NOCASE, eve_IP STRING (50) NOT NULL COLLATE NOCASE, eve_DateTime DATETIME NOT NULL, eve_EventType STRING (30) NOT NULL COLLATE NOCASE, eve_AdditionalInfo STRING (250) DEFAULT (''), eve_PendingAlertEmail BOOLEAN NOT NULL CHECK (eve_PendingAlertEmail IN (0, 1)) DEFAULT (1), eve_PairEventRowid INTEGER);
 CREATE TABLE Sessions (ses_MAC STRING (50) COLLATE NOCASE, ses_IP STRING (50) COLLATE NOCASE, ses_EventTypeConnection STRING (30) COLLATE NOCASE, ses_DateTimeConnection DATETIME, ses_EventTypeDisconnection STRING (30) COLLATE NOCASE, ses_DateTimeDisconnection DATETIME, ses_StillConnected BOOLEAN, ses_AdditionalInfo STRING (250));