diff --git a/Dockerfile b/Dockerfile
index 0f92fe3..45411fb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,12 +26,12 @@
 	git=1:2.20.1-2+deb10u1 \
 	gcc=4:8.3.0-1 \
 	curl=7.64.0-4 \
-	unzip=6.0-23+deb10u1
+	unzip=6.0-23+deb10u2
 RUN go get -v "github.com/golang/protobuf/protoc-gen-go@v1.3.2"
 RUN mkdir /app
 COPY . /app/
 WORKDIR /app
-RUN curl -L -o /tmp/protoc-${PROTOC_VERSION}-linux-x86_64.zip https://github.com/google/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-x86_64.zip 
+RUN curl -L -o /tmp/protoc-${PROTOC_VERSION}-linux-x86_64.zip https://github.com/google/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-x86_64.zip
 RUN mkdir /tmp/protoc3
 RUN   echo "$PROTOC_SHA256SUM  /tmp/protoc-${PROTOC_VERSION}-linux-x86_64.zip" | sha256sum -c - \
  &&  unzip /tmp/protoc-${PROTOC_VERSION}-linux-x86_64.zip -d /tmp/protoc3 \
diff --git a/demo_test/Dockerfile b/demo_test/Dockerfile
index 01e3163..3673f7a 100644
--- a/demo_test/Dockerfile
+++ b/demo_test/Dockerfile
@@ -21,7 +21,7 @@
 	git=1:2.20.1-2+deb10u1 \
 	gcc=4:8.3.0-1 \
 	curl=7.64.0-4 \
-	unzip=6.0-23+deb10u1
+	unzip=6.0-23+deb10u2
 # Install protoc-gen-go.
 RUN go get -v github.com/golang/protobuf/protoc-gen-go@v1.3.2
 # Install protoc, same steps as in main importer dockerfile
@@ -55,4 +55,3 @@
 COPY --from=build-env /app/demo_test/demotest .
 COPY --from=build-env /app/demo_test/functional_test/dm .
 ENTRYPOINT ["./demotest"]
-
diff --git a/kubernetes/deploy-mock-olts.yaml b/kubernetes/deploy-mock-olts.yaml
index 9000a10..1feac74 100755
--- a/kubernetes/deploy-mock-olts.yaml
+++ b/kubernetes/deploy-mock-olts.yaml
@@ -15,7 +15,7 @@
 
 ---
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: mock-olt-1
@@ -56,7 +56,7 @@
 
 ---
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: mock-olt-2
diff --git a/kubernetes/deploy-redfish-importer.yaml b/kubernetes/deploy-redfish-importer.yaml
index 5244b6c..6a7f41b 100755
--- a/kubernetes/deploy-redfish-importer.yaml
+++ b/kubernetes/deploy-redfish-importer.yaml
@@ -15,7 +15,7 @@
 
 ---
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: redfish-importer
@@ -40,7 +40,7 @@
             - containerPort: 50051
               name: importer
           command: ["./main"]
-          args: ["--kafka", "kafka:9092"]
+          args: ["--kafka", "voltha-infra-kafka.infra.svc:9092"]
 
 ---
 
@@ -58,7 +58,7 @@
 
 ---
 
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: redfish-demotest
@@ -83,7 +83,7 @@
             - containerPort: 9999
               name: demotest
           command: ["./demotest"]
-          args: ["--kafka", "kafka:9092", "--importer", "redfish-importer:31085"]
+          args: ["--kafka", "voltha-infra-kafka.infra.svc:9092", "--importer", "redfish-importer:31085"]
 
 ---