diff --git a/Dockerfile b/Dockerfile
index bde2102..c265d86 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
 ARG UBUNTU_VER=20.04
 ARG HLF_VERSION=2.5
 
-FROM ubuntu:${UBUNTU_VER} as build
+FROM ubuntu:${UBUNTU_VER} AS build
 ARG GO_VER=1.22.0
-ENV GOPATH /go
+ENV GOPATH=/go
 
 RUN apt update && apt install -y \
     git \
@@ -19,7 +19,7 @@ WORKDIR $GOPATH/src/github.com/hyperledger-labs/fabric-builder-k8s
 
 RUN go install ./cmd/...
 
-FROM hyperledger/fabric-peer:${HLF_VERSION} as core
+FROM hyperledger/fabric-peer:${HLF_VERSION} AS core
 
 RUN apt update && apt install -y \
     wget
@@ -30,9 +30,9 @@ RUN yq 'del(.vm.endpoint) | .chaincode.externalBuilders += { "name": "k8s_builde
 
 FROM hyperledger/fabric-peer:${HLF_VERSION}
 
-LABEL org.opencontainers.image.title "K8s Hyperledger Fabric Peer"
-LABEL org.opencontainers.image.description "Hyperledger Fabric Peer with a preconfigured Kubernetes chaincode builder"
-LABEL org.opencontainers.image.source "https://github.com/hyperledger-labs/fabric-builder-k8s"
+LABEL org.opencontainers.image.title="K8s Hyperledger Fabric Peer"
+LABEL org.opencontainers.image.description="Hyperledger Fabric Peer with a preconfigured Kubernetes chaincode builder"
+LABEL org.opencontainers.image.source="https://github.com/hyperledger-labs/fabric-builder-k8s"
 
 COPY --from=core core.yaml ${FABRIC_CFG_PATH}
 COPY --from=build /go/bin/ /opt/hyperledger/k8s_builder/bin/
diff --git a/samples/go-contract/Dockerfile b/samples/go-contract/Dockerfile
index a8a49e2..b77b43d 100644
--- a/samples/go-contract/Dockerfile
+++ b/samples/go-contract/Dockerfile
@@ -3,7 +3,7 @@
 ARG GO_VER=1.22.0
 ARG ALPINE_VER=3.19
 
-FROM golang:${GO_VER}-alpine${ALPINE_VER} as build
+FROM golang:${GO_VER}-alpine${ALPINE_VER} AS build
 
 RUN apk add --no-cache \
 	bash \
@@ -21,9 +21,9 @@ RUN go install ./...
 
 FROM golang:${GO_VER}-alpine${ALPINE_VER}
 
-LABEL org.opencontainers.image.title "Sample Go Contract"
-LABEL org.opencontainers.image.description "Sample Hyperledger Fabric Go contract for Kubernetes chaincode builder"
-LABEL org.opencontainers.image.source "https://github.com/hyperledger-labs/fabric-builder-k8s/samples/go-contract"
+LABEL org.opencontainers.image.title="Sample Go Contract"
+LABEL org.opencontainers.image.description="Sample Hyperledger Fabric Go contract for Kubernetes chaincode builder"
+LABEL org.opencontainers.image.source="https://github.com/hyperledger-labs/fabric-builder-k8s/samples/go-contract"
 
 COPY --from=build /usr/bin/dumb-init /usr/bin/dumb-init
 COPY --from=build /go/bin/go-contract /usr/bin/go-contract
diff --git a/samples/java-contract/Dockerfile b/samples/java-contract/Dockerfile
index 9e4e2da..c91f017 100644
--- a/samples/java-contract/Dockerfile
+++ b/samples/java-contract/Dockerfile
@@ -2,7 +2,7 @@
 
 ARG JAVA_VER=11
 
-FROM eclipse-temurin:${JAVA_VER}-jdk-alpine as build
+FROM eclipse-temurin:${JAVA_VER}-jdk-alpine AS build
 
 RUN apk add --no-cache \
   dumb-init
@@ -19,9 +19,9 @@ RUN ./gradlew jar
 
 FROM eclipse-temurin:${JAVA_VER}-jre-alpine
 
-LABEL org.opencontainers.image.title "Sample Java Contract"
-LABEL org.opencontainers.image.description "Sample Hyperledger Fabric Java contract for Kubernetes chaincode builder"
-LABEL org.opencontainers.image.source "https://github.com/hyperledger-labs/fabric-builder-k8s/samples/java-contract"
+LABEL org.opencontainers.image.title="Sample Java Contract"
+LABEL org.opencontainers.image.description="Sample Hyperledger Fabric Java contract for Kubernetes chaincode builder"
+LABEL org.opencontainers.image.source="https://github.com/hyperledger-labs/fabric-builder-k8s/samples/java-contract"
 
 WORKDIR /var/hyperledger/java-contract
 
diff --git a/samples/node-contract/Dockerfile b/samples/node-contract/Dockerfile
index 90ffdb8..e68cfd2 100644
--- a/samples/node-contract/Dockerfile
+++ b/samples/node-contract/Dockerfile
@@ -3,16 +3,16 @@
 ARG NODE_VER=16
 ARG ALPINE_VER=3.14
 
-FROM node:${NODE_VER}-alpine${ALPINE_VER} as build
+FROM node:${NODE_VER}-alpine${ALPINE_VER} AS build
 
 RUN apk add --no-cache \
   dumb-init
 
 FROM node:${NODE_VER}-alpine${ALPINE_VER}
 
-LABEL org.opencontainers.image.title "Sample Node Contract"
-LABEL org.opencontainers.image.description "Sample Hyperledger Fabric Node contract for Kubernetes chaincode builder"
-LABEL org.opencontainers.image.source "https://github.com/hyperledger-labs/fabric-builder-k8s/samples/node-contract"
+LABEL org.opencontainers.image.title="Sample Node Contract"
+LABEL org.opencontainers.image.description="Sample Hyperledger Fabric Node contract for Kubernetes chaincode builder"
+LABEL org.opencontainers.image.source="https://github.com/hyperledger-labs/fabric-builder-k8s/samples/node-contract"
 
 COPY --from=build /usr/bin/dumb-init /usr/bin/dumb-init