diff --git a/packages/addons/addon-depends/docker/containerd/package.mk b/packages/addons/addon-depends/docker/containerd/package.mk
index 977aa49714..086cf24d05 100644
--- a/packages/addons/addon-depends/docker/containerd/package.mk
+++ b/packages/addons/addon-depends/docker/containerd/package.mk
@@ -19,9 +19,9 @@ pre_make_target() {
 
   go_configure
 
-  export CONTAINERD_VERSION=${PKG_VERSION}
-  export CONTAINERD_REVISION=${PKG_GIT_COMMIT}
-  export CONTAINERD_PKG=github.com/containerd/containerd
+  export CONTAINERD_VERSION="${PKG_VERSION}"
+  export CONTAINERD_REVISION="${PKG_GIT_COMMIT}"
+  export CONTAINERD_PKG="github.com/containerd/containerd"
   export LDFLAGS="-w -extldflags -static -X ${CONTAINERD_PKG}/version.Version=${CONTAINERD_VERSION} -X ${CONTAINERD_PKG}/version.Revision=${CONTAINERD_REVISION} -X ${CONTAINERD_PKG}/version.Package=${CONTAINERD_PKG} -extld ${CC}"
   export GO111MODULE=off
 
diff --git a/packages/addons/addon-depends/docker/ctop/package.mk b/packages/addons/addon-depends/docker/ctop/package.mk
index 1db2070ede..b05d184c57 100644
--- a/packages/addons/addon-depends/docker/ctop/package.mk
+++ b/packages/addons/addon-depends/docker/ctop/package.mk
@@ -17,9 +17,9 @@ PKG_GIT_COMMIT="11a1cb10f416b4ca5e36c22c1acc2d11dbb24fb4"
 pre_make_target() {
   go_configure
 
-  export CTOP_VERSION=${PKG_VERSION}
-  export CTOP_REVISION=${PKG_GIT_COMMIT}
-  export CTOP_PKG=github.com/bcicen/ctop
+  export CTOP_VERSION="${PKG_VERSION}"
+  export CTOP_REVISION="${PKG_GIT_COMMIT}"
+  export CTOP_PKG="github.com/bcicen/ctop"
   export LDFLAGS="-w -extldflags -static -X main.version=${CTOP_VERSION} -X main.build=${CTOP_REVISION} -extld ${CC}"
 
   mkdir -p ${GOPATH}/src/github.com/bcicen