diff --git a/enforcer/src/main/resources/Dockerfile b/enforcer/src/main/resources/Dockerfile
index a6e8c42cbc..09ad2e8548 100644
--- a/enforcer/src/main/resources/Dockerfile
+++ b/enforcer/src/main/resources/Dockerfile
@@ -16,6 +16,8 @@
 
 # TODO: (VirajSalaka) finalize jdk 11 image
 FROM adoptopenjdk/openjdk11:jre-11.0.10_9-alpine
+RUN apk update && apk upgrade --no-cache
+
 LABEL maintainer="WSO2 Docker Maintainers <dev@wso2.org>" 
 
 ENV LANG=C.UTF-8
@@ -56,7 +58,6 @@ RUN \
 WORKDIR ${MG_USER_HOME}
 USER ${MG_USER}
 
-
 COPY maven/ lib/
 COPY maven/conf conf
 COPY maven/security security
diff --git a/resources/k8s-artifacts/choreo-connect/mg-deployment.yaml b/resources/k8s-artifacts/choreo-connect/choreo-connect-deployment.yaml
similarity index 100%
rename from resources/k8s-artifacts/choreo-connect/mg-deployment.yaml
rename to resources/k8s-artifacts/choreo-connect/choreo-connect-deployment.yaml
diff --git a/resources/k8s-artifacts/choreo-connect/mg-service.yaml b/resources/k8s-artifacts/choreo-connect/choreo-connect-service.yaml
similarity index 100%
rename from resources/k8s-artifacts/choreo-connect/mg-service.yaml
rename to resources/k8s-artifacts/choreo-connect/choreo-connect-service.yaml
diff --git a/router/src/main/resources/Dockerfile b/router/src/main/resources/Dockerfile
index b3a00727c1..dac7d9827d 100644
--- a/router/src/main/resources/Dockerfile
+++ b/router/src/main/resources/Dockerfile
@@ -14,6 +14,7 @@
 # limitations under the License.
 # -----------------------------------------------------------------------
 FROM envoyproxy/envoy-alpine:v1.17.1
+RUN apk update && apk upgrade --no-cache
 
 ENV LANG=C.UTF-8