diff --git a/insightedge-enterprise/Dockerfile b/insightedge-enterprise/Dockerfile
index d274aeed0..3f89d53bd 100644
--- a/insightedge-enterprise/Dockerfile
+++ b/insightedge-enterprise/Dockerfile
@@ -3,7 +3,7 @@ ARG JAVA_TAG=8-alpine
 FROM ${JAVA_IMAGE}:${JAVA_TAG}
 ARG GS_PRODUCT=insightedge
 ARG GS_VERSION=16.1.0
-ARG GS_BUILD_NAME=16.1.0-rc3-thu-17
+ARG GS_BUILD_NAME=16.1.0
 ARG GS_NAME=gigaspaces-${GS_PRODUCT}-enterprise-${GS_BUILD_NAME}
 ARG GS_URL=https://gigaspaces-releases-eu.s3.amazonaws.com/insightedge/${GS_VERSION}/${GS_NAME}.zip
 ENV GS_HOME /opt/gigaspaces
diff --git a/insightedge/Dockerfile b/insightedge/Dockerfile
index b5bc8327d..1811590af 100644
--- a/insightedge/Dockerfile
+++ b/insightedge/Dockerfile
@@ -5,7 +5,7 @@ ARG GS_PRODUCT=insightedge
 ARG GS_VERSION=16.1.0
 ARG GS_MILESTONE=patch-tadiran
 ARG GS_BUILD=2020601-1
-ARG GS_BUILD_NAME=16.1.0-rc3-thu-17
+ARG GS_BUILD_NAME=16.1.0
 ARG GS_NAME=gigaspaces-${GS_PRODUCT}-${GS_BUILD_NAME}
 ARG GS_URL=https://gigaspaces-releases-eu.s3.amazonaws.com/${GS_PRODUCT}/${GS_VERSION}/${GS_NAME}.zip
 ENV GS_HOME /opt/gigaspaces
diff --git a/operator/Dockerfile b/operator/Dockerfile
index 399b8cc70..f9462dd83 100644
--- a/operator/Dockerfile
+++ b/operator/Dockerfile
@@ -4,7 +4,7 @@ FROM ${BASE_IMAGE}:${BASE_TAG}
 ARG JAVA_VERSION=java-11-openjdk
 ARG GS_PRODUCT=xap
 ARG GS_VERSION=16.1.0
-ARG GS_BUILD_NAME=16.1.0-rc3-thu-17
+ARG GS_BUILD_NAME=16.1.0
 ARG GS_NAME=gigaspaces-${GS_PRODUCT}-enterprise-${GS_BUILD_NAME}
 ARG GS_URL=https://gigaspaces-releases-eu.s3.amazonaws.com/xap/${GS_VERSION}/${GS_NAME}.zip
 ENV GS_HOME /opt/gigaspaces
diff --git a/smart-augmented-transactions-enterprise/Dockerfile b/smart-augmented-transactions-enterprise/Dockerfile
index e851daaa4..ecfcac31b 100644
--- a/smart-augmented-transactions-enterprise/Dockerfile
+++ b/smart-augmented-transactions-enterprise/Dockerfile
@@ -3,7 +3,7 @@ ARG JAVA_TAG=8-alpine
 FROM ${JAVA_IMAGE}:${JAVA_TAG}
 ARG GS_PRODUCT=smart-augmented-transactions
 ARG GS_VERSION=16.1.0
-ARG GS_BUILD_NAME=16.1.0-rc3-thu-17
+ARG GS_BUILD_NAME=16.1.0
 ARG GS_NAME=gigaspaces-${GS_PRODUCT}-enterprise-${GS_BUILD_NAME}
 ARG GS_URL=https://gigaspaces-releases-eu.s3.amazonaws.com/insightedge/${GS_VERSION}/${GS_NAME}.zip
 ENV GS_HOME /opt/gigaspaces
diff --git a/smart-cache-enterprise/Dockerfile b/smart-cache-enterprise/Dockerfile
index 3b2856121..9dd5a16c5 100644
--- a/smart-cache-enterprise/Dockerfile
+++ b/smart-cache-enterprise/Dockerfile
@@ -4,7 +4,7 @@ FROM ${BASE_IMAGE}:${BASE_TAG}
 ARG JAVA_VERSION=java-1.8.0-openjdk
 ARG GS_PRODUCT=smart-cache
 ARG GS_VERSION=16.1.0
-ARG GS_BUILD_NAME=16.1.0-rc3-thu-17
+ARG GS_BUILD_NAME=16.1.0
 ARG GS_NAME=gigaspaces-${GS_PRODUCT}-enterprise-${GS_BUILD_NAME}
 ARG GS_URL=https://gigaspaces-releases-eu.s3.amazonaws.com/insightedge/${GS_VERSION}/${GS_NAME}.zip
 ENV GS_HOME /opt/gigaspaces
diff --git a/smart-dih-enterprise/Dockerfile b/smart-dih-enterprise/Dockerfile
index 172707ad2..678712c47 100644
--- a/smart-dih-enterprise/Dockerfile
+++ b/smart-dih-enterprise/Dockerfile
@@ -4,7 +4,7 @@ FROM ${BASE_IMAGE}:${BASE_TAG}
 ARG JAVA_VERSION=java-1.8.0-openjdk
 ARG GS_PRODUCT=smart-dih
 ARG GS_VERSION=16.1.0
-ARG GS_BUILD_NAME=16.1.0-rc3-thu-17
+ARG GS_BUILD_NAME=16.1.0
 ARG GS_NAME=gigaspaces-${GS_PRODUCT}-enterprise-${GS_BUILD_NAME}
 ARG GS_URL=https://gigaspaces-releases-eu.s3.amazonaws.com/insightedge/${GS_VERSION}/${GS_NAME}.zip
 ENV GS_HOME /opt/gigaspaces
diff --git a/xap-enterprise/Dockerfile b/xap-enterprise/Dockerfile
index 4dfd19559..7a27e1c04 100644
--- a/xap-enterprise/Dockerfile
+++ b/xap-enterprise/Dockerfile
@@ -4,7 +4,7 @@ FROM ${BASE_IMAGE}:${BASE_TAG}
 ARG JAVA_VERSION=java-1.8.0-openjdk
 ARG GS_PRODUCT=xap
 ARG GS_VERSION=16.1.0
-ARG GS_BUILD_NAME=16.1.0-rc3-thu-17
+ARG GS_BUILD_NAME=16.1.0
 ARG GS_NAME=gigaspaces-${GS_PRODUCT}-enterprise-${GS_BUILD_NAME}
 ARG GS_URL=https://gigaspaces-releases-eu.s3.amazonaws.com/xap/${GS_VERSION}/${GS_NAME}.zip
 ENV GS_HOME /opt/gigaspaces
diff --git a/xap/Dockerfile b/xap/Dockerfile
index c69961c6f..0d5027dd4 100644
--- a/xap/Dockerfile
+++ b/xap/Dockerfile
@@ -5,7 +5,7 @@ ARG GS_PRODUCT=xap
 ARG GS_VERSION=16.1.0
 ARG GS_MILESTONE=patch-tadiran
 ARG GS_BUILD=2020601-1
-ARG GS_BUILD_NAME=16.1.0-rc3-thu-17
+ARG GS_BUILD_NAME=16.1.0
 ARG GS_NAME=gigaspaces-${GS_PRODUCT}-${GS_BUILD_NAME}
 ARG GS_URL=https://gigaspaces-releases-eu.s3.amazonaws.com/${GS_PRODUCT}/${GS_VERSION}/${GS_NAME}.zip
 ENV GS_HOME /opt/gigaspaces