diff --git a/bake.hcl b/bake.hcl
index 35bfe38..2baf62a 100644
--- a/bake.hcl
+++ b/bake.hcl
@@ -10,16 +10,16 @@
 #------------------------------------ test -----------------------------------
 
 group "test" {
-    targets=["enterprise_ubuntu20.04_amd64", "community_ubuntu20.04_amd64"]
+    targets=["enterprise_ubuntu20-04_amd64", "community_ubuntu20-04_amd64"]
 }
 
-target "enterprise_ubuntu20.04_amd64" {
+target "enterprise_ubuntu20-04_amd64" {
     tags=["aerospike/aerospike-server-enterprise-amd64:5.7.0.31"]
     platforms=["linux/amd64"]
     context="./enterprise/ubuntu20.04"
 }
 
-target "community_ubuntu20.04_amd64" {
+target "community_ubuntu20-04_amd64" {
     tags=["aerospike/aerospike-server-community-amd64:5.7.0.31"]
     platforms=["linux/amd64"]
     context="./community/ubuntu20.04"
@@ -28,16 +28,16 @@ target "community_ubuntu20.04_amd64" {
 #------------------------------------ push -----------------------------------
 
 group "push" {
-    targets=["enterprise_ubuntu20.04", "community_ubuntu20.04"]
+    targets=["enterprise_ubuntu20-04", "community_ubuntu20-04"]
 }
 
-target "enterprise_ubuntu20.04" {
+target "enterprise_ubuntu20-04" {
     tags=["aerospike/aerospike-server-enterprise:5.7.0.31", "aerospike/aerospike-server-enterprise:5.7.0.31_3"]
     platforms=["linux/amd64"]
     context="./enterprise/ubuntu20.04"
 }
 
-target "community_ubuntu20.04" {
+target "community_ubuntu20-04" {
     tags=["aerospike/aerospike-server:5.7.0.31", "aerospike/aerospike-server:5.7.0.31_3"]
     platforms=["linux/amd64"]
     context="./community/ubuntu20.04"