diff --git a/official-templates/better-base/docker-bake.hcl b/official-templates/better-base/docker-bake.hcl
index 4c2ebb3..eb084a9 100644
--- a/official-templates/better-base/docker-bake.hcl
+++ b/official-templates/better-base/docker-bake.hcl
@@ -1,8 +1,15 @@
 group "default" {
-    targets = ["py310-cuda121", "py310-cuda118", "py310-cuda124"]
+    targets = [
+        "py311-cuda121",
+        "py311-cuda118",
+        "py311-cuda124",
+        "py311-rocm56",
+        "py311-rocm57",
+        "py311-rocm612"
+    ]
 }
 
-target "py310-cuda121" {
+target "py311-cuda121" {
     contexts = {
         scripts = "../../container-template"
         proxy = "../../container-template/proxy"
@@ -11,12 +18,12 @@ target "py310-cuda121" {
     dockerfile = "Dockerfile"
     args = {
         BASE_IMAGE = "nvidia/cuda:12.1.0-cudnn8-devel-ubuntu22.04",
-        PYTHON_VERSION = "3.10"
+        PYTHON_VERSION = "3.11"
     }
     tags = ["madiator2011/better-base:cuda12.1"]
 }
 
-target "py310-cuda118" {
+target "py311-cuda118" {
     contexts = {
         scripts = "../../container-template"
         proxy = "../../container-template/proxy"
@@ -25,12 +32,12 @@ target "py310-cuda118" {
     dockerfile = "Dockerfile"
     args = {
         BASE_IMAGE = "nvidia/cuda:11.8.0-cudnn8-devel-ubuntu22.04",
-        PYTHON_VERSION = "3.10"
+        PYTHON_VERSION = "3.11"
     }
     tags = ["madiator2011/better-base:cuda11.8"]
 }
 
-target "py310-cuda124" {
+target "py311-cuda124" {
     contexts = {
         scripts = "../../container-template"
         proxy = "../../container-template/proxy"
@@ -39,7 +46,49 @@ target "py310-cuda124" {
     dockerfile = "Dockerfile"
     args = {
         BASE_IMAGE = "nvidia/cuda:12.4.1-cudnn-devel-ubuntu22.04",
-        PYTHON_VERSION = "3.10"
+        PYTHON_VERSION = "3.11"
     }
     tags = ["madiator2011/better-base:cuda12.4"]
 }
+
+target "py311-rocm56" {
+    contexts = {
+        scripts = "../../container-template"
+        proxy = "../../container-template/proxy"
+        logo = "../../container-template"
+    }
+    dockerfile = "Dockerfile"
+    args = {
+        BASE_IMAGE = "rocm/pytorch:rocm5.6_ubuntu20.04_py3.11_pytorch_2.0.1",
+        PYTHON_VERSION = "3.11"
+    }
+    tags = ["madiator2011/better-base:rocm5.6"]
+}
+
+target "py311-rocm57" {
+    contexts = {
+        scripts = "../../container-template"
+        proxy = "../../container-template/proxy"
+        logo = "../../container-template"
+    }
+    dockerfile = "Dockerfile"
+    args = {
+        BASE_IMAGE = "rocm/pytorch:rocm5.7_ubuntu22.04_py3.11_pytorch_2.0.1",
+        PYTHON_VERSION = "3.11"
+    }
+    tags = ["madiator2011/better-base:rocm5.7"]
+}
+
+target "py311-rocm612" {
+    contexts = {
+        scripts = "../../container-template"
+        proxy = "../../container-template/proxy"
+        logo = "../../container-template"
+    }
+    dockerfile = "Dockerfile"
+    args = {
+        BASE_IMAGE = "rocm/pytorch:rocm6.1.2_ubuntu22.04_py3.11_pytorch_release-2.1.2",
+        PYTHON_VERSION = "3.11"
+    }
+    tags = ["madiator2011/better-base:rocm6.1.2"]
+}