diff --git a/docker-bake.hcl b/docker-bake.hcl
index de40805..6fd36c0 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -80,7 +80,7 @@ group "default" {
 target "misp-modules" {
   context = "modules/."
   dockerfile = "Dockerfile"
-  tags = flatten(["${NAMESPACE}/misp-docker:modules-latest", "${NAMESPACE}/misp-docker:modules-${COMMIT_HASH}", MODULES_TAG != "" ? ["${NAMESPACE}/misp-docker:modules-${MODULES_TAG}"] : []])
+  tags = flatten(["${NAMESPACE}/modules:latest", "${NAMESPACE}/modules:${COMMIT_HASH}", MODULES_TAG != "" ? ["${NAMESPACE}/modules:${MODULES_TAG}"] : []])
   args = {
     "MODULES_TAG": "${MODULES_TAG}",
     "MODULES_COMMIT": "${MODULES_COMMIT}",
@@ -92,7 +92,7 @@ target "misp-modules" {
 target "misp" {
   context = "server/."
   dockerfile = "Dockerfile"
-  tags = flatten(["${NAMESPACE}/misp-docker:core-latest", "${NAMESPACE}/misp-docker:core-${COMMIT_HASH}", MISP_TAG != "" ? ["${NAMESPACE}/misp-docker:core-${MISP_TAG}"] : []])
+  tags = flatten(["${NAMESPACE}/core:latest", "${NAMESPACE}/core:${COMMIT_HASH}", MISP_TAG != "" ? ["${NAMESPACE}/core:${MISP_TAG}"] : []])
   args = {
     "MISP_TAG": "${MISP_TAG}",
     "MISP_COMMIT": "${MISP_COMMIT}",