diff --git a/Dockerfile b/Dockerfile
index 1ea3eca8b..8fcab56d4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@
 FROM alpine:3.12 AS nim-build
 
 ARG NIM_PARAMS
-ARG MAKE_TARGET=wakunode
+ARG MAKE_TARGET=wakunode2
 
 # Get build tools and required header files
 RUN apk add --no-cache bash git rust cargo build-base pcre-dev linux-headers
@@ -29,6 +29,7 @@ ARG MAKE_TARGET=wakunode2
 LABEL maintainer="jakub@status.im"
 LABEL source="https://github.com/status-im/nim-waku"
 LABEL description="Wakunode: Waku and Whisper client"
+LABEL commit="unknown"
 
 # DevP2P, LibP2P, and JSON RPC ports
 EXPOSE 30303 60000 8545
diff --git a/ci/Jenkinsfile.release b/ci/Jenkinsfile.release
index fdbee382c..04cef3db2 100644
--- a/ci/Jenkinsfile.release
+++ b/ci/Jenkinsfile.release
@@ -39,7 +39,8 @@ pipeline {
     stage('Build') {
       steps { script {
         image = docker.build(
-          "${params.IMAGE_NAME}:${env.GIT_COMMIT.take(6)}",
+          "${params.IMAGE_NAME}:${env.GIT_COMMIT.take(8)}",
+          "--label=commit='${env.GIT_COMMIT.take(8)}' " +
           "--build-arg=MAKE_TARGET='${params.MAKE_TARGET}' " +
           "--build-arg=NIM_PARAMS='${params.NIM_PARAMS}' ."
         )