diff --git a/Dockerfile b/Dockerfile
index c1a0867..bbea5ee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -63,7 +63,7 @@ COPY ./rootfs/. /
 
 RUN set -e; \
   echo 'Installing packages' && \
-  apk update && apk add --no-cache ${PACK_LIST}
+  apk update && apk upgrade --no-cache && apk add --no-cache ${PACK_LIST}
 
 RUN set -e; \
   echo 'Running initial scripts' && \
diff --git a/Dockerfile.3.14 b/Dockerfile.3.14
index f387536..9449f19 100644
--- a/Dockerfile.3.14
+++ b/Dockerfile.3.14
@@ -96,6 +96,8 @@ RUN echo "Creating and editing system files "; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/main" >>"/etc/apk/repositories"; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/community" >>"/etc/apk/repositories"; \
   if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories";fi; \
+  apk update; \
+  apk upgrade --no-cache; \
   if [ -f "/root/docker/setup/01-system.sh" ];then echo "Running the system script";/root/docker/setup/01-system.sh||{ echo "Failed to execute /root/docker/setup/01-system.sh" >&2 && exit 10; };echo "Done running the system script";fi; \
   echo ""
 
diff --git a/Dockerfile.3.15 b/Dockerfile.3.15
index 67d0cfe..3f84a9d 100644
--- a/Dockerfile.3.15
+++ b/Dockerfile.3.15
@@ -96,6 +96,8 @@ RUN echo "Creating and editing system files "; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/main" >>"/etc/apk/repositories"; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/community" >>"/etc/apk/repositories"; \
   if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories";fi; \
+  apk update; \
+  apk upgrade --no-cache; \
   if [ -f "/root/docker/setup/01-system.sh" ];then echo "Running the system script";/root/docker/setup/01-system.sh||{ echo "Failed to execute /root/docker/setup/01-system.sh" >&2 && exit 10; };echo "Done running the system script";fi; \
   echo ""
 
diff --git a/Dockerfile.3.16 b/Dockerfile.3.16
index 5aeedf6..aff87c0 100644
--- a/Dockerfile.3.16
+++ b/Dockerfile.3.16
@@ -96,6 +96,8 @@ RUN echo "Creating and editing system files "; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/main" >>"/etc/apk/repositories"; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/community" >>"/etc/apk/repositories"; \
   if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories";fi; \
+  apk update; \
+  apk upgrade --no-cache; \
   if [ -f "/root/docker/setup/01-system.sh" ];then echo "Running the system script";/root/docker/setup/01-system.sh||{ echo "Failed to execute /root/docker/setup/01-system.sh" >&2 && exit 10; };echo "Done running the system script";fi; \
   echo ""
 
diff --git a/Dockerfile.3.17 b/Dockerfile.3.17
index 27f30ce..39ab0dd 100644
--- a/Dockerfile.3.17
+++ b/Dockerfile.3.17
@@ -96,6 +96,8 @@ RUN echo "Creating and editing system files "; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/main" >>"/etc/apk/repositories"; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/community" >>"/etc/apk/repositories"; \
   if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories";fi; \
+  apk update; \
+  apk upgrade --no-cache; \
   if [ -f "/root/docker/setup/01-system.sh" ];then echo "Running the system script";/root/docker/setup/01-system.sh||{ echo "Failed to execute /root/docker/setup/01-system.sh" >&2 && exit 10; };echo "Done running the system script";fi; \
   echo ""
 
diff --git a/Dockerfile.3.18 b/Dockerfile.3.18
index 60a0812..be8e29d 100644
--- a/Dockerfile.3.18
+++ b/Dockerfile.3.18
@@ -96,6 +96,8 @@ RUN echo "Creating and editing system files "; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/main" >>"/etc/apk/repositories"; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/community" >>"/etc/apk/repositories"; \
   if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories";fi; \
+  apk update; \
+  apk upgrade --no-cache; \
   if [ -f "/root/docker/setup/01-system.sh" ];then echo "Running the system script";/root/docker/setup/01-system.sh||{ echo "Failed to execute /root/docker/setup/01-system.sh" >&2 && exit 10; };echo "Done running the system script";fi; \
   echo ""
 
diff --git a/Dockerfile.3.19 b/Dockerfile.3.19
index 9cec0a7..76ffc7a 100644
--- a/Dockerfile.3.19
+++ b/Dockerfile.3.19
@@ -96,6 +96,8 @@ RUN echo "Creating and editing system files "; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/main" >>"/etc/apk/repositories"; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/community" >>"/etc/apk/repositories"; \
   if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories";fi; \
+  apk update; \
+  apk upgrade --no-cache; \
   if [ -f "/root/docker/setup/01-system.sh" ];then echo "Running the system script";/root/docker/setup/01-system.sh||{ echo "Failed to execute /root/docker/setup/01-system.sh" >&2 && exit 10; };echo "Done running the system script";fi; \
   echo ""
 
diff --git a/Dockerfile.3.20 b/Dockerfile.3.20
index 8201f98..bc322e7 100644
--- a/Dockerfile.3.20
+++ b/Dockerfile.3.20
@@ -96,6 +96,8 @@ RUN echo "Creating and editing system files "; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/main" >>"/etc/apk/repositories"; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/community" >>"/etc/apk/repositories"; \
   if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories";fi; \
+  apk update; \
+  apk upgrade --no-cache; \
   if [ -f "/root/docker/setup/01-system.sh" ];then echo "Running the system script";/root/docker/setup/01-system.sh||{ echo "Failed to execute /root/docker/setup/01-system.sh" >&2 && exit 10; };echo "Done running the system script";fi; \
   echo ""
 
diff --git a/Dockerfile.3.21 b/Dockerfile.3.21
index 7039116..b6b8095 100644
--- a/Dockerfile.3.21
+++ b/Dockerfile.3.21
@@ -96,6 +96,8 @@ RUN echo "Creating and editing system files "; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/main" >>"/etc/apk/repositories"; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/community" >>"/etc/apk/repositories"; \
   if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories";fi; \
+  apk update; \
+  apk upgrade --no-cache; \
   if [ -f "/root/docker/setup/01-system.sh" ];then echo "Running the system script";/root/docker/setup/01-system.sh||{ echo "Failed to execute /root/docker/setup/01-system.sh" >&2 && exit 10; };echo "Done running the system script";fi; \
   echo ""
 
diff --git a/Dockerfile.3.22 b/Dockerfile.3.22
index ee918b4..b152bb6 100644
--- a/Dockerfile.3.22
+++ b/Dockerfile.3.22
@@ -96,6 +96,8 @@ RUN echo "Creating and editing system files "; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/main" >>"/etc/apk/repositories"; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/community" >>"/etc/apk/repositories"; \
   if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories";fi; \
+  apk update; \
+  apk upgrade --no-cache; \
   if [ -f "/root/docker/setup/01-system.sh" ];then echo "Running the system script";/root/docker/setup/01-system.sh||{ echo "Failed to execute /root/docker/setup/01-system.sh" >&2 && exit 10; };echo "Done running the system script";fi; \
   echo ""
 
diff --git a/Dockerfile.3.23 b/Dockerfile.3.23
index 6c51c1a..cf5ac03 100644
--- a/Dockerfile.3.23
+++ b/Dockerfile.3.23
@@ -63,7 +63,7 @@ COPY ./rootfs/. /
 
 RUN set -e; \
   echo 'Installing packages' && \
-  apk update && apk add --no-cache ${PACK_LIST}
+  apk update && apk upgrade --no-cache && apk add --no-cache ${PACK_LIST}
 
 RUN set -e; \
   echo 'Running initial scripts' && \
diff --git a/Dockerfile.edge b/Dockerfile.edge
index 219c5ce..4a1448c 100644
--- a/Dockerfile.edge
+++ b/Dockerfile.edge
@@ -96,6 +96,8 @@ RUN echo "Creating and editing system files "; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/main" >>"/etc/apk/repositories"; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/community" >>"/etc/apk/repositories"; \
   if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories";fi; \
+  apk update; \
+  apk upgrade --no-cache; \
   if [ -f "/root/docker/setup/01-system.sh" ];then echo "Running the system script";/root/docker/setup/01-system.sh||{ echo "Failed to execute /root/docker/setup/01-system.sh" >&2 && exit 10; };echo "Done running the system script";fi; \
   echo ""