diff --git a/bake.hcl b/bake.hcl
index ec2602b..b316d24 100644
--- a/bake.hcl
+++ b/bake.hcl
@@ -14,31 +14,31 @@ group "test" {
 }
 
 target "enterprise_ubuntu22-04_amd64" {
-    tags=["aerospike/aerospike-server-enterprise-amd64:7.0.0.16", "aerospike/aerospike-server-enterprise-amd64:latest"]
+    tags=["aerospike/aerospike-server-enterprise-amd64:7.1.0.7", "aerospike/aerospike-server-enterprise-amd64:latest"]
     platforms=["linux/amd64"]
     context="./enterprise/ubuntu22.04"
 }
 
 target "enterprise_ubuntu22-04_arm64" {
-    tags=["aerospike/aerospike-server-enterprise-arm64:7.0.0.16", "aerospike/aerospike-server-enterprise-arm64:latest"]
+    tags=["aerospike/aerospike-server-enterprise-arm64:7.1.0.7", "aerospike/aerospike-server-enterprise-arm64:latest"]
     platforms=["linux/arm64"]
     context="./enterprise/ubuntu22.04"
 }
 
 target "federal_ubuntu22-04_amd64" {
-    tags=["aerospike/aerospike-server-federal-amd64:7.0.0.16", "aerospike/aerospike-server-federal-amd64:latest"]
+    tags=["aerospike/aerospike-server-federal-amd64:7.1.0.7", "aerospike/aerospike-server-federal-amd64:latest"]
     platforms=["linux/amd64"]
     context="./federal/ubuntu22.04"
 }
 
 target "community_ubuntu22-04_amd64" {
-    tags=["aerospike/aerospike-server-community-amd64:7.0.0.16", "aerospike/aerospike-server-community-amd64:latest"]
+    tags=["aerospike/aerospike-server-community-amd64:7.1.0.7", "aerospike/aerospike-server-community-amd64:latest"]
     platforms=["linux/amd64"]
     context="./community/ubuntu22.04"
 }
 
 target "community_ubuntu22-04_arm64" {
-    tags=["aerospike/aerospike-server-community-arm64:7.0.0.16", "aerospike/aerospike-server-community-arm64:latest"]
+    tags=["aerospike/aerospike-server-community-arm64:7.1.0.7", "aerospike/aerospike-server-community-arm64:latest"]
     platforms=["linux/arm64"]
     context="./community/ubuntu22.04"
 }
@@ -50,19 +50,19 @@ group "push" {
 }
 
 target "enterprise_ubuntu22-04" {
-    tags=["aerospike/aerospike-server-enterprise:7.0.0.16", "aerospike/aerospike-server-enterprise:7.0.0.16_1"]
+    tags=["aerospike/aerospike-server-enterprise:7.1.0.7", "aerospike/aerospike-server-enterprise:7.1.0.7_1", "aerospike/aerospike-server-enterprise:latest"]
     platforms=["linux/amd64,linux/arm64"]
     context="./enterprise/ubuntu22.04"
 }
 
 target "federal_ubuntu22-04" {
-    tags=["aerospike/aerospike-server-federal:7.0.0.16", "aerospike/aerospike-server-federal:7.0.0.16_1"]
+    tags=["aerospike/aerospike-server-federal:7.1.0.7", "aerospike/aerospike-server-federal:7.1.0.7_1", "aerospike/aerospike-server-federal:latest"]
     platforms=["linux/amd64"]
     context="./federal/ubuntu22.04"
 }
 
 target "community_ubuntu22-04" {
-    tags=["aerospike/aerospike-server:7.0.0.16", "aerospike/aerospike-server:7.0.0.16_1"]
+    tags=["aerospike/aerospike-server:7.1.0.7", "aerospike/aerospike-server:7.1.0.7_1", "aerospike/aerospike-server:latest"]
     platforms=["linux/amd64,linux/arm64"]
     context="./community/ubuntu22.04"
 }
diff --git a/community/ubuntu22.04/Dockerfile b/community/ubuntu22.04/Dockerfile
index 73e1688..ca35078 100644
--- a/community/ubuntu22.04/Dockerfile
+++ b/community/ubuntu22.04/Dockerfile
@@ -13,7 +13,7 @@ LABEL org.opencontainers.image.title="Aerospike Community Server" \
       org.opencontainers.image.base.name="docker.io/library/ubuntu:22.04" \
       org.opencontainers.image.source="https://github.com/aerospike/aerospike-server.docker" \
       org.opencontainers.image.vendor="Aerospike" \
-      org.opencontainers.image.version="7.0.0.16" \
+      org.opencontainers.image.version="7.1.0.7" \
       org.opencontainers.image.url="https://github.com/aerospike/aerospike-server.docker"
 
 # AEROSPIKE_EDITION - required - must be "community", "enterprise", or
@@ -23,10 +23,10 @@ LABEL org.opencontainers.image.title="Aerospike Community Server" \
 # By selecting "federal" you agree to the "FEDERAL_LICENSE"
 ARG AEROSPIKE_EDITION="community"
 
-ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-community/7.0.0.16/aerospike-server-community_7.0.0.16_tools-10.2.1_ubuntu22.04_x86_64.tgz"
-ARG AEROSPIKE_SHA_X86_64="f66dec26aea39811d9b966e4b9c046c77bcc4df1efc710eacbb41ba152613044"
-ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-community/7.0.0.16/aerospike-server-community_7.0.0.16_tools-10.2.1_ubuntu22.04_aarch64.tgz"
-ARG AEROSPIKE_SHA_AARCH64="78c13597e58c975ecf7fe95e517bdaeaa9be192d846f7f36ef41d5926b2a63cc"
+ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-community/7.1.0.7/aerospike-server-community_7.1.0.7_tools-11.0.2_ubuntu22.04_x86_64.tgz"
+ARG AEROSPIKE_SHA_X86_64="1c3eb9d2297aaa6d1175aa568cfd5ef671386e492496aa07d294452a188071c8"
+ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-community/7.1.0.7/aerospike-server-community_7.1.0.7_tools-11.0.2_ubuntu22.04_aarch64.tgz"
+ARG AEROSPIKE_SHA_AARCH64="a4b9d959505469e40c4c14b1302138af05140d340024c41f67cf562536d356fa"
 
 SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"]
 
diff --git a/enterprise/ubuntu22.04/Dockerfile b/enterprise/ubuntu22.04/Dockerfile
index 07e41c8..c40b27f 100644
--- a/enterprise/ubuntu22.04/Dockerfile
+++ b/enterprise/ubuntu22.04/Dockerfile
@@ -13,7 +13,7 @@ LABEL org.opencontainers.image.title="Aerospike Enterprise Server" \
       org.opencontainers.image.base.name="docker.io/library/ubuntu:22.04" \
       org.opencontainers.image.source="https://github.com/aerospike/aerospike-server.docker" \
       org.opencontainers.image.vendor="Aerospike" \
-      org.opencontainers.image.version="7.0.0.16" \
+      org.opencontainers.image.version="7.1.0.7" \
       org.opencontainers.image.url="https://github.com/aerospike/aerospike-server.docker"
 
 # AEROSPIKE_EDITION - required - must be "community", "enterprise", or
@@ -23,10 +23,10 @@ LABEL org.opencontainers.image.title="Aerospike Enterprise Server" \
 # By selecting "federal" you agree to the "FEDERAL_LICENSE"
 ARG AEROSPIKE_EDITION="enterprise"
 
-ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/7.0.0.16/aerospike-server-enterprise_7.0.0.16_tools-10.2.1_ubuntu22.04_x86_64.tgz"
-ARG AEROSPIKE_SHA_X86_64="b168131d877feb608f4c76b994754a52e502fde5a24bd1059234d79c3aed0d28"
-ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/7.0.0.16/aerospike-server-enterprise_7.0.0.16_tools-10.2.1_ubuntu22.04_aarch64.tgz"
-ARG AEROSPIKE_SHA_AARCH64="581efda905a647d6019a199c379e06f820c02d5350f828e3a2a765f75cf9f37d"
+ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/7.1.0.7/aerospike-server-enterprise_7.1.0.7_tools-11.0.2_ubuntu22.04_x86_64.tgz"
+ARG AEROSPIKE_SHA_X86_64="8056019e033377ad1302739781bf941396f478d02f685f2c457957e4f02b7fb3"
+ARG AEROSPIKE_AARCH64_LINK="https://artifacts.aerospike.com/aerospike-server-enterprise/7.1.0.7/aerospike-server-enterprise_7.1.0.7_tools-11.0.2_ubuntu22.04_aarch64.tgz"
+ARG AEROSPIKE_SHA_AARCH64="45d22a934aae73498227c413943abb381ee2347f31338a26480f336322d8bac9"
 
 SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"]
 
diff --git a/federal/ubuntu22.04/Dockerfile b/federal/ubuntu22.04/Dockerfile
index 82e7cf4..3c9c36d 100644
--- a/federal/ubuntu22.04/Dockerfile
+++ b/federal/ubuntu22.04/Dockerfile
@@ -13,7 +13,7 @@ LABEL org.opencontainers.image.title="Aerospike Federal Server" \
       org.opencontainers.image.base.name="docker.io/library/ubuntu:22.04" \
       org.opencontainers.image.source="https://github.com/aerospike/aerospike-server.docker" \
       org.opencontainers.image.vendor="Aerospike" \
-      org.opencontainers.image.version="7.0.0.16" \
+      org.opencontainers.image.version="7.1.0.7" \
       org.opencontainers.image.url="https://github.com/aerospike/aerospike-server.docker"
 
 # AEROSPIKE_EDITION - required - must be "community", "enterprise", or
@@ -23,8 +23,8 @@ LABEL org.opencontainers.image.title="Aerospike Federal Server" \
 # By selecting "federal" you agree to the "FEDERAL_LICENSE"
 ARG AEROSPIKE_EDITION="federal"
 
-ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-federal/7.0.0.16/aerospike-server-federal_7.0.0.16_tools-10.2.1_ubuntu22.04_x86_64.tgz"
-ARG AEROSPIKE_SHA_X86_64="e67316802fcae7e94fce048ec746a0b0ad04b20cf4b3d2ca6f9073ad38714230"
+ARG AEROSPIKE_X86_64_LINK="https://artifacts.aerospike.com/aerospike-server-federal/7.1.0.7/aerospike-server-federal_7.1.0.7_tools-11.0.2_ubuntu22.04_x86_64.tgz"
+ARG AEROSPIKE_SHA_X86_64="852e1f98b18815058f44fbeebb501b24903cdb7ab7b63cfd86feecbe4e74c5d8"
 ARG AEROSPIKE_AARCH64_LINK=""
 ARG AEROSPIKE_SHA_AARCH64=""